From 6966c63c04c57ddec44e2e0c00c544a09737097b Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期一, 27 十月 2025 17:17:31 +0800
Subject: [PATCH] 优化PDA入库功能
---
新建文件夹/WIDESEA_WMSServer/WIDESEA_WMSServer/appsettings.json | 2
新建文件夹/PDA/pages/stash/inboundorderDetail.vue | 30 +++++++++++++++
项目资料/医药项目系统WMS （上游)问题点.xlsx | 0
新建文件夹/PDA/pages/stash/inboundorder.vue | 55 +++++++++++++++++----------
新建文件夹/PDA/pages/stash/raworderboxing.vue | 4 +-
5 files changed, 67 insertions(+), 24 deletions(-)
diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/PDA/pages/stash/inboundorder.vue" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/PDA/pages/stash/inboundorder.vue"
index 4592156..aec9b1a 100644
--- "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/PDA/pages/stash/inboundorder.vue"
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/PDA/pages/stash/inboundorder.vue"
@@ -6,28 +6,33 @@
</view>
</u-sticky>
<uni-list :border="true">
- <uni-list-item direction="column" clickable @click="groupClick(item.order_no)" link
- :to="page+item.order_no" v-for="item in allReceivingOrders" :key="item.order_no">
+ <uni-list-item direction="column" clickable @click="groupClick(item.order_no)" link :to="page+item.order_no"
+ v-for="item in allReceivingOrders" :key="item.order_no">
<template v-slot:body>
<uni-group margin-top="20">
- <view style="line-height: 17px;color: #596671;font-size: 14px;text-align: center;display: flex;justify-content: space-between;">
- 鍏ュ簱鍗曞彿 {{item.order_no}}
- </view>
- <view style="margin-top: 10rpx;line-height: 17px;color: #596671;font-size: 14px;text-align: center;display: flex;justify-content: space-between;">
- 渚涘簲鍟嗗悕绉� {{item.supplier_name}}
- </view>
- <view style="margin-top: 10rpx;line-height: 17px;color: #596671;font-size: 14px;text-align: center;display: flex;justify-content: space-between;">
- 鍒涘缓鏃ユ湡 {{item.createDate}}
+ <view
+ style="line-height: 17px;color: #596671;font-size: 14px;text-align: center;display: flex;justify-content: space-between;">
+ 鍏ュ簱鍗曞彿 {{item.order_no}}
</view>
<view
- style="margin-top: 10rpx;display: flex;align-items: center; ">
- <view style="text-align: center;line-height: 40rpx;border-radius: 8rpx; width: 238rpx;height: 40rpx;font-size: 22rpx;background-color:rgba(22,127,247,0.18);color: #1F63FF;">
+ style="margin-top: 10rpx;line-height: 17px;color: #596671;font-size: 14px;text-align: center;display: flex;justify-content: space-between;">
+ 渚涘簲鍟嗗悕绉� {{item.supplier_name}}
+ </view>
+ <view
+ style="margin-top: 10rpx;line-height: 17px;color: #596671;font-size: 14px;text-align: center;display: flex;justify-content: space-between;">
+ 鍒涘缓鏃ユ湡 {{item.createDate}}
+ </view>
+ <view style="margin-top: 10rpx;display: flex;align-items: center; ">
+ <view
+ style="text-align: center;line-height: 40rpx;border-radius: 8rpx; width: 238rpx;height: 40rpx;font-size: 22rpx;background-color:rgba(22,127,247,0.18);color: #1F63FF;">
璁㈠崟鐘舵�� {{item.odrderStatus}}
</view>
- <view style="text-align: center;line-height: 40rpx;border-radius: 8rpx; width: 158rpx;height: 40rpx;font-size: 22rpx;color: #F56C6C;">
+ <view
+ style="text-align: center;line-height: 40rpx;border-radius: 8rpx; width: 158rpx;height: 40rpx;font-size: 22rpx;color: #F56C6C;">
鎬婚噺 {{item.SumQty}}
</view>
- <view style="text-align: center;line-height: 40rpx;border-radius: 8rpx; width: 158rpx;height: 40rpx;font-size: 22rpx;color: #F56C6C;">
+ <view
+ style="text-align: center;line-height: 40rpx;border-radius: 8rpx; width: 158rpx;height: 40rpx;font-size: 22rpx;color: #F56C6C;">
宸插叆 {{item.OverQty}}
</view>
</view>
@@ -43,7 +48,9 @@
</template>
<script>
- import { InboundOrderStatus } from '../../common/config.js'
+ import {
+ InboundOrderStatus
+ } from '../../common/config.js'
export default {
data() {
return {
@@ -55,7 +62,7 @@
pageNo: 1,
scrollTop: 0,
warehouseId: "",
- isLoaded:false
+ isLoaded: false
}
},
onLoad(res) {
@@ -66,12 +73,13 @@
onReachBottom() {
this.pageNo += 1;
this.getData();
- this.isLoaded=true;
+ this.isLoaded = true;
},
onShow() {
this.isLoaded = uni.getStorageSync('isLoaded');
if (this.isLoaded) {
uni.removeStorageSync('isLoaded');
+ this.pageNo = 1;
// 浠庡叾浠栭〉闈㈣繑鍥炴椂鍒锋柊
this.getData();
}
@@ -94,6 +102,7 @@
pageNo: this.pageNo
},
}
+ if (this.pageNo == 1) this.allReceivingOrders = [];
this.$u.post('/api/CabinOrder/GetCabinOrders', postData).then((res) => {
if (res.status) {
if (res.data.length > 0) {
@@ -101,8 +110,10 @@
this.allReceivingOrders = res.data.map(i => ({
...i,
InboundOrderStatus: i.odrderStatus.label,
- SumQty: i.details.map(item => item.order_qty).reduce((prev, next) => prev + next, 0),
- OverQty: i.details.map(item => item.order_Inqty).reduce((prev, next) => prev + next, 0)
+ SumQty: i.details.map(item => item.order_qty).reduce((prev,
+ next) => prev + next, 0),
+ OverQty: i.details.map(item => item.order_Inqty).reduce((prev,
+ next) => prev + next, 0)
}));
// this.allReceivingOrders = res.data;
if (this.allReceivingOrders.length > 3) {
@@ -114,8 +125,10 @@
this.allReceivingOrders = res.data.map(i => ({
...i,
InboundOrderStatus: i.odrderStatus.label,
- SumQty: i.details.map(item => item.order_qty).reduce((prev, next) => prev + next, 0),
- OverQty: i.details.map(item => item.order_Inqty).reduce((prev, next) => prev + next, 0)
+ SumQty: i.details.map(item => item.order_qty).reduce((prev,
+ next) => prev + next, 0),
+ OverQty: i.details.map(item => item.order_Inqty).reduce((prev,
+ next) => prev + next, 0)
}));
if (this.allReceivingOrders.length > 3) {
this.loadVisible = true;
diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/PDA/pages/stash/inboundorderDetail.vue" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/PDA/pages/stash/inboundorderDetail.vue"
index a44312f..a653244 100644
--- "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/PDA/pages/stash/inboundorderDetail.vue"
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/PDA/pages/stash/inboundorderDetail.vue"
@@ -33,6 +33,7 @@
return {
page: "/pages/stash/raworderboxing?",
loadVisible: false,
+ isIn:false,
searchValue: "",
status: "more",
allReceivingOrders: [],
@@ -48,6 +49,15 @@
this.allReceivingOrders=res.detail;
this.page = this.page + "orderNo=" + this.orderNo +"&warehouseId=" + this.warehouseId + "&batchNo=";
this.getData();
+ },
+ onShow() {
+ this.isIn = uni.getStorageSync('isIn');
+ if (this.isIn) {
+ uni.removeStorageSync('isIn');
+ this.pageNo = 1;
+ // 浠庡叾浠栭〉闈㈣繑鍥炴椂鍒锋柊
+ this.getData();
+ }
},
onReachBottom() {
this.pageNo += 1;
@@ -97,6 +107,26 @@
this.status = 'noMore';
//this.allReceivingOrders = [];
this.loadVisible = true;
+ if (this.allReceivingOrders.length < 1) {
+ uni.showModal({
+ title: '鎻愮ず',
+ content: '鍏ュ簱宸插畬鎴愶紝鏄惁杩斿洖棣栭〉锛�',
+ success: (res) => {
+ if (res.confirm) {
+ uni.setStorageSync('isLoaded', true);
+ // 鐢ㄦ埛鐐瑰嚮纭畾
+ setTimeout(() => {
+ uni.navigateBack({
+ delta: 2
+ });
+ }, 500);
+ } else {
+ // 鐢ㄦ埛鐐瑰嚮鍙栨秷锛屽彲浠ュ仠鐣欏湪褰撳墠椤甸潰
+ // 鎴栬�呮墽琛屽叾浠栨搷浣�
+ }
+ }
+ });
+ }
}
}
})
diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/PDA/pages/stash/raworderboxing.vue" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/PDA/pages/stash/raworderboxing.vue"
index e9dd604..4cf78c1 100644
--- "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/PDA/pages/stash/raworderboxing.vue"
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/PDA/pages/stash/raworderboxing.vue"
@@ -480,7 +480,7 @@
this.barcode = "";
this.materSn = "";
if (this.Inqty == this.orderqty) {
- uni.setStorageSync('isLoaded', true);
+ uni.setStorageSync('isIn', true);
this.handleInboundComplete();
}
} else {
@@ -533,7 +533,7 @@
// });
// 鏂瑰紡1锛氫娇鐢╱ni.navigateBack杩斿洖涓婁竴椤�
uni.navigateBack({
- delta: 2
+ delta: 1
});
}, 600);
}
diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_WMSServer/appsettings.json" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_WMSServer/appsettings.json"
index 4e1d9b6..1e9fded 100644
--- "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_WMSServer/appsettings.json"
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_WMSServer/appsettings.json"
@@ -16,7 +16,7 @@
//"ConnectionString": "Data Source=.;Initial Catalog=WIDESEAWMS_HUAIAN;User ID=sa;Password=P@ssw0rd;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
//"ConnectionString": "Data Source=10.30.4.92;Initial Catalog=WMS_TC;User ID=sa;Password=duo123456;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
//鏃MS鏁版嵁搴撹繛鎺�
- "ConnectionString": "Data Source=.;Initial Catalog=WIDESEA_WMSDBF_Z22;User ID=sa;Password=123456;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
+ "ConnectionString": "Data Source=.;Initial Catalog=WIDESEA_WMSDBF_Z22;User ID=sa;Password=P@ssw0rd;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
//璺ㄥ煙
"Cors": {
"PolicyName": "CorsIpAccess", //绛栫暐鍚嶇О
diff --git "a/\351\241\271\347\233\256\350\265\204\346\226\231/\345\214\273\350\215\257\351\241\271\347\233\256\347\263\273\347\273\237WMS \357\274\210\344\270\212\346\270\270\051\351\227\256\351\242\230\347\202\271.xlsx" "b/\351\241\271\347\233\256\350\265\204\346\226\231/\345\214\273\350\215\257\351\241\271\347\233\256\347\263\273\347\273\237WMS \357\274\210\344\270\212\346\270\270\051\351\227\256\351\242\230\347\202\271.xlsx"
new file mode 100644
index 0000000..1909016
--- /dev/null
+++ "b/\351\241\271\347\233\256\350\265\204\346\226\231/\345\214\273\350\215\257\351\241\271\347\233\256\347\263\273\347\273\237WMS \357\274\210\344\270\212\346\270\270\051\351\227\256\351\242\230\347\202\271.xlsx"
Binary files differ
--
Gitblit v1.9.3