From 354132d81aefb7e185f50b78c61740495210e8e5 Mon Sep 17 00:00:00 2001
From: lijuncheng <juncheng.li@ccwin-in.com>
Date: Tue, 13 Aug 2024 19:22:52 +0800
Subject: [PATCH 01/33] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8F=90=E7=A4=BA?=
 =?UTF-8?q?=E6=A1=86=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/mycomponents/common/comMessage.vue | 30 +++++++++++++++++++-------
 1 file changed, 22 insertions(+), 8 deletions(-)

diff --git a/src/mycomponents/common/comMessage.vue b/src/mycomponents/common/comMessage.vue
index 85f72a16..5acb2266 100644
--- a/src/mycomponents/common/comMessage.vue
+++ b/src/mycomponents/common/comMessage.vue
@@ -12,16 +12,22 @@
 				<slot name="icon">
 					<image class="icon" :src="icon" />
 				</slot>
-				<slot name="content">
-					<text class="content"  :style="{'color': textColor?textColor:'#000'}" >
-						{{content}}
-					</text>
-					<!-- <rich-text class="content" :nodes="content" v-else></rich-text> -->
-					
-				</slot>
+				<scroll-view style="max-height: 400rpx; "  scroll-y="true">
+					<slot name="content">
+						<view class="" style="display: flex;align-items: center;justify-content: center;">
+							<text class="text_content"  :style="{'color': textColor?textColor:'#000'}" >
+								{{content}}
+							</text>
+						</view>
+						
+						<!-- <rich-text class="content" :nodes="content" v-else></rich-text> -->
+						
+					</slot>
+				</scroll-view>
+				
 			<view class='split_line'></view>
 				<slot name="button">
-					<view class="uni-flex uni-row u-col-center space-between" style="width: 100%;height: 48px;">
+					<view class="uni-flex uni-row u-col-center space-between" style="width: 100%;height: 50rpx;">
 						<view v-if="showCancelButton" class="cance_button" @tap="cancelClose">
 							<text :style="{'color':cancelColor}">{{ cancelText }}</text>
 						</view>
@@ -493,6 +499,7 @@
 		display: flex; //弹性布局
 		flex-direction: column; //垂直排列
 		align-items: center; //子元素居中
+		margin: 8rpx;
 		// background-image: url()
 	}
 
@@ -544,4 +551,11 @@
 	.def_text {
 		color: $uni-color-primary;
 	}
+	.text_content{
+	padding: 10rpx;
+	font-size: 32rpx;
+	text-align: center;
+	word-break: break-all; 
+	white-space: normal;
+	}
 </style>

From efa494646a47b3f565fe4053170b1c4b11acc2a7 Mon Sep 17 00:00:00 2001
From: lijuncheng <juncheng.li@ccwin-in.com>
Date: Tue, 13 Aug 2024 21:55:10 +0800
Subject: [PATCH 02/33] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/customerReturn/job/returnDetail.vue | 49 ++++++++++-------
 .../inventoryMove/job/inventoryMoveDetail.vue | 51 ++++++++++--------
 .../job/productDismantleDetail.vue            | 10 ++--
 .../job/productPutawayDetail.vue              | 10 ++--
 .../job/completeReceiveJobDetail.vue          | 10 ++--
 .../job/productReceiptDetail.vue              |  4 +-
 .../productReceipt/job/scrapReceiptDetail.vue | 43 ++++++++-------
 .../job/semiProductReceiptDetail.vue          | 10 ++--
 .../job/productRecycleJobDetail.vue           | 52 +++++++++++--------
 .../job/productionReceiptDetail.vue           | 10 ++--
 .../productionReturn/job/returnDetail.vue     | 10 ++--
 .../purchaseReceipt/job/receiptDetail.vue     |  8 ++-
 src/pages/purchaseReturn/job/returnDetail.vue | 52 +++++++++++--------
 src/pages/putaway/job/putawayDetail.vue       | 10 ++--
 src/pages/scrap/job/scrapJobDetail.vue        | 51 ++++++++++--------
 src/pages/transfer/job/issueDetail.vue        | 10 ++--
 src/pages/transfer/job/receiptDetail.vue      | 11 ++--
 src/pages/transfer/job/transferDetail.vue     | 10 ++--
 src/pages/unPlanned/job/issueJobDetail.vue    | 50 ++++++++++--------
 src/pages/unPlanned/job/receiptJobDetail.vue  | 10 ++--
 20 files changed, 272 insertions(+), 199 deletions(-)

diff --git a/src/pages/customerReturn/job/returnDetail.vue b/src/pages/customerReturn/job/returnDetail.vue
index 21afb6d1..637d4376 100644
--- a/src/pages/customerReturn/job/returnDetail.vue
+++ b/src/pages/customerReturn/job/returnDetail.vue
@@ -339,17 +339,44 @@
 				if (!this.checkLocation()) {
 					return
 				}
+				
+				// //扫描数量和任务数量相等，直接提交
+				if (this.scanCount == this.subList.length) {
+					this.checkCount();
+				} else if (this.scanCount < this.subList.length) {
+					//扫描数量小于任务数量，判断是否允许部分提交
+					if (this.jobContent.allowPartialComplete == "TRUE") {
+						//提交
+						this.checkCount();
+					} else {
+						//不允许部分提交，提示
+						this.$refs.comMessage.showErrorMessage("任务明细未全部完成,不允许部分提交!", res => {
+								if (res) {
+									this.openScanPopup();
+								}
+							});
+					}
+				}
+			},
+			
+			checkCount(){
 				// 提交的数量和任务数量不一致提示
 				let str = ''
 				this.detailSource.forEach((item) => {
 					item.subList.forEach(cur => {
 						if (cur.qty != cur.handleQty) {
-							str += `包装号【${cur.packingNumber}】提交数量【${cur.handleQty}】与任务物料数量【${cur.qty}】不一致`
+							var tempHandleQty =0
+							if(cur.handleQty){
+								tempHandleQty=cur.handleQty
+							}else {
+								tempHandleQty =0
+							}
+							str += `包装号【${cur.packingNumber}】提交数量【${tempHandleQty}】与任务物料数量【${cur.qty}】不一致`
 						}
 					})
 				})
 				if (str) {
-					str += '，是否确认提交?'
+					str = '任务明细未全部完成,是否提交?\n'+str
 					this.$refs.comMessage.showQuestionMessage1(str, 'red', res => {
 						if (res) {
 							this.submitJob()
@@ -358,24 +385,6 @@
 				} else {
 					this.submitJob()
 				}
-				// //扫描数量和任务数量相等，直接提交
-				// if (this.scanCount == this.subList.length) {
-				// 	this.submitJob();
-				// } else if (this.scanCount < this.subList.length) {
-				// 	//扫描数量小于任务数量，判断是否允许部分提交
-				// 	if (this.jobContent.allowPartialComplete == "TRUE") {
-				// 		//提交
-				// 		this.submitJob();
-				// 	} else {
-				// 		//不允许部分提交，提示
-				// 		this.$refs.comMessage.showErrorMessage('请完成扫描后,再进行提交\n' + "已经扫描[" + this.scanCount +
-				// 			"]箱总共[" + this.subList.length + "]箱", res => {
-				// 				if (res) {
-				// 					this.openScanPopup();
-				// 				}
-				// 			});
-				// 	}
-				// }
 			},
 
 			submitJob() {
diff --git a/src/pages/inventoryMove/job/inventoryMoveDetail.vue b/src/pages/inventoryMove/job/inventoryMoveDetail.vue
index ce81a5da..bf64c75a 100644
--- a/src/pages/inventoryMove/job/inventoryMoveDetail.vue
+++ b/src/pages/inventoryMove/job/inventoryMoveDetail.vue
@@ -354,17 +354,44 @@
 					this.showErrorMessage("扫描数为0,请先扫描")
 					return;
 				}
+				
+				//允许部分提交
+				//扫描数量和任务数量相等，直接提交
+				if (this.scanCount == this.subList.length) {
+					this.checkCount();
+				} else if (this.scanCount < this.subList.length) {
+					//扫描数量小于任务数量，判断是否允许部分提交
+					if (this.jobContent.allowPartialComplete == "TRUE") {
+						//提交
+						this.checkCount();
+					} else {
+						//不允许部分提交，提示
+						this.$refs.comMessage.showErrorMessage("任务明细未全部完成,不允许部分提交!", res => {
+								if (res) {
+									this.openScanPopup();
+								}
+							});
+					}
+				}
+			},
+			checkCount(){
 				// 提交的数量和任务数量不一致提示
 				let str = ''
 				this.detailSource.forEach((item) => {
 					item.subList.forEach(cur => {
 						if (cur.qty != cur.handleQty) {
-							str += `包装号【${cur.packingNumber}】提交数量【${cur.handleQty}】与任务物料数量【${cur.qty}】不一致`
+							var tempHandleQty =0
+							if(cur.handleQty){
+								tempHandleQty=cur.handleQty
+							}else {
+								tempHandleQty =0
+							}
+							str += `包装号【${cur.packingNumber}】提交数量【${tempHandleQty}】与任务物料数量【${cur.qty}】不一致\n`
 						}
 					})
 				})
 				if (str) {
-					str += '，是否确认提交?'
+					str = '任务明细未全部完成,是否提交?\n'+str
 					this.$refs.comMessage.showQuestionMessage1(str, 'red', res => {
 						if (res) {
 							this.submitJob()
@@ -373,26 +400,6 @@
 				} else {
 					this.submitJob()
 				}
-				// //允许部分提交
-				// //扫描数量和任务数量相等，直接提交
-				// if (this.scanCount == this.subList.length) {
-				// 	this.submitJob();
-				// } else if (this.scanCount < this.subList.length) {
-				// 	//扫描数量小于任务数量，判断是否允许部分提交
-				// 	if (this.jobContent.allowPartialComplete == "TRUE") {
-				// 		//提交
-				// 		this.submitJob();
-				// 	} else {
-				// 		//不允许部分提交，提示
-				// 		this.$refs.comMessage.showErrorMessage('请完成扫描后,再进行提交\n' + "已经扫描[" + this.scanCount +
-				// 			"]箱总共[" + this
-				// 			.subList.length + "]箱", res => {
-				// 				if (res) {
-				// 					this.openScanPopup();
-				// 				}
-				// 			});
-				// 	}
-				// }
 			},
 
 			submitJob() {
diff --git a/src/pages/productDismantle/job/productDismantleDetail.vue b/src/pages/productDismantle/job/productDismantleDetail.vue
index e25735c9..27c9a7a6 100644
--- a/src/pages/productDismantle/job/productDismantleDetail.vue
+++ b/src/pages/productDismantle/job/productDismantleDetail.vue
@@ -342,12 +342,14 @@
 					//扫描数量小于任务数量，判断是否允许部分提交
 					if (this.jobContent.allowPartialComplete == "TRUE") {
 						//提交
-						this.submitJob();
+						this.$refs.comMessage.showQuestionMessage1("任务明细未全部完成,是否提交?", 'red', res => {
+							if (res) {
+								this.submitJob()
+							}
+						});
 					} else {
 						//不允许部分提交，提示
-						this.$refs.comMessage.showErrorMessage('请完成扫描后,再进行提交\n' + "已经扫描[" + this.scanCount +
-							"]箱总共[" + this
-							.subList.length + "]箱", res => {
+						this.$refs.comMessage.showErrorMessage("任务明细未全部完成,不允许部分提交!", res => {
 								if (res) {
 									this.openScanPopup();
 								}
diff --git a/src/pages/productPutaway/job/productPutawayDetail.vue b/src/pages/productPutaway/job/productPutawayDetail.vue
index 1a970b6b..8cef3a48 100644
--- a/src/pages/productPutaway/job/productPutawayDetail.vue
+++ b/src/pages/productPutaway/job/productPutawayDetail.vue
@@ -404,12 +404,14 @@
 					//扫描数量小于任务数量，判断是否允许部分提交
 					if (this.jobContent.allowPartialComplete == "TRUE") {
 						//提交
-						this.submitJob();
+						this.$refs.comMessage.showQuestionMessage1("任务明细未全部完成,是否提交?", 'red', res => {
+							if (res) {
+								this.submitJob()
+							}
+						});
 					} else {
 						//不允许部分提交，提示
-						this.$refs.comMessage.showErrorMessage('请完成扫描后,再进行提交\n' + "已经扫描[" + this.scanCount +
-							"]箱总共[" + this
-							.subList.length + "]箱", res => {
+						this.$refs.comMessage.showErrorMessage("任务明细未全部完成,不允许部分提交!", res => {
 								if (res) {
 									this.openScanPopup();
 								}
diff --git a/src/pages/productReceipt/job/completeReceiveJobDetail.vue b/src/pages/productReceipt/job/completeReceiveJobDetail.vue
index 2fb7b9aa..e591c1ed 100644
--- a/src/pages/productReceipt/job/completeReceiveJobDetail.vue
+++ b/src/pages/productReceipt/job/completeReceiveJobDetail.vue
@@ -302,12 +302,14 @@
 					//扫描数量小于任务数量，判断是否允许部分提交
 					if (this.jobContent.allowPartialComplete == "TRUE") {
 						//提交
-						this.submitJob();
+						this.$refs.comMessage.showQuestionMessage1("任务明细未全部完成,是否提交?", 'red', res => {
+							if (res) {
+								this.submitJob()
+							}
+						});
 					} else {
 						//不允许部分提交，提示
-						this.showMessage('请完成扫描后,再进行提交\n' + "已经扫描[" + this.scanCount + "]总共[" + this.subList
-							.length +
-							"]");
+						this.showMessage("任务明细未全部完成,不允许部分提交!");
 					}
 				}
 
diff --git a/src/pages/productReceipt/job/productReceiptDetail.vue b/src/pages/productReceipt/job/productReceiptDetail.vue
index 24c63209..7a898713 100644
--- a/src/pages/productReceipt/job/productReceiptDetail.vue
+++ b/src/pages/productReceipt/job/productReceiptDetail.vue
@@ -378,8 +378,8 @@
 						var subItem = item.subList[i]
 						if (calc.sub(subItem.handleQty, subItem.qty) < 0) {
 							isCheck = false;
-							hint = "包装【" + subItem.packingNumber + "】实际收货数量:" + subItem.handleQty + "与包装数量" + subItem.qty +
-								"不相等，是否继续收货?"
+							hint = "包装【" + subItem.packingNumber + "】实际收货数量:[" + subItem.handleQty + "]与包装数量[" + subItem.qty +
+								"]不相等，是否继续收货?"
 							break
 						}
 					}
diff --git a/src/pages/productReceipt/job/scrapReceiptDetail.vue b/src/pages/productReceipt/job/scrapReceiptDetail.vue
index 16cbdf0a..8970a98b 100644
--- a/src/pages/productReceipt/job/scrapReceiptDetail.vue
+++ b/src/pages/productReceipt/job/scrapReceiptDetail.vue
@@ -294,18 +294,41 @@
 				if (!this.checkLocation()) {
 					return
 				}
+				
+				// //扫描数量和任务数量相等，直接提交
+				if (this.scanCount == this.subList.length) {
+					this.checkCount();
+				} else if (this.scanCount < this.subList.length) {
+					//扫描数量小于任务数量，判断是否允许部分提交
+					if (this.jobContent.allowPartialComplete == "TRUE") {
+						//提交
+						this.checkCount();
+					} else {
+						//不允许部分提交，提示
+						this.showMessage("任务明细未全部完成,是否提交");
+					}
+				}
 
+			},
+			
+			checkCount(){
 				// 提交的数量和任务数量不一致提示
 				let str = ''
 				this.detailSource.forEach((item) => {
 					item.subList.forEach(cur => {
 						if (cur.qty != cur.handleQty) {
-							str += `包装号【${cur.packingNumber}】提交数量【${cur.handleQty}】与任务物料数量【${cur.qty}】不一致`
+							var tempHandleQty =0
+							if(cur.handleQty){
+								tempHandleQty=cur.handleQty
+							}else {
+								tempHandleQty =0
+							}
+							str += `包装号【${cur.packingNumber}】提交数量【${tempHandleQty}】与任务物料数量【${cur.qty}】不一致`
 						}
 					})
 				})
 				if (str) {
-					str += '，是否确认提交?'
+					str = '任务明细未全部完成,是否提交?\n'+str
 					this.$refs.comMessage.showQuestionMessage1(str, 'red', res => {
 						if (res) {
 							this.submitJob()
@@ -314,22 +337,6 @@
 				} else {
 					this.submitJob()
 				}
-				// //扫描数量和任务数量相等，直接提交
-				// if (this.scanCount == this.subList.length) {
-				// 	this.submitJob();
-				// } else if (this.scanCount < this.subList.length) {
-				// 	//扫描数量小于任务数量，判断是否允许部分提交
-				// 	if (this.jobContent.allowPartialComplete == "TRUE") {
-				// 		//提交
-				// 		this.submitJob();
-				// 	} else {
-				// 		//不允许部分提交，提示
-				// 		this.showMessage('请完成扫描后,再进行提交\n' + "已经扫描[" + this.scanCount + "]总共[" + this.subList
-				// 			.length +
-				// 			"]");
-				// 	}
-				// }
-
 			},
 
 			submitJob() {
diff --git a/src/pages/productReceipt/job/semiProductReceiptDetail.vue b/src/pages/productReceipt/job/semiProductReceiptDetail.vue
index 496a018c..d2fac2c1 100644
--- a/src/pages/productReceipt/job/semiProductReceiptDetail.vue
+++ b/src/pages/productReceipt/job/semiProductReceiptDetail.vue
@@ -302,12 +302,14 @@
 					//扫描数量小于任务数量，判断是否允许部分提交
 					if (this.jobContent.allowPartialComplete == "TRUE") {
 						//提交
-						this.submitJob();
+						this.$refs.comMessage.showQuestionMessage1("任务明细未全部完成,是否提交?", 'red', res => {
+							if (res) {
+								this.submitJob()
+							}
+						});
 					} else {
 						//不允许部分提交，提示
-						this.showMessage('请完成扫描后,再进行提交\n' + "已经扫描[" + this.scanCount + "]总共[" + this.subList
-							.length +
-							"]");
+						this.showMessage("任务明细未全部完成,不允许部分提交!");
 					}
 				}
 
diff --git a/src/pages/productRecycle/job/productRecycleJobDetail.vue b/src/pages/productRecycle/job/productRecycleJobDetail.vue
index 8908d9fa..f9c8bf00 100644
--- a/src/pages/productRecycle/job/productRecycleJobDetail.vue
+++ b/src/pages/productRecycle/job/productRecycleJobDetail.vue
@@ -318,17 +318,45 @@
 					this.showErrorMessage("扫描数为0,请先扫描")
 					return;
 				}
+				
+				// //允许部分提交
+				// //扫描数量和任务数量相等，直接提交
+				if (this.scanCount == this.subList.length) {
+					this.checkCount();
+				} else if (this.scanCount < this.subList.length) {
+					//扫描数量小于任务数量，判断是否允许部分提交
+					if (this.jobContent.allowPartialComplete == "TRUE") {
+						//提交
+						this.checkCount();
+					} else {
+						//不允许部分提交，提示
+						this.$refs.comMessage.showErrorMessage("任务明细未全部完成,不允许部分提交!", res => {
+								if (res) {
+									this.openScanPopup();
+								}
+							});
+					}
+				}
+			},
+			
+			checkCount(){
 				// 提交的数量和任务数量不一致提示
 				let str = ''
 				this.detailSource.forEach((item) => {
 					item.subList.forEach(cur => {
 						if (cur.qty != cur.handleQty) {
-							str += `包装号【${cur.packingNumber}】提交数量【${cur.handleQty}】与任务物料数量【${cur.qty}】不一致`
+							var tempHandleQty =0
+							if(cur.handleQty){
+								tempHandleQty=cur.handleQty
+							}else {
+								tempHandleQty =0
+							}
+							str += `包装号【${cur.packingNumber}】提交数量【${tempHandleQty}】与任务物料数量【${cur.qty}】不一致`
 						}
 					})
 				})
 				if (str) {
-					str += '，是否确认提交?'
+					str = '任务明细未全部完成,是否提交?\n'+str
 					this.$refs.comMessage.showQuestionMessage1(str, 'red', res => {
 						if (res) {
 							this.submitJob()
@@ -337,26 +365,6 @@
 				} else {
 					this.submitJob()
 				}
-				// //允许部分提交
-				// //扫描数量和任务数量相等，直接提交
-				// if (this.scanCount == this.subList.length) {
-				// 	this.submitJob();
-				// } else if (this.scanCount < this.subList.length) {
-				// 	//扫描数量小于任务数量，判断是否允许部分提交
-				// 	if (this.jobContent.allowPartialComplete == "TRUE") {
-				// 		//提交
-				// 		this.submitJob();
-				// 	} else {
-				// 		//不允许部分提交，提示
-				// 		this.$refs.comMessage.showErrorMessage('请完成扫描后,再进行提交\n' + "已经扫描[" + this.scanCount +
-				// 			"]箱总共[" + this
-				// 			.subList.length + "]箱", res => {
-				// 				if (res) {
-				// 					this.openScanPopup();
-				// 				}
-				// 			});
-				// 	}
-				// }
 			},
 
 			submitJob() {
diff --git a/src/pages/productionReceipt/job/productionReceiptDetail.vue b/src/pages/productionReceipt/job/productionReceiptDetail.vue
index 967a3083..6270e88e 100644
--- a/src/pages/productionReceipt/job/productionReceiptDetail.vue
+++ b/src/pages/productionReceipt/job/productionReceiptDetail.vue
@@ -409,12 +409,14 @@
 					//扫描数量小于任务数量，判断是否允许部分提交
 					if (this.jobContent.allowPartialComplete == "TRUE") {
 						//提交
-						this.submitJob();
+						this.$refs.comMessage.showQuestionMessage1("任务明细未全部完成,是否提交?", 'red', res => {
+							if (res) {
+								this.submitJob()
+							}
+						});
 					} else {
 						//不允许部分提交，提示
-						this.$refs.comMessage.showErrorMessage('请完成扫描后,再进行提交\n' + "已经扫描[" + this.scanCount +
-							"]箱总共[" + this
-							.subList.length + "]箱", res => {
+						this.$refs.comMessage.showErrorMessage("任务明细未全部完成,不允许部分提交!", res => {
 								if (res) {
 									this.openScanPopup();
 								}
diff --git a/src/pages/productionReturn/job/returnDetail.vue b/src/pages/productionReturn/job/returnDetail.vue
index 8bf54c4a..731d2a7d 100644
--- a/src/pages/productionReturn/job/returnDetail.vue
+++ b/src/pages/productionReturn/job/returnDetail.vue
@@ -349,12 +349,14 @@
 					//扫描数量小于任务数量，判断是否允许部分提交
 					if (this.jobContent.allowPartialComplete == "TRUE") {
 						//提交
-						this.submitJob();
+						this.$refs.comMessage.showQuestionMessage1("任务明细未全部完成,是否提交?", 'red', res => {
+							if (res) {
+								this.submitJob()
+							}
+						});
 					} else {
 						//不允许部分提交，提示
-						this.$refs.comMessage.showErrorMessage('请完成扫描后,再进行提交\n' + "已经扫描[" + this.scanCount +
-							"]箱总共[" + this
-							.subList.length + "]箱", res => {
+						this.$refs.comMessage.showErrorMessage("任务明细未全部完成,不允许部分提交!", res => {
 								if (res) {
 									this.openScanPopup();
 								}
diff --git a/src/pages/purchaseReceipt/job/receiptDetail.vue b/src/pages/purchaseReceipt/job/receiptDetail.vue
index fa506e5a..7e7e6899 100644
--- a/src/pages/purchaseReceipt/job/receiptDetail.vue
+++ b/src/pages/purchaseReceipt/job/receiptDetail.vue
@@ -454,16 +454,14 @@
 					//扫描数量小于任务数量，判断是否允许部分提交
 					if (this.jobContent.allowPartialComplete == "TRUE") {
 						//提交
-						this.$refs.comMessage.showQuestionMessage('还有未扫描的物料，是否继续提交?', res => {
+						this.$refs.comMessage.showQuestionMessage1("任务明细未全部完成,是否提交?", 'red', res => {
 							if (res) {
-								this.submitJob();
+								this.submitJob()
 							}
 						});
 					} else {
 						//不允许部分提交，提示
-						this.$refs.comMessage.showErrorMessage('请完成扫描后,再进行提交\n' + "已经扫描[" + this.scanCount +
-							"]箱总共[" + this
-							.subList.length + "]箱", res => {
+						this.$refs.comMessage.showErrorMessage("任务明细未全部完成,不允许部分提交!", res => {
 								if (res) {
 									this.openScanPopup();
 								}
diff --git a/src/pages/purchaseReturn/job/returnDetail.vue b/src/pages/purchaseReturn/job/returnDetail.vue
index 11708552..3c6f0907 100644
--- a/src/pages/purchaseReturn/job/returnDetail.vue
+++ b/src/pages/purchaseReturn/job/returnDetail.vue
@@ -350,17 +350,45 @@
 					this.showErrorMessage("扫描数为0,请先扫描")
 					return;
 				}
+				
+				//允许部分提交
+				//扫描数量和任务数量相等，直接提交
+				if (this.scanCount == this.subList.length) {
+					this.checkCount();
+				} else if (this.scanCount < this.subList.length) {
+					//扫描数量小于任务数量，判断是否允许部分提交
+					if (this.jobContent.allowPartialComplete == "TRUE") {
+						//提交
+						this.checkCount();
+					} else {
+						//不允许部分提交，提示
+						this.$refs.comMessage.showErrorMessage("任务明细未全部完成,不允许部分提交!", res => {
+								if (res) {
+									this.openScanPopup();
+								}
+							});
+					}
+				}
+			},
+			
+			checkCount(){
 				// 提交的数量和任务数量不一致提示
 				let str = ''
 				this.detailSource.forEach((item) => {
 					item.subList.forEach(cur => {
 						if (cur.qty != cur.handleQty) {
-							str += `包装号【${cur.packingNumber}】提交数量【${cur.handleQty}】与任务物料数量【${cur.qty}】不一致`
+							var tempHandleQty =0
+							if(cur.handleQty){
+								tempHandleQty=cur.handleQty
+							}else {
+								tempHandleQty =0
+							}
+							str += `包装号【${cur.packingNumber}】提交数量【${tempHandleQty}】与任务物料数量【${cur.qty}】不一致`
 						}
 					})
 				})
 				if (str) {
-					str += '，是否确认提交?'
+					str = '任务明细未全部完成,是否提交?\n'+str
 					this.$refs.comMessage.showQuestionMessage1(str, 'red', res => {
 						if (res) {
 							this.submitJob()
@@ -369,26 +397,6 @@
 				} else {
 					this.submitJob()
 				}
-				//允许部分提交
-				//扫描数量和任务数量相等，直接提交
-				// if (this.scanCount == this.subList.length) {
-				// 	this.submitJob();
-				// } else if (this.scanCount < this.subList.length) {
-				// 	//扫描数量小于任务数量，判断是否允许部分提交
-				// 	if (this.jobContent.allowPartialComplete == "TRUE") {
-				// 		//提交
-				// 		this.submitJob();
-				// 	} else {
-				// 		//不允许部分提交，提示
-				// 		this.$refs.comMessage.showErrorMessage('请完成扫描后,再进行提交\n' + "已经扫描[" + this.scanCount +
-				// 			"]箱总共[" + this
-				// 			.subList.length + "]箱", res => {
-				// 				if (res) {
-				// 					this.openScanPopup();
-				// 				}
-				// 			});
-				// 	}
-				// }
 			},
 
 			submitJob() {
diff --git a/src/pages/putaway/job/putawayDetail.vue b/src/pages/putaway/job/putawayDetail.vue
index a9d9fbe2..80540675 100644
--- a/src/pages/putaway/job/putawayDetail.vue
+++ b/src/pages/putaway/job/putawayDetail.vue
@@ -452,12 +452,14 @@
 					//扫描数量小于任务数量，判断是否允许部分提交
 					if (this.jobContent.allowPartialComplete == "TRUE") {
 						//提交
-						this.submitJob();
+						this.$refs.comMessage.showQuestionMessage1("任务明细未全部完成,是否提交?", 'red', res => {
+							if (res) {
+								this.submitJob()
+							}
+						});
 					} else {
 						//不允许部分提交，提示
-						this.$refs.comMessage.showErrorMessage('请完成扫描后,再进行提交\n' + "已经扫描[" + this.scanCount +
-							"]箱总共[" + this
-							.subList.length + "]箱", res => {
+						this.$refs.comMessage.showErrorMessage("任务明细未全部完成,不允许部分提交!", res => {
 								if (res) {
 									this.openScanPopup();
 								}
diff --git a/src/pages/scrap/job/scrapJobDetail.vue b/src/pages/scrap/job/scrapJobDetail.vue
index 13d08f94..f8a274ee 100644
--- a/src/pages/scrap/job/scrapJobDetail.vue
+++ b/src/pages/scrap/job/scrapJobDetail.vue
@@ -288,18 +288,44 @@
 					this.showErrorMessage("扫描数为0,请先扫描")
 					return;
 				}
+				
+				// //扫描数量和任务数量相等，直接提交
+				if (this.scanCount == this.subList.length) {
+					this.checkCount();
+				} else if (this.scanCount < this.subList.length) {
+					//扫描数量小于任务数量，判断是否允许部分提交
+					if (this.jobContent.allowPartialComplete == "TRUE") {
+						//提交
+						this.checkCount();
+					} else {
+						//不允许部分提交，提示
+						this.$refs.comMessage.showErrorMessage("任务明细未全部完成,不允许部分提交!", res => {
+								if (res) {
+									this.openScanPopup();
+								}
+							});
+					}
+				}
+			},
+			
+			checkCount(){
 				// 提交的数量和任务数量不一致提示
 				let str = ''
 				this.detailSource.forEach((item) => {
 					item.subList.forEach(cur => {
 						if (cur.qty != cur.handleQty) {
-							str += `包装号【${cur.packingNumber}】提交数量【${cur.handleQty}】与任务物料数量【${cur.qty}】不一致`
+							var tempHandleQty =0
+							if(cur.handleQty){
+								tempHandleQty=cur.handleQty
+							}else {
+								tempHandleQty =0
+							}
+							str += `包装号【${cur.packingNumber}】提交数量【${tempHandleQty}】与任务物料数量【${cur.qty}】不一致`
 						}
 					})
 				})
 				if (str) {
-					str += '，是否确认提交?'
-					
+					str = '任务明细未全部完成,是否提交?\n'+str
 					this.$refs.comMessage.showQuestionMessage1(str, 'red', res => {
 						if (res) {
 							this.submitJob()
@@ -308,25 +334,6 @@
 				} else {
 					this.submitJob()
 				}
-				// //扫描数量和任务数量相等，直接提交
-				// if (this.scanCount == this.subList.length) {
-				// 	this.submitJob();
-				// } else if (this.scanCount < this.subList.length) {
-				// 	//扫描数量小于任务数量，判断是否允许部分提交
-				// 	if (this.jobContent.allowPartialComplete == "TRUE") {
-				// 		//提交
-				// 		this.submitJob();
-				// 	} else {
-				// 		//不允许部分提交，提示
-				// 		this.$refs.comMessage.showErrorMessage('请完成扫描后,再进行提交\n' + "已经扫描[" + this.scanCount +
-				// 			"]箱总共[" + this
-				// 			.subList.length + "]箱", res => {
-				// 				if (res) {
-				// 					this.openScanPopup();
-				// 				}
-				// 			});
-				// 	}
-				// }
 			},
 
 			submitJob() {
diff --git a/src/pages/transfer/job/issueDetail.vue b/src/pages/transfer/job/issueDetail.vue
index ac03934e..b0f8477b 100644
--- a/src/pages/transfer/job/issueDetail.vue
+++ b/src/pages/transfer/job/issueDetail.vue
@@ -333,12 +333,14 @@
 					//扫描数量小于任务数量，判断是否允许部分提交
 					if (this.jobContent.allowPartialComplete == "TRUE") {
 						//提交
-						this.submitJob();
+						this.$refs.comMessage.showQuestionMessage1("任务明细未全部完成,是否提交?", 'red', res => {
+							if (res) {
+								this.submitJob()
+							}
+						});
 					} else {
 						//不允许部分提交，提示
-						this.$refs.comMessage.showErrorMessage('请完成扫描后,再进行提交\n' + "已经扫描[" + this.scanCount +
-							"]箱总共[" + this
-							.subList.length + "]箱", res => {
+						this.$refs.comMessage.showErrorMessage("任务明细未全部完成,不允许部分提交!", res => {
 								if (res) {
 									this.openScanPopup();
 								}
diff --git a/src/pages/transfer/job/receiptDetail.vue b/src/pages/transfer/job/receiptDetail.vue
index 82369338..0fce89d3 100644
--- a/src/pages/transfer/job/receiptDetail.vue
+++ b/src/pages/transfer/job/receiptDetail.vue
@@ -358,13 +358,14 @@
 				} else if (this.scanCount < this.subList.length) {
 					//扫描数量小于任务数量，判断是否允许部分提交
 					if (this.jobContent.allowPartialComplete == "TRUE") {
-						//提交
-						this.submitJob();
+						this.$refs.comMessage.showQuestionMessage1("任务明细未全部完成,是否提交?", 'red', res => {
+							if (res) {
+								this.submitJob()
+							}
+						});
 					} else {
 						//不允许部分提交，提示
-						this.$refs.comMessage.showErrorMessage('请完成扫描后,再进行提交\n' + "已经扫描[" + this.scanCount +
-							"]箱总共[" + this
-							.subList.length + "]箱", res => {
+						this.$refs.comMessage.showErrorMessage("任务明细未全部完成,不允许部分提交!", res => {
 								if (res) {
 									this.openScanPopup();
 								}
diff --git a/src/pages/transfer/job/transferDetail.vue b/src/pages/transfer/job/transferDetail.vue
index d362914a..2fd37fe0 100644
--- a/src/pages/transfer/job/transferDetail.vue
+++ b/src/pages/transfer/job/transferDetail.vue
@@ -368,13 +368,15 @@
 			async commit() {
 				//允许部分提交
 				if (this.jobContent.allowPartialComplete == "TRUE") {
-					this.submitJob();
+					this.$refs.comMessage.showQuestionMessage1("任务明细未全部完成,是否提交?", 'red', res => {
+						if (res) {
+							this.submitJob()
+						}
+					});
 				} else {
 					this.scanCount = this.getScanCount();
 					if (this.scanCount < this.subList.length) {
-						this.$refs.comMessage.showErrorMessage('请完成扫描后,再进行提交\n' + "已经扫描[" + this.scanCount +
-							"]箱总共[" + this
-							.subList.length + "]箱", res => {
+						this.$refs.comMessage.showErrorMessage("任务明细未全部完成,不允许部分提交!", res => {
 								if (res) {
 									this.openScanPopup();
 								}
diff --git a/src/pages/unPlanned/job/issueJobDetail.vue b/src/pages/unPlanned/job/issueJobDetail.vue
index 60aa60b6..0f8731ba 100644
--- a/src/pages/unPlanned/job/issueJobDetail.vue
+++ b/src/pages/unPlanned/job/issueJobDetail.vue
@@ -280,17 +280,44 @@
 					this.showErrorMessage("扫描数为0,请先扫描")
 					return;
 				}
+				
+				// //扫描数量和任务数量相等，直接提交
+				if (this.scanCount == this.subList.length) {
+					this.checkCount();
+				} else if (this.scanCount < this.subList.length) {
+					//扫描数量小于任务数量，判断是否允许部分提交
+					if (this.jobContent.allowPartialComplete == "TRUE") {
+						//提交
+						this.checkCount();
+					} else {
+						//不允许部分提交，提示
+						this.$refs.comMessage.showErrorMessage("任务明细未全部完成,不允许部分提交!", res => {
+								if (res) {
+									this.openScanPopup();
+								}
+							});
+					}
+				}
+			},
+			
+			checkCount(){
 				// 提交的数量和任务数量不一致提示
 				let str = ''
 				this.detailSource.forEach((item) => {
 					item.subList.forEach(cur => {
 						if (cur.qty != cur.handleQty) {
-							str += `包装号【${cur.packingNumber}】提交数量【${cur.handleQty}】与任务物料数量【${cur.qty}】不一致`
+							var tempHandleQty =0
+							if(cur.handleQty){
+								tempHandleQty=cur.handleQty
+							}else {
+								tempHandleQty =0
+							}
+							str += `包装号【${cur.packingNumber}】提交数量【${tempHandleQty}】与任务物料数量【${cur.qty}】不一致`
 						}
 					})
 				})
 				if (str) {
-					str += '，是否确认提交?'
+					str = '任务明细未全部完成,是否提交?\n'+str
 					this.$refs.comMessage.showQuestionMessage1(str, 'red', res => {
 						if (res) {
 							this.submitJob()
@@ -299,25 +326,6 @@
 				} else {
 					this.submitJob()
 				}
-				// //扫描数量和任务数量相等，直接提交
-				// if (this.scanCount == this.subList.length) {
-				// 	this.submitJob();
-				// } else if (this.scanCount < this.subList.length) {
-				// 	//扫描数量小于任务数量，判断是否允许部分提交
-				// 	if (this.jobContent.allowPartialComplete == "TRUE") {
-				// 		//提交
-				// 		this.submitJob();
-				// 	} else {
-				// 		//不允许部分提交，提示
-				// 		this.$refs.comMessage.showErrorMessage('请完成扫描后,再进行提交\n' + "已经扫描[" + this.scanCount +
-				// 			"]箱总共[" + this
-				// 			.subList.length + "]箱", res => {
-				// 				if (res) {
-				// 					this.openScanPopup();
-				// 				}
-				// 			});
-				// 	}
-				// }
 			},
 
 
diff --git a/src/pages/unPlanned/job/receiptJobDetail.vue b/src/pages/unPlanned/job/receiptJobDetail.vue
index d9049d28..949ba2a7 100644
--- a/src/pages/unPlanned/job/receiptJobDetail.vue
+++ b/src/pages/unPlanned/job/receiptJobDetail.vue
@@ -261,12 +261,14 @@
 					//扫描数量小于任务数量，判断是否允许部分提交
 					if (this.jobContent.allowPartialComplete == "TRUE") {
 						//提交
-						this.submitJob();
+						this.$refs.comMessage.showQuestionMessage1("任务明细未全部完成,是否提交?", 'red', res => {
+							if (res) {
+								this.submitJob()
+							}
+						});
 					} else {
 						//不允许部分提交，提示
-						this.$refs.comMessage.showErrorMessage('请完成扫描后,再进行提交\n' + "已经扫描[" + this.scanCount +
-							"]箱总共[" + this
-							.subList.length + "]箱", res => {
+						this.$refs.comMessage.showErrorMessage("任务明细未全部完成,不允许部分提交!", res => {
 								if (res) {
 									this.openScanPopup();
 								}

From 069cad56ccf46aa46b0106b4629d15aeb66a0813 Mon Sep 17 00:00:00 2001
From: lijuncheng <juncheng.li@ccwin-in.com>
Date: Wed, 14 Aug 2024 09:15:23 +0800
Subject: [PATCH 03/33] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BD=91=E7=BB=9C?=
 =?UTF-8?q?=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/httpRequest3.js   |  4 +++-
 src/pages/login/index.vue | 23 +++++++++++++++--------
 src/store/modules/user.js | 12 +++++-------
 3 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/src/api/httpRequest3.js b/src/api/httpRequest3.js
index 81a84796..99e3086e 100644
--- a/src/api/httpRequest3.js
+++ b/src/api/httpRequest3.js
@@ -89,6 +89,8 @@ function service(options = {}) {
 				message = '接口' + message.substr(message.length - 3) + '异常'
 			} else if (message.includes('get lock')) {
 				message = '接口' + "数据库死锁"
+			}else if(message.includes('statusCode:-1')){
+				message = "当前设备无网络，请检查网络后重试"
 			}
 			reject("系统异常:" + message);
 			console.log("系统异常", message)
@@ -99,7 +101,7 @@ function service(options = {}) {
 				const networkType = res.networkType;
 				console.log("网络类型", networkType)
 				if (networkType == "none") {
-					reject("当前无网络");
+					reject("当前设备无网络，请检查网络后重试");
 				} else {
 					uni.request(options);
 				}
diff --git a/src/pages/login/index.vue b/src/pages/login/index.vue
index 46030461..50420dd7 100644
--- a/src/pages/login/index.vue
+++ b/src/pages/login/index.vue
@@ -226,14 +226,21 @@
 					title: "正在登录",
 					mask: true
 				})
-				await this.$store.dispatch('Login', logininfo);
-				// await this.$store.dispatch('GetTenantIdInfo', this.tenantName)
-				uni.hideLoading()
-				uni.setStorageSync('hasLogin', true)
-				uni.switchTab({
-					url: '/pages/index/index'
-				});
-				uni.setStorageSync('username', this.username);
+				try{
+					var result = await this.$store.dispatch('Login', logininfo);
+					// await this.$store.dispatch('GetTenantIdInfo', this.tenantName)
+					console.log(result)
+					uni.hideLoading()
+					uni.setStorageSync('hasLogin', true)
+					uni.switchTab({
+						url: '/pages/index/index'
+					});
+					uni.setStorageSync('username', this.username);
+				}catch(e){
+					uni.hideLoading()
+					this.showErrorMessage(e)
+				}
+				
 			},
 
 
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 509c9484..db0df418 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -59,16 +59,14 @@ const user = {
 						storage.setStorage(storage.constant.token,res.accessToken)
 						resolve(res)
 					}else {
-						uni.showToast({
-							title:res.msg
-						})
+						if(res.msg){
+							reject(res.msg)
+						}else {
+							reject("登录失败")
+						}
 					}
-					
 				}).catch(error => {
 					reject(error)
-					uni.showToast({
-						title:error
-					})
 				})
 			})
 		},

From 68ebff7d5af4db5f254af4beff3444ec4492d92d Mon Sep 17 00:00:00 2001
From: zhaoyiran <zhaoyrd@yonyou.com>
Date: Wed, 14 Aug 2024 10:50:24 +0800
Subject: [PATCH 04/33] HL-4896

---
 src/mycomponents/qty/balanceQtyEdit.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/mycomponents/qty/balanceQtyEdit.vue b/src/mycomponents/qty/balanceQtyEdit.vue
index 741d2cc3..e4c8c031 100644
--- a/src/mycomponents/qty/balanceQtyEdit.vue
+++ b/src/mycomponents/qty/balanceQtyEdit.vue
@@ -36,7 +36,7 @@
 								<text>数量 : </text>
 								<view class="uni-flex uni-row uni-center" style="align-items: center;">
 									<input class="qty_input" v-model="allQty" :focus="true" type="number"
-										@confirm="confirm()" @input="checkNum" :maxlength="maxlength" />
+                         @confirm="confirm()" @input="checkNum" :maxlength="maxlength" disabled :style="{background:'#f5f5f5',color:'#bbbbbb'}"/>
 									<uom :uom="dataContent.uom"></uom>
 								</view>
 							</view>

From e9ed633dd0fab3037ff201ca81720cbe34bb7a96 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Wed, 14 Aug 2024 11:09:52 +0800
Subject: [PATCH 05/33] =?UTF-8?q?=E5=B0=81=E8=A3=85=E9=98=B2=E6=AD=A2?=
 =?UTF-8?q?=E9=87=8D=E5=A4=8D=E7=82=B9=E5=87=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/common/noclick.js                         | 21 ++++++++++++++++++-
 src/main.js                                   |  1 +
 src/pages/issue/record/directIssue.vue        |  5 ++---
 .../package/record/splitPackageRecord.vue     |  2 +-
 4 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/src/common/noclick.js b/src/common/noclick.js
index 2c4191ee..6fe72a29 100644
--- a/src/common/noclick.js
+++ b/src/common/noclick.js
@@ -11,15 +11,34 @@ function noMultipleClicks(methods, info) {
         } else {
             methods();
         }
-        setTimeout(()=> {
+        let timer = setTimeout(()=> {
             that.noClick= true;
+			clearTimeout(timer)
         }, 2000)
     } else {
         // 这里是重复点击的判断
     }
 }
 
+
+// 节流函数
+const throttle = (fn, t,_this) => {
+	console.log('throttle')
+      return  ()=> {
+        if (!_this.timer) {
+          _this.timer = setTimeout(()=>{
+            fn()
+			console.log('fn')
+            //·清空定时器
+            _this.timer = null
+          }, t)
+        }
+      }
+}
+
+
 //导出
 export default {
     noMultipleClicks,//禁止多次点击
+	throttle
 }
diff --git a/src/main.js b/src/main.js
index 6344a1ab..6673bb74 100644
--- a/src/main.js
+++ b/src/main.js
@@ -36,6 +36,7 @@ export function createApp() {
 	app.use(uView)
 	app.component('comMessage', comMessage)
 	app.config.globalProperties.$noMultipleClicks = noclick.noMultipleClicks;
+	app.config.globalProperties.$throttle = noclick.throttle;
 	// startApp(app);
 	return {
 		app,
diff --git a/src/pages/issue/record/directIssue.vue b/src/pages/issue/record/directIssue.vue
index 7d44bfd7..5970463b 100644
--- a/src/pages/issue/record/directIssue.vue
+++ b/src/pages/issue/record/directIssue.vue
@@ -5,10 +5,9 @@
 		</view>
 		<view class="page-wraper" v-if="detailSource.length>0">
 			<view class="page-header">
-				<view class="header_item">
-					来源库位 : {{fromLocationCode}}
+				<view class="header-view header_item">
+						来源库位 : {{fromLocationCode}}
 				</view>
-				<view class='split_line'></view>
 			</view>
 			<view class="page-main">
 				<scroll-view scroll-y="true" class="page-main-scroll">
diff --git a/src/pages/package/record/splitPackageRecord.vue b/src/pages/package/record/splitPackageRecord.vue
index bd4faefb..c4a93890 100644
--- a/src/pages/package/record/splitPackageRecord.vue
+++ b/src/pages/package/record/splitPackageRecord.vue
@@ -30,7 +30,7 @@
 					<view class="">
 					</view>
 					<view class=" uni-flex uni-row">
-						<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
+						<button class="btn_single_commit" hover-class="btn_commit_after" @click="$throttle(commit,2000,this)()">提交</button>
 					</view>
 				</view>
 			</view>

From 898276b3c36a17827de606e83b1d584327f48702 Mon Sep 17 00:00:00 2001
From: lijuncheng <juncheng.li@ccwin-in.com>
Date: Wed, 14 Aug 2024 11:31:02 +0800
Subject: [PATCH 06/33] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=91=E6=96=99?=
 =?UTF-8?q?=E6=8E=A5=E6=94=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../job/productionReceiptDetail.vue           | 25 ++++++++++---------
 .../job/productionReceiptJob.vue              |  5 ++++
 2 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/src/pages/productionReceipt/job/productionReceiptDetail.vue b/src/pages/productionReceipt/job/productionReceiptDetail.vue
index 6270e88e..08e9e803 100644
--- a/src/pages/productionReceipt/job/productionReceiptDetail.vue
+++ b/src/pages/productionReceipt/job/productionReceiptDetail.vue
@@ -230,7 +230,8 @@
 				}
 				//数量不相等，提示
 				if(noCommitInfo){
-					this.showQuestionMessage("扫描数量["+noCommitInfo.handleQty+"]任务数量["+noCommitInfo.qty+"]不一致,是否提交?",res=>{
+					var handQty =noCommitInfo.handleQty?noCommitInfo.handleQty:0
+					this.showQuestionMessage("扫描数量["+handQty+"]任务数量["+noCommitInfo.qty+"]不一致,是否提交?",res=>{
 						if(res){
 							this.commit()
 						}
@@ -452,17 +453,17 @@
 				});
 				var params = this.setParams()
 				console.log("提交参数", JSON.stringify(params));
-				productionReceiptJobSubmit(params).then(res => {
-					uni.hideLoading()
-					if (res.data) {
-						this.showCommitSuccessMessage("提交成功\n生成发料接收记录\n" + res.data)
-					} else {
-						this.showErrorMessage("提交失败[" + res.msg + "]")
-					}
-				}).catch(error => {
-					uni.hideLoading()
-					this.showErrorMessage(error)
-				})
+				// productionReceiptJobSubmit(params).then(res => {
+				// 	uni.hideLoading()
+				// 	if (res.data) {
+				// 		this.showCommitSuccessMessage("提交成功\n生成发料接收记录\n" + res.data)
+				// 	} else {
+				// 		this.showErrorMessage("提交失败[" + res.msg + "]")
+				// 	}
+				// }).catch(error => {
+				// 	uni.hideLoading()
+				// 	this.showErrorMessage(error)
+				// })
 
 
 				// var itemCodes = []
diff --git a/src/pages/productionReceipt/job/productionReceiptJob.vue b/src/pages/productionReceipt/job/productionReceiptJob.vue
index c92ec8f5..fe5f82a4 100644
--- a/src/pages/productionReceipt/job/productionReceiptJob.vue
+++ b/src/pages/productionReceipt/job/productionReceiptJob.vue
@@ -373,6 +373,11 @@
 							action: "in",
 							value: result.package.number + "," + result.package.parentNumber
 						},
+						{
+							column: "status",
+							action: "in",
+							value: '1,2'
+						},
 						{
 							column: "batch",
 							action: "==",

From 1395fb75231f68a5ad62b70d0b4f267e1e534eed Mon Sep 17 00:00:00 2001
From: lijuncheng <juncheng.li@ccwin-in.com>
Date: Wed, 14 Aug 2024 14:29:19 +0800
Subject: [PATCH 07/33] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=89=AB=E6=8F=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/mycomponents/scan/winComScan.vue          | 55 +++++++++----------
 src/pages/package/coms/comScanPackagePack.vue |  4 +-
 2 files changed, 28 insertions(+), 31 deletions(-)

diff --git a/src/mycomponents/scan/winComScan.vue b/src/mycomponents/scan/winComScan.vue
index fc2c00ee..0a55bf5f 100644
--- a/src/mycomponents/scan/winComScan.vue
+++ b/src/mycomponents/scan/winComScan.vue
@@ -4,15 +4,11 @@
 	<view>
 		<view class="pop_tab">
 			<view class="tab_info">
-				<view class="conbox" >
-					<textarea 
-					 v-model="scanMsg" trim="all" maxlength="1000" style="margin-left: 5px;width: 90%;"
-						 :placeholder="placeholderValue" 
-						 :focus="boxfocus"
-						@blur="handleBlur"
-						 @focus="handleFocus" 
-						@input="handelScanMsg" :cursor="cursorIndex" ></textarea>
-					</view>
+				<view class="conbox">
+					<textarea v-model="scanMsg" trim="all" maxlength="1000" style="margin-left: 5px;width: 90%;"
+						:placeholder="placeholderValue" :focus="boxfocus" @blur="handleBlur" @focus="handleFocus"
+						@input="handelScanMsg" ></textarea>
+				</view>
 
 				<view class="uni-flex uni-row space-between u-col-center">
 					<!-- <view class="paizhao" @click="scanQRCode()" v-if="true">
@@ -20,7 +16,7 @@
 					</view> -->
 
 					<view class="uni-flex">
-						<button class="clean_scan_btn"  @touchend.prevent="clearScanValue()">清空</button>
+						<button class="clean_scan_btn" @touchend.prevent="clearScanValue()">清空</button>
 						<button class="scan_btn" @click="clickScanMsg()">扫描</button>
 					</view>
 				</view>
@@ -37,8 +33,7 @@
 						</view>
 					</view>
 					<u-line class='line_color' style='padding-top: 10rpx;padding-bottom: 20rpx;'></u-line>
-					<scroll-view scroll-y="true" class="scroll-view" v-if="expand"
-						style="height: 70px;">
+					<scroll-view scroll-y="true" class="scroll-view" v-if="expand" style="height: 70px;">
 						<view class="uni-flex u-col" v-for="(item,index) in scanList">
 							<view style="width: 100%;max-height: 100px;">
 								<view class="uni-flex u-row space-between u-col-center" @click="showItem(item)">
@@ -59,7 +54,7 @@
 		<comMessage ref="comMessage"></comMessage>
 	</view>
 </template>
-<script >
+<script>
 	import {
 		getLabelInfo
 	} from '../../common/label.js';
@@ -104,7 +99,7 @@
 			}
 		},
 		mounted() {
-			
+
 		},
 		watch: {
 			placeholder() {
@@ -139,7 +134,7 @@
 			},
 			clearScanValue() {
 				this.scanMsg = ''
-				this.cursorIndex =0
+				// this.cursorIndex = 0
 				this.getfocus();
 			},
 			clickScanMsg() {
@@ -153,11 +148,13 @@
 				// 	mask: true
 				// })
 				let that = this;
-				let index = that.scanMsg.indexOf('\n');
-				if (index >= 0) {
+				// if(index==-1){
+				// 	that.scanMsg =that.scanMsg + "\n";
+				// }
+				if (that.scanMsg.includes('\n')) {
 					// that.scanMsg = 'HPQ;V1.0;ICE115F11161AG;PP20230427000027;B20230427002;Q50';
 					setTimeout(() => {
-						 that.losefocus();
+						that.losefocus();
 						let content = uni.$u.trim(that.scanMsg)
 						if (content == "") {
 							// that.getfocus();
@@ -176,7 +173,7 @@
 						getLabelInfo(content, this.headerType, callback => {
 							// uni.hideLoading();
 							let scanResult = callback;
-							scanResult.scanMessage=content
+							scanResult.scanMessage = content
 							if (scanResult.success) {
 								that.clear();
 								// that.getfocus();//不能自动获取焦点
@@ -191,14 +188,13 @@
 								})
 							}
 						});
-					}, 500);
+					}, 200);
 				}
 			},
-			
-			handleFocus(){
-			},
-			
-			handleBlur(){
+
+			handleFocus() {},
+
+			handleBlur() {
 				// setTimeout(res=>{
 				// 	uni.hideKeyboard();
 				// },200)
@@ -216,14 +212,13 @@
 				});
 			},
 			clear() {
-				if(this.clearResult)
-				{
-				this.cursorIndex = 0;
-				this.scanMsg = ''
+				if (this.clearResult) {
+					this.scanMsg = ""
+					// this.cursorIndex = 0;
 				}
 			},
 			iconClick(type) {
-				this.$emit("clearResult", this.scanMsgk);
+				this.$emit("clearResult", this.scanMsg);
 			},
 			expands() {
 				this.expand = !this.expand;
diff --git a/src/pages/package/coms/comScanPackagePack.vue b/src/pages/package/coms/comScanPackagePack.vue
index 34278165..3ffd4563 100644
--- a/src/pages/package/coms/comScanPackagePack.vue
+++ b/src/pages/package/coms/comScanPackagePack.vue
@@ -353,8 +353,10 @@ import { getDirectoryItemArray } from '@/common/directory';
 				let record = this.creatRecord(label, balance, packageInfo);
 				batch.Records.push(record);
 				this.calcBatchHandleQty(batch);
-				this.packGetFocus();
 				this.$emit('refresh');
+				setTimeout(res=>{
+					this.packGetFocus();
+				},100)
 			},
 
 			swipeClick(e, item, index) {

From aa5e7822b5d6123d70d3172ecf39a17772a3f603 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Wed, 14 Aug 2024 15:33:31 +0800
Subject: [PATCH 08/33] =?UTF-8?q?=E9=87=87=E8=B4=AD=E6=94=B6=E8=B4=A7?=
 =?UTF-8?q?=E6=89=93=E5=8D=B0=E6=89=B9=E6=AC=A1=E6=94=B9=E6=88=90=E4=BE=9B?=
 =?UTF-8?q?=E5=BA=94=E5=95=86=E6=89=B9=E6=AC=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/pointPutawayJob/index.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/pointPutawayJob/index.vue b/src/pages/pointPutawayJob/index.vue
index bac7be5b..d3c1fe15 100644
--- a/src/pages/pointPutawayJob/index.vue
+++ b/src/pages/pointPutawayJob/index.vue
@@ -26,7 +26,7 @@
 							<tr>
 								<td>供应商</td>
 								<td>{{item.supplierCode}}</td>
-								<td>批次</td>
+								<td>供应商批次</td>
 								<td>{{item.supplierBatch}}</td>
 							</tr>
 							<tr>
@@ -218,7 +218,7 @@
 													<tr>
 														<td>供应商</td>
 														<td>${item.supplierCode}</td>
-														<td>批次</td>
+														<td>供应商批次</td>
 														<td>${item.supplierBatch}</td>
 													</tr>
 													<tr>

From 75599d2de2924072579c2610cd1baf8e64363a0d Mon Sep 17 00:00:00 2001
From: niexiting <85552560@qq.com>
Date: Wed, 14 Aug 2024 17:54:25 +0800
Subject: [PATCH 09/33] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=9B=B4=E6=8E=A5?=
 =?UTF-8?q?=E8=A1=A5=E6=96=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/issue/record/directIssue.vue | 28 +++++++++++++-------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/pages/issue/record/directIssue.vue b/src/pages/issue/record/directIssue.vue
index 2a784cbe..e746af75 100644
--- a/src/pages/issue/record/directIssue.vue
+++ b/src/pages/issue/record/directIssue.vue
@@ -5,10 +5,11 @@
 		</view>
 		<view class="page-wraper" v-if="detailSource.length>0">
 			<view class="page-header">
-				<view class="header_item">
-					来源库位 : {{fromLocationCode}}
+				<view class="header-view">
+					<view class="header_item">
+						来源库位 : {{fromLocationCode}}
+					</view>
 				</view>
-				<view class='split_line'></view>
 			</view>
 			<view class="page-main">
 				<scroll-view scroll-y="true" class="page-main-scroll">
@@ -16,9 +17,8 @@
 						<view class="">
 							<record-com-detail-card :dataContent="item" :index="index" :settingParam="dataContent"
 								:isShowFromLocation="false" @removeItem="removeItem(index,item)"
-								:isShowToLocation="false"
-								:isShowParentToLocation="false"
-								 @updateData="updateData" @removePack="removePack">
+								:isShowToLocation="false" :isShowParentToLocation="false" @updateData="updateData"
+								@removePack="removePack">
 							</record-com-detail-card>
 
 						</view>
@@ -45,7 +45,7 @@
 			</view>
 			<win-scan-button @goScan='openScanPopup'></win-scan-button>
 		</view>
-		
+
 		<winComScanBalance ref="scanPopup" @getBalance='getScanResult' :bussinessCode="businessTypeCode">
 		</winComScanBalance>
 		<comMessage ref="comMessage"></comMessage>
@@ -132,7 +132,7 @@
 				show: false,
 				positionInfo: "请选择生产线",
 				resultData: {},
-				itemCode:""
+				itemCode: ""
 			};
 		},
 		onLoad(option) {
@@ -170,7 +170,7 @@
 		mounted() {},
 
 		methods: {
-			
+
 			getBusinessType() {
 				getBusinessType(this.businessTypeCode, res => {
 					if (res.success) {
@@ -183,7 +183,7 @@
 					}
 				});
 			},
-			
+
 			getScanResult(result) {
 				this.setData(result);
 			},
@@ -191,14 +191,14 @@
 				let balance = result.balance;
 				let label = result.label;
 				let pack = result.package;
-			
-			
+
+
 				if (this.fromLocationCode && this.fromLocationCode != balance.locationCode) {
 					this.showErrorMessage("箱码[" + balance.packingNumber + "批次[" + balance.batch + "]在库位[" + this
 						.fromLocationCode + "]没有库存余额")
 					return;
 				}
-			
+
 				var item = this.detailSource.find(res => {
 					if (res.itemCode == balance.itemCode) {
 						return res
@@ -514,7 +514,7 @@
 				this.toWarehouseCode = '';
 				this.detailSource = [];
 				this.positionInfo = "请选择生产线";
-				this.itemCode=""
+				this.itemCode = ""
 			}
 		}
 	}

From c23b7e763da88e2f16bcb9a96a23348118a66a01 Mon Sep 17 00:00:00 2001
From: lijuncheng <juncheng.li@ccwin-in.com>
Date: Wed, 14 Aug 2024 18:30:29 +0800
Subject: [PATCH 10/33] =?UTF-8?q?t=20status=20=E4=BF=AE=E6=94=B9=E5=8F=91?=
 =?UTF-8?q?=E6=96=99=E6=8E=A5=E6=94=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../job/productionReceiptDetail.vue           | 80 +++++++++----------
 1 file changed, 40 insertions(+), 40 deletions(-)

diff --git a/src/pages/productionReceipt/job/productionReceiptDetail.vue b/src/pages/productionReceipt/job/productionReceiptDetail.vue
index 08e9e803..faa85925 100644
--- a/src/pages/productionReceipt/job/productionReceiptDetail.vue
+++ b/src/pages/productionReceipt/job/productionReceiptDetail.vue
@@ -453,46 +453,46 @@
 				});
 				var params = this.setParams()
 				console.log("提交参数", JSON.stringify(params));
-				// productionReceiptJobSubmit(params).then(res => {
-				// 	uni.hideLoading()
-				// 	if (res.data) {
-				// 		this.showCommitSuccessMessage("提交成功\n生成发料接收记录\n" + res.data)
-				// 	} else {
-				// 		this.showErrorMessage("提交失败[" + res.msg + "]")
-				// 	}
-				// }).catch(error => {
-				// 	uni.hideLoading()
-				// 	this.showErrorMessage(error)
-				// })
-
-
-				// var itemCodes = []
-				// this.detailSource.forEach(item => {
-				// 	itemCodes.push(item.itemCode)
-				// })
-
-				// getManagementPrecisions(itemCodes, this.toLocationCode, res => {
-				// 	if (res.success) {
-				// 		this.managementList = res.list;
-				// 		var params = this.setParams()
-				// 		console.log("提交参数", JSON.stringify(params));
-
-				// 		productionReceiptJobSubmit(params).then(res => {
-				// 			uni.hideLoading()
-				// 			if (res.data) {
-				// 				this.showCommitSuccessMessage("提交成功\n生成发料接收记录\n" + res.data)
-				// 			} else {
-				// 				this.showErrorMessage("提交失败[" + res.msg + "]")
-				// 			}
-				// 		}).catch(error => {
-				// 			uni.hideLoading()
-				// 			this.showErrorMessage(error)
-				// 		})
-				// 	} else {
-				// 		uni.hideLoading();
-				// 		this.showErrorMessage(res.message);
-				// 	}
-				// });
+				productionReceiptJobSubmit(params).then(res => {
+					uni.hideLoading()
+					if (res.data) {
+						this.showCommitSuccessMessage("提交成功\n生成发料接收记录\n" + res.data)
+					} else {
+						this.showErrorMessage("提交失败[" + res.msg + "]")
+					}
+				}).catch(error => {
+					uni.hideLoading()
+					this.showErrorMessage(error)
+				})
+
+
+				var itemCodes = []
+				this.detailSource.forEach(item => {
+					itemCodes.push(item.itemCode)
+				})
+
+				getManagementPrecisions(itemCodes, this.toLocationCode, res => {
+					if (res.success) {
+						this.managementList = res.list;
+						var params = this.setParams()
+						console.log("提交参数", JSON.stringify(params));
+
+						productionReceiptJobSubmit(params).then(res => {
+							uni.hideLoading()
+							if (res.data) {
+								this.showCommitSuccessMessage("提交成功\n生成发料接收记录\n" + res.data)
+							} else {
+								this.showErrorMessage("提交失败[" + res.msg + "]")
+							}
+						}).catch(error => {
+							uni.hideLoading()
+							this.showErrorMessage(error)
+						})
+					} else {
+						uni.hideLoading();
+						this.showErrorMessage(res.message);
+					}
+				});
 			},
 
 			setParams() {

From 12f8e803a5d37d65196d765b17aa41b6a7d59433 Mon Sep 17 00:00:00 2001
From: lijuncheng <juncheng.li@ccwin-in.com>
Date: Wed, 14 Aug 2024 18:46:29 +0800
Subject: [PATCH 11/33] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=AD=9B=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                       |  2 +-
 .env.production                        |  9 ++++----
 .hbuilderx/launch.json                 |  2 +-
 src/api/request2.js                    | 23 +++++++++++++++++++
 src/manifest.json                      |  4 ++--
 src/pages.json                         | 20 ++++++++++++++++-
 src/pages/issue/job/issueJob.vue       |  2 ++
 src/pages/issue/record/directIssue.vue | 31 ++++++++++++++++++++++++--
 8 files changed, 82 insertions(+), 11 deletions(-)

diff --git a/.env.development b/.env.development
index 8fd8b72c..9bf7280a 100644
--- a/.env.development
+++ b/.env.development
@@ -2,7 +2,7 @@ VITE_BASE_URL=http://172.22.32.9:81/api/admin-api
 VITE_BASE_URL_IMAGE=http://172.22.32.9:81/admin-api
 
 # 租户配置
-VITE_TENANT='[{"text":"长春1379","value":1},{"text":"成都1397","value":2},{"text":"长春2379","value":3}]'
+VITE_TENANT='[{"text":"成都1397","value":2},{"text":"长春2379","value":3}]'
 
 # 是否是测试环境
 VITE_isDevelopment=true
diff --git a/.env.production b/.env.production
index 9a603299..f6803774 100644
--- a/.env.production
+++ b/.env.production
@@ -1,11 +1,12 @@
-VITE_BASE_URL=http://172.21.32.13:81/api/admin-api
-VITE_BASE_URL_IMAGE=http://172.21.32.13:81/admin-api
+VITE_BASE_URL=http://172.22.32.8:81/api/admin-api
+VITE_BASE_URL_IMAGE=http://172.22.32.8:81/admin-api
 
 # 租户配置
-VITE_TENANT='[{"text":"长春1379","value":1}]'
+VITE_TENANT='[{"text":"成都1397","value":2},{"text":"长春2379","value":3}]'
 
 # 是否是测试环境
 VITE_isDevelopment=false
 
+
 # 积木报表请求路径
-VITE_JMREPORT_BASE_URL='http://172.21.32.13:90'
+VITE_JMREPORT_BASE_URL='http://172.22.32.8:90'
diff --git a/.hbuilderx/launch.json b/.hbuilderx/launch.json
index 8fec1895..8c453cd3 100644
--- a/.hbuilderx/launch.json
+++ b/.hbuilderx/launch.json
@@ -17,7 +17,7 @@
             "type" : "uni-app:h5"
         },
         {
-            "playground" : "custom",
+            "playground" : "standard",
             "type" : "uni-app:app-android"
         }
     ]
diff --git a/src/api/request2.js b/src/api/request2.js
index c8dbcd30..1bd4066d 100644
--- a/src/api/request2.js
+++ b/src/api/request2.js
@@ -546,6 +546,29 @@ export function getBasicItemByCode(itemCode) {
 		pageNo: 1,
 		pageSize: 100
 	}
+	return request({
+		url: baseApi + "/wms/itembasic/page",
+		method: "post",
+		data: params,
+	});
+}
+
+/**
+ * 查询物品信息接口
+ * @param {*} code  物品代码
+ * 
+ */
+export function getBasicItemByCodeSenior(itemCode) {
+
+	var params = {
+		filters: [{
+			column: "column",
+			action: "like",
+			value: itemCode
+		}],
+		pageNo: 1,
+		pageSize: 1000
+	} 
 	return request({
 		url: baseApi + "/wms/itembasic/page",
 		method: "get",
diff --git a/src/manifest.json b/src/manifest.json
index 7a1fc122..b7047d24 100644
--- a/src/manifest.json
+++ b/src/manifest.json
@@ -3,8 +3,8 @@
     "package" : "uni.UNI43932FE",
     "appid" : "__UNI__C9CF4BF",
     "description" : "",
-    "versionName" : "1.0.55",
-    "versionCode" : 55,
+    "versionName" : "1.0.58",
+    "versionCode" : 58,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
diff --git a/src/pages.json b/src/pages.json
index b697869a..33a6771c 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -606,7 +606,25 @@
 				"navigationBarTitleText": "直接发料",
 				"enablePullDownRefresh": false,
 				"titleNView": {
-					"autoBackButton": "true"
+					"autoBackButton": "true",
+					"buttons": [
+						// 右边按钮
+						{
+						
+							"float": "right",
+							"fontSize": "58rpx", //按钮上文字的大小
+							"text": "\ue696",
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
+						
+						},
+						{
+					
+							"float": "right",
+							"fontSize": "52rpx", //按钮上文字的大小
+							"text": "\ue6e2",
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
+						}
+					]
 				}
 			}
 		},
diff --git a/src/pages/issue/job/issueJob.vue b/src/pages/issue/job/issueJob.vue
index a145d723..5d5db6d8 100644
--- a/src/pages/issue/job/issueJob.vue
+++ b/src/pages/issue/job/issueJob.vue
@@ -194,6 +194,7 @@
 						this.fromInventoryStatuses = res.fromInventoryStatuses.split(',');
 						this.fromLocationAreaTypeList = res.fromLocationAreaTypeList
 						// this.openScanPopup();
+						this.$refs.scanPopup.openScanPopup(this.businessType);
 					} else {
 						this.showErrorMessage(res.message)
 					}
@@ -294,6 +295,7 @@
 					uni.hideLoading();
 					if (type === "refresh") {
 						uni.stopPullDownRefresh();
+						this.openScanPopup()
 					}
 					var list = res.data.list;
 
diff --git a/src/pages/issue/record/directIssue.vue b/src/pages/issue/record/directIssue.vue
index e746af75..86dad12a 100644
--- a/src/pages/issue/record/directIssue.vue
+++ b/src/pages/issue/record/directIssue.vue
@@ -48,6 +48,7 @@
 
 		<winComScanBalance ref="scanPopup" @getBalance='getScanResult' :bussinessCode="businessTypeCode">
 		</winComScanBalance>
+		<balanceQuery ref="refBalanceQuery" ></balanceQuery>
 		<comMessage ref="comMessage"></comMessage>
 	</view>
 </template>
@@ -98,6 +99,8 @@
 	import recordDetailCard from '@/mycomponents/record/recordDetailCard.vue'
 	import balanceSelect from '@/mycomponents/balance/balanceSelect.vue'
 	import winComScanBalance from '@/mycomponents/scan/winComScanBalance.vue'
+	import balanceQuery from '@/mycomponents/query/balanceQuery.vue'
+	
 
 	export default {
 		components: {
@@ -110,7 +113,8 @@
 			recordComDetailCard,
 			recordDetailCard,
 			balanceSelect,
-			winComScanBalance
+			winComScanBalance,
+			balanceQuery
 		},
 		data() {
 			return {
@@ -156,10 +160,13 @@
 			// }
 
 		},
+		
 		//返回首页
 		onNavigationBarButtonTap(e) {
 			if (e.index === 0) {
 				goHome();
+			} else if (e.index == 1) {
+				this.$refs.refBalanceQuery.showDrawer();
 			}
 		},
 		//拦截返回按钮事件
@@ -170,7 +177,27 @@
 		mounted() {},
 
 		methods: {
-
+			showDrawer() {
+							this.$refs.showRight.open();
+						},
+						closeDrawer() {
+							this.$refs.showRight.close();
+						},
+			
+			showDrawer() {
+							this.$refs.showRight.open();
+						},
+						closeDrawer() {
+							this.$refs.showRight.close();
+						},
+			
+			showDrawer() {
+							this.$refs.showRight.open();
+						},
+						closeDrawer() {
+							this.$refs.showRight.close();
+						},
+			
 			getBusinessType() {
 				getBusinessType(this.businessTypeCode, res => {
 					if (res.success) {

From 776ffd16b1f84c896a4f792ba3d547a34806c18e Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Wed, 14 Aug 2024 18:53:33 +0800
Subject: [PATCH 12/33] =?UTF-8?q?=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/manifest.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/manifest.json b/src/manifest.json
index 7a1fc122..b7047d24 100644
--- a/src/manifest.json
+++ b/src/manifest.json
@@ -3,8 +3,8 @@
     "package" : "uni.UNI43932FE",
     "appid" : "__UNI__C9CF4BF",
     "description" : "",
-    "versionName" : "1.0.55",
-    "versionCode" : 55,
+    "versionName" : "1.0.58",
+    "versionCode" : 58,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {

From 686a10f682733d21bd8cdd7b08625eb0087f30f2 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Wed, 14 Aug 2024 22:33:03 +0800
Subject: [PATCH 13/33] =?UTF-8?q?=E7=BC=96=E8=BE=91=E6=95=B0=E9=87=8F?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=E5=B0=81=E8=A3=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/mycomponents/qty/balanceQtyEdit.vue                 | 8 ++++++--
 src/pages/inventoryMove/coms/comInventoryDetailCard.vue | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/mycomponents/qty/balanceQtyEdit.vue b/src/mycomponents/qty/balanceQtyEdit.vue
index e4c8c031..79109196 100644
--- a/src/mycomponents/qty/balanceQtyEdit.vue
+++ b/src/mycomponents/qty/balanceQtyEdit.vue
@@ -36,7 +36,7 @@
 								<text>数量 : </text>
 								<view class="uni-flex uni-row uni-center" style="align-items: center;">
 									<input class="qty_input" v-model="allQty" :focus="true" type="number"
-                         @confirm="confirm()" @input="checkNum" :maxlength="maxlength" disabled :style="{background:'#f5f5f5',color:'#bbbbbb'}"/>
+                         @confirm="confirm()" @input="checkNum" :maxlength="maxlength" :disabled="!allowEditQty" :style="allowEditQty?{}:{background:'#f5f5f5',color:'#bbbbbb'}"/>
 									<uom :uom="dataContent.uom"></uom>
 								</view>
 							</view>
@@ -119,7 +119,11 @@
 			queryBalance: {
 				type: Boolean,
 				default: true
-			}
+			},
+			allowEditQty: {
+				type: Boolean,
+				default: true
+			},
 		},
 		watch:{
 			'allQty'(newVal){
diff --git a/src/pages/inventoryMove/coms/comInventoryDetailCard.vue b/src/pages/inventoryMove/coms/comInventoryDetailCard.vue
index d01e273f..58125685 100644
--- a/src/pages/inventoryMove/coms/comInventoryDetailCard.vue
+++ b/src/pages/inventoryMove/coms/comInventoryDetailCard.vue
@@ -17,7 +17,7 @@
 				<!-- <view class='split_line'></view> -->
 			</uni-collapse-item>
 		</uni-collapse>
-		<balance-qty-edit ref="qtyEdit" :settingParam="settingParam" @confirm="confirm" :allowEditStatus="true"></balance-qty-edit>
+		<balance-qty-edit ref="qtyEdit" :allowEditQty="true" :settingParam="settingParam" @confirm="confirm" :allowEditStatus="true"></balance-qty-edit>
 		<win-scan-location ref="scanLocationCode" title="目标库位" @getLocation='getLocation'
 			></win-scan-location>
 		<detail-info-popup ref="detailInfoPopup"></detail-info-popup>

From b74b62c82764dae2ca177d161fbb5f213ff3552b Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Wed, 14 Aug 2024 22:41:17 +0800
Subject: [PATCH 14/33] =?UTF-8?q?=E5=8F=AF=E7=BC=96=E8=BE=91=E6=95=B0?=
 =?UTF-8?q?=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/inventoryMove/coms/comInventoryDetailCard.vue | 6 +++++-
 src/pages/inventoryMove/job/inventoryMoveDetail.vue     | 2 +-
 src/pages/transfer/job/transferDetail.vue               | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/pages/inventoryMove/coms/comInventoryDetailCard.vue b/src/pages/inventoryMove/coms/comInventoryDetailCard.vue
index 58125685..d06d84d0 100644
--- a/src/pages/inventoryMove/coms/comInventoryDetailCard.vue
+++ b/src/pages/inventoryMove/coms/comInventoryDetailCard.vue
@@ -17,7 +17,7 @@
 				<!-- <view class='split_line'></view> -->
 			</uni-collapse-item>
 		</uni-collapse>
-		<balance-qty-edit ref="qtyEdit" :allowEditQty="true" :settingParam="settingParam" @confirm="confirm" :allowEditStatus="true"></balance-qty-edit>
+		<balance-qty-edit ref="qtyEdit" :allowEditQty="allowEditQty" :settingParam="settingParam" @confirm="confirm" :allowEditStatus="true"></balance-qty-edit>
 		<win-scan-location ref="scanLocationCode" title="目标库位" @getLocation='getLocation'
 			></win-scan-location>
 		<detail-info-popup ref="detailInfoPopup"></detail-info-popup>
@@ -67,6 +67,10 @@
 				type: Object,
 				default: {}
 			},
+			allowEditQty: {
+				type: Boolean,
+				default: true
+			}
 		},
 		watch: {
 			// dataContent: {
diff --git a/src/pages/inventoryMove/job/inventoryMoveDetail.vue b/src/pages/inventoryMove/job/inventoryMoveDetail.vue
index bf64c75a..dad77e16 100644
--- a/src/pages/inventoryMove/job/inventoryMoveDetail.vue
+++ b/src/pages/inventoryMove/job/inventoryMoveDetail.vue
@@ -12,7 +12,7 @@
 			<scroll-view scroll-y="true" class="page-main-scroll">
 				<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
 					<view class="">
-						<comInventoryDetailCard :dataContent="item" :settingParam="jobContent" @remove="updateData"
+						<comInventoryDetailCard :allowEditQty="false" :dataContent="item" :settingParam="jobContent" @remove="updateData"
 							@updateData='updateData' @openDetail="openDetail">
 						</comInventoryDetailCard>
 					</view>
diff --git a/src/pages/transfer/job/transferDetail.vue b/src/pages/transfer/job/transferDetail.vue
index 2fd37fe0..b2aeb931 100644
--- a/src/pages/transfer/job/transferDetail.vue
+++ b/src/pages/transfer/job/transferDetail.vue
@@ -12,7 +12,7 @@
 			<scroll-view scroll-y="true" class="page-main-scroll">
 				<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
 					<view class="">
-						<comInventoryDetailCard :dataContent="item" :settingParam="jobContent" @remove="updateData"
+						<comInventoryDetailCard :allowEditQty="true" :dataContent="item" :settingParam="jobContent" @remove="updateData"
 							@updateData='updateData'>
 						</comInventoryDetailCard>
 					</view>

From ba7690e0893a4067afbf5ff7d5309986f76bde14 Mon Sep 17 00:00:00 2001
From: lijuncheng <juncheng.li@ccwin-in.com>
Date: Thu, 15 Aug 2024 08:30:07 +0800
Subject: [PATCH 15/33] =?UTF-8?q?=E7=9B=B4=E6=8E=A5=E5=8F=91=E6=96=99?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/request2.js                           |   8 +-
 src/mycomponents/query/balanceQuery.vue       | 257 ++++++++++++++++++
 src/mycomponents/query/showListItem.vue       |  84 ++++++
 src/pages/issue/record/directIssue.vue        |  38 +--
 .../job/productionReceiptDetail.vue           |  39 +--
 .../uni-pagination/uni-pagination.vue         |   8 +-
 6 files changed, 383 insertions(+), 51 deletions(-)
 create mode 100644 src/mycomponents/query/balanceQuery.vue
 create mode 100644 src/mycomponents/query/showListItem.vue

diff --git a/src/api/request2.js b/src/api/request2.js
index 1bd4066d..f654afbd 100644
--- a/src/api/request2.js
+++ b/src/api/request2.js
@@ -548,7 +548,7 @@ export function getBasicItemByCode(itemCode) {
 	}
 	return request({
 		url: baseApi + "/wms/itembasic/page",
-		method: "post",
+		method: "get",
 		data: params,
 	});
 }
@@ -562,7 +562,7 @@ export function getBasicItemByCodeSenior(itemCode) {
 
 	var params = {
 		filters: [{
-			column: "column",
+			column: "code",
 			action: "like",
 			value: itemCode
 		}],
@@ -570,8 +570,8 @@ export function getBasicItemByCodeSenior(itemCode) {
 		pageSize: 1000
 	} 
 	return request({
-		url: baseApi + "/wms/itembasic/page",
-		method: "get",
+		url: baseApi + "/wms/itembasic/senior",
+		method: "post",
 		data: params,
 	});
 }
diff --git a/src/mycomponents/query/balanceQuery.vue b/src/mycomponents/query/balanceQuery.vue
new file mode 100644
index 00000000..0a3bee4d
--- /dev/null
+++ b/src/mycomponents/query/balanceQuery.vue
@@ -0,0 +1,257 @@
+<template>
+	<view style=" ">
+		<uni-drawer ref="showRight" mode="left" :mask-click="true" :width="330">
+			<view style="height:100vh;display:flex;flex-direction:column;">
+				<view class="uni-flex" style="justify-content: center;
+				background-color:#007AFF ;
+				color: #fff; 
+				padding: 15rpx;
+				font-size: 35rpx;">
+					库存查询
+				</view>
+				<scroll-view v-if="true" style="height: calc(100vh - 180rpx)" scroll-y="true">
+					<!-- <button @click="closeDrawer" type="primary">关闭Drawer</button> -->
+					<!-- <view v-for="item in 110" :key="item">可滚动内容 {{ item }}</view> -->
+					<view class="" style="margin: 10rpx; font-size: 35rpx;">
+						物料号：
+					</view>
+					<view style=" margin: 10rpx; display: flex; align-items: center;">
+						<uni-easyinput class="uni-mt-5" prefixIcon="search" v-model="itemCode" placeholder="请输入物料号"
+							@clear="clearItemCode" @confirm="onConfirmItemCode"></uni-easyinput>
+						<!-- <view>查询</view> -->
+						<!-- <button  style="height: 80rpx; align-items: center; text-align: center;" type="primary" size="mini" >查询</button> -->
+					</view>
+
+					<view v-for="(item, index) in itemCodeResult" :key="index" @click="selectItemCode(item)">
+						<view class="" style="font-size: 30rpx; margin: 20rpx;">
+							<view class="">
+								({{index+1}}) 物料代码 : {{item.code}}
+							</view>
+							<view class="">
+								名称 : {{item.name}}
+							</view>
+							<view class="">
+								描述1 : {{item.desc1}}
+							</view>
+							<view class="">
+								描述2 : {{item.desc1}}
+							</view>
+						</view>
+						<view class="split_line"></view>
+					</view>
+					<scroll-view scroll-x="true" v-if="tableData.length>0" style="width: 330px; display: flex; align-items: center;  justify-content: center; ">
+						<view style="width: 330px; display: flex;justify-content: center; background-color: #fff; padding-bottom: 150rpx;">
+							<uni-table border stripe emptyText="暂无更多数据">
+								<!-- 表头行 -->
+								<uni-tr>
+									<uni-th width="60" style="font-weight: 800;" align="left">序号</uni-th>
+									<uni-th width="60" align="left">批次</uni-th>
+									<uni-th width="50" align="left">库位</uni-th>
+									<uni-th width="60" align="left">状态</uni-th>
+									<uni-th width="120" align="left">数量</uni-th>
+								</uni-tr>
+								<!-- 表格数据行 -->
+								<uni-tr v-for="(item, index) in tableData" :key="index">
+									<uni-td>{{index+1}}</uni-td>
+									<uni-td>{{item.batch}}</uni-td>
+									<uni-td>{{item.locationCode}}</uni-td>
+									<uni-td>{{statusDesc(item.inventoryStatus)}}</uni-td>
+									<uni-td>{{item.qty}}</uni-td>
+								</uni-tr>
+
+							</uni-table>
+							<view class="uni-flex"   style=" flex-direction: column; position: fixed; bottom: 0;  margin-bottom: 100rpx; background-color: #fff; width: 100%; align-items: center;" >
+								<view class="" style="width: 100%; display: flex;  justify-content: center; font-size: 32rpx;margin-top: 10rpx;margin-bottom: 10rpx;">
+									<view class="" >当前页：{{ current }}，总数：{{ total }}条，每页：{{ pageSize }}
+								</view>
+								
+								</view>
+								<uni-pagination :current="current" :total="total" :show-icon="true"
+									@change="change" />
+							</view>
+							
+						</view>
+
+					</scroll-view>
+
+				</scroll-view>
+
+				<button @click="closeDrawer" type="primary" style="padding-left: 20rpx;">关闭</button>
+			</view>
+
+		</uni-drawer>
+	</view>
+</template>
+
+<script>
+	import {
+		getBasicItemByCodeSenior,
+	} from '@/api/request2.js';
+
+	import {
+		getInventoryStatusStyle,
+		getInventoryStatusName
+	} from '@/common/directory.js';
+
+	export default {
+		components: {},
+
+		data() {
+			return {
+				itemCode: "",
+				itemCodeResult: [],
+				current: 1,
+				total: 18,
+				tableData: [{
+						batch: "20240814",
+						locationCode: "901",
+						inventoryStatus: "OK",
+						qty: 1
+					},
+					{
+						batch: "20240814",
+						locationCode: "901",
+						inventoryStatus: "OK",
+						qty: 2
+					},
+					{
+						batch: "20240814",
+						locationCode: "901",
+						inventoryStatus: "OK",
+						qty: 3
+					},
+					{
+						batch: "20240814",
+						locationCode: "901",
+						inventoryStatus: "OK",
+						qty: 4
+					},
+					{
+						batch: "20240814",
+						locationCode: "901",
+						inventoryStatus: "OK",
+						qty: 3
+					},
+					{
+						batch: "20240814",
+						locationCode: "901",
+						inventoryStatus: "OK",
+						qty: 4
+					},
+					{
+						batch: "20240814",
+						locationCode: "901",
+						inventoryStatus: "OK",
+						qty: 3
+					},
+					{
+						batch: "20240814",
+						locationCode: "901",
+						inventoryStatus: "OK",
+						qty: 4
+					},
+					{
+						batch: "20240814",
+						locationCode: "901",
+						inventoryStatus: "OK",
+						qty: 3
+					},
+					{
+						batch: "20240814",
+						locationCode: "901",
+						inventoryStatus: "OK",
+						qty: 4
+					},
+					{
+						batch: "20240814",
+						locationCode: "901",
+						inventoryStatus: "OK",
+						qty: 3
+					},
+					{
+						batch: "20240814",
+						locationCode: "901",
+						inventoryStatus: "OK",
+						qty: 4
+					}
+
+				]
+			}
+		},
+		props: {
+			// detail: {
+			// 	type: Object,
+			// 	default: {}
+			// },
+			// isShowPack: {
+			// 	type: Boolean,
+			// 	default: true
+			// }
+		},
+		watch: {
+
+		},
+		methods: {
+			statusStyle: function(val) {
+				return getInventoryStatusStyle(val);
+			},
+			statusDesc(value) {
+				return getInventoryStatusName(value)
+			},
+			change() {
+
+			},
+			showErrorMessage(message) {
+				this.$refs.comMessage.showErrorMessage(message, res => {
+					if (res) {
+
+					}
+				});
+			},
+			selectItemCode(item) {
+				this.itemCode = item.code
+				this.itemCodeResult = []
+			},
+			clearItemCode() {
+				this.itemCode = ""
+				this.itemCodeResult = []
+			},
+			onConfirmItemCode() {
+				if (!this.itemCode) {
+					this.showErrorMessage("物料号为空,请先输入物料号")
+					return;
+				}
+				uni.showLoading({
+					title: "加载中",
+					mask: true
+				})
+
+				getBasicItemByCodeSenior(this.itemCode).then(res => {
+					uni.hideLoading()
+					if (res.data && res.data.list.length > 0) {
+						if (res.data.list.length == 1) {
+							this.itemCode = res.data.list[0].code
+						} else {
+							this.itemCodeResult = res.data.list
+						}
+					} else {
+						this.showErrorMessage("未查找到物料[" + this.itemCode + "]")
+					}
+
+				}).catch(error => {
+					uni.hideLoading()
+					this.showErrorMessage(error)
+				})
+			},
+			showDrawer() {
+				this.$refs.showRight.open();
+			},
+			closeDrawer() {
+				this.$refs.showRight.close();
+			}
+		}
+	}
+</script>
+
+<style>
+</style>
\ No newline at end of file
diff --git a/src/mycomponents/query/showListItem.vue b/src/mycomponents/query/showListItem.vue
new file mode 100644
index 00000000..b0d21c0c
--- /dev/null
+++ b/src/mycomponents/query/showListItem.vue
@@ -0,0 +1,84 @@
+<template>
+	<view class="wyf">
+		<uni-popup ref="listPopup" type="dialog">
+			<view class="container">
+				<uni-list class="list">
+					<uni-list-item v-for="(item,index) in list" :title="item.title"
+				 	 thumb-size="lg" >
+					<template v-slot:footer>
+		<!-- 					<image class="slot-image" src="@/static/logo.png" mode="widthFix" @click="selectItem(item,index)"></image -->
+						<text class="go" @click="selectItem(item,index)">Go</text>
+					</template>
+					 
+					</uni-list-item>
+					
+				</uni-list>
+			</view>
+		</uni-popup>
+	</view>
+</template>
+
+<script>
+import { onShow } from '@dcloudio/uni-app';
+	export default {
+		emits: ["selectItem"],
+		components: {
+		},
+		data() {
+			return {
+				isScanedASN:false,
+				list: []
+				// [{
+				// 	title:'哈哈哈哈',
+				// 	selected:false
+				// }],
+			}
+		},
+		props: {
+		},
+		methods:{
+			openList(list){
+				this.list = list;
+				this.$refs.listPopup.open('center')
+			},
+			selectItem(item,index){
+				this.$refs.listPopup.close();
+				this.$emit("selectItem", item);
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.wyf{
+		// display: block;
+		position: fixed;
+		top: 0;
+		left: 0;
+		right: 0;
+		bottom: 0;
+		z-index: 1000
+	}
+	.container{
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		.list{
+			width: 80%;
+			max-height:50vh;
+			overflow-y: auto;
+			border-radius: 10px !important;
+			.slot-image{
+				width: 40rpx;
+			}
+			.go{
+				color: rgb(60, 156, 255);
+			}
+			
+		}
+		
+	}
+	.list ::v-deep .uni-list--border{
+		border: 1rpx solid #e5e5e5;
+	}
+</style>
\ No newline at end of file
diff --git a/src/pages/issue/record/directIssue.vue b/src/pages/issue/record/directIssue.vue
index 86dad12a..a9f1c41f 100644
--- a/src/pages/issue/record/directIssue.vue
+++ b/src/pages/issue/record/directIssue.vue
@@ -48,7 +48,7 @@
 
 		<winComScanBalance ref="scanPopup" @getBalance='getScanResult' :bussinessCode="businessTypeCode">
 		</winComScanBalance>
-		<balanceQuery ref="refBalanceQuery" ></balanceQuery>
+		<!-- <balanceQuery ref="refBalanceQuery"></balanceQuery> -->
 		<comMessage ref="comMessage"></comMessage>
 	</view>
 </template>
@@ -99,8 +99,8 @@
 	import recordDetailCard from '@/mycomponents/record/recordDetailCard.vue'
 	import balanceSelect from '@/mycomponents/balance/balanceSelect.vue'
 	import winComScanBalance from '@/mycomponents/scan/winComScanBalance.vue'
-	import balanceQuery from '@/mycomponents/query/balanceQuery.vue'
-	
+	// import balanceQuery from '@/mycomponents/query/balanceQuery.vue'
+
 
 	export default {
 		components: {
@@ -114,7 +114,7 @@
 			recordDetailCard,
 			balanceSelect,
 			winComScanBalance,
-			balanceQuery
+			// balanceQuery
 		},
 		data() {
 			return {
@@ -160,13 +160,14 @@
 			// }
 
 		},
-		
+
 		//返回首页
 		onNavigationBarButtonTap(e) {
 			if (e.index === 0) {
 				goHome();
 			} else if (e.index == 1) {
-				this.$refs.refBalanceQuery.showDrawer();
+				// this.$refs.refBalanceQuery.showDrawer();
+				// this.closeScanPopup();
 			}
 		},
 		//拦截返回按钮事件
@@ -177,27 +178,10 @@
 		mounted() {},
 
 		methods: {
-			showDrawer() {
-							this.$refs.showRight.open();
-						},
-						closeDrawer() {
-							this.$refs.showRight.close();
-						},
-			
-			showDrawer() {
-							this.$refs.showRight.open();
-						},
-						closeDrawer() {
-							this.$refs.showRight.close();
-						},
-			
-			showDrawer() {
-							this.$refs.showRight.open();
-						},
-						closeDrawer() {
-							this.$refs.showRight.close();
-						},
-			
+			// showDrawer() {
+			// 	this.$refs.showRight.open();
+			// },
+
 			getBusinessType() {
 				getBusinessType(this.businessTypeCode, res => {
 					if (res.success) {
diff --git a/src/pages/productionReceipt/job/productionReceiptDetail.vue b/src/pages/productionReceipt/job/productionReceiptDetail.vue
index faa85925..1e246e2a 100644
--- a/src/pages/productionReceipt/job/productionReceiptDetail.vue
+++ b/src/pages/productionReceipt/job/productionReceiptDetail.vue
@@ -218,28 +218,33 @@
 			autoCommit(){
 				//判断数量是否相等
 				var noCommitInfo=null
-				for (var i = 0; i < this.detailSource.length; i++) {
-					var sub =this.detailSource[i].subList
-					for(var j=0;j<sub.length;j++){
-						var item =sub[j]
-						if(item.qty!=item.handleQty){
-							noCommitInfo=item;
-							break;
+				let str=""
+				
+				this.detailSource.forEach((item) => {
+					item.subList.forEach(cur => {
+						if (cur.qty != cur.handleQty) {
+							var tempHandleQty =0
+							if(cur.handleQty){
+								tempHandleQty=cur.handleQty
+							}else {
+								tempHandleQty =0
+							}
+							str += `包装号【${cur.packingNumber}】提交数量【${tempHandleQty}】与任务物料数量【${cur.qty}】不一致\n`
 						}
-					}
-				}
-				//数量不相等，提示
-				if(noCommitInfo){
-					var handQty =noCommitInfo.handleQty?noCommitInfo.handleQty:0
-					this.showQuestionMessage("扫描数量["+handQty+"]任务数量["+noCommitInfo.qty+"]不一致,是否提交?",res=>{
-						if(res){
+					})
+				})
+				
+				if (str) {
+					str = '任务明细未全部完成,是否提交?\n'+str
+					this.$refs.comMessage.showQuestionMessage1(str, 'red', res => {
+						if (res) {
 							this.commit()
 						}
-					})
-				}else {
-					//提交
+					});
+				} else {
 					this.commit()
 				}
+				
 			},
 
 			//继续扫描
diff --git a/src/uni_modules/uni-pagination/components/uni-pagination/uni-pagination.vue b/src/uni_modules/uni-pagination/components/uni-pagination/uni-pagination.vue
index 71350340..8d29656b 100644
--- a/src/uni_modules/uni-pagination/components/uni-pagination/uni-pagination.vue
+++ b/src/uni_modules/uni-pagination/components/uni-pagination/uni-pagination.vue
@@ -16,9 +16,10 @@
 		<view class="uni-pagination__btn"
 			:class="currentIndex === 1 ? 'uni-pagination--disabled' : 'uni-pagination--enabled'"
 			:hover-class="currentIndex === 1 ? '' : 'uni-pagination--hover'" :hover-start-time="20"
-			:hover-stay-time="70" @click="clickLeft">
+			:hover-stay-time="70" @click="clickLeft"
+			style="margin-right: 70rpx;">
 			<template v-if="showIcon === true || showIcon === 'true'">
-				<uni-icons color="#666" size="16" type="left" />
+				<uni-icons color="#666" size="16" type="left"  />
 			</template>
 			<template v-else>
 				<text class="uni-pagination__child-btn">{{ prevPageText }}</text>
@@ -41,7 +42,8 @@
 		<view class="uni-pagination__btn"
 			:class="currentIndex >= maxPage ? 'uni-pagination--disabled' : 'uni-pagination--enabled'"
 			:hover-class="currentIndex === maxPage ? '' : 'uni-pagination--hover'" :hover-start-time="20"
-			:hover-stay-time="70" @click="clickRight">
+			:hover-stay-time="70" @click="clickRight"
+			style="margin-left: 70rpx;">
 			<template v-if="showIcon === true || showIcon === 'true'">
 				<uni-icons color="#666" size="16" type="right" />
 			</template>

From a6c5e6eff59934e47538149c4fc1e21104b6bf35 Mon Sep 17 00:00:00 2001
From: lijuncheng <juncheng.li@ccwin-in.com>
Date: Thu, 15 Aug 2024 10:47:20 +0800
Subject: [PATCH 16/33] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=82=B9=E5=87=BB?=
 =?UTF-8?q?=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/common/noclick.js | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/common/noclick.js b/src/common/noclick.js
index 6fe72a29..391ee043 100644
--- a/src/common/noclick.js
+++ b/src/common/noclick.js
@@ -23,17 +23,17 @@ function noMultipleClicks(methods, info) {
 
 // 节流函数
 const throttle = (fn, t,_this) => {
-	console.log('throttle')
-      return  ()=> {
-        if (!_this.timer) {
-          _this.timer = setTimeout(()=>{
-            fn()
-			console.log('fn')
-            //·清空定时器
-            _this.timer = null
-          }, t)
-        }
-      }
+	console.log('throttle')
+      return  ()=> {
+        if (!_this.timer) {
+          _this.timer = setTimeout(()=>{
+			console.log('fn')
+            //·清空定时器
+            _this.timer = null
+          }, t)
+		  fn()
+        }
+      }
 }
 
 

From 72c471f366c901745d4499e683b5609e25e6d8dc Mon Sep 17 00:00:00 2001
From: lijuncheng <juncheng.li@ccwin-in.com>
Date: Thu, 15 Aug 2024 11:23:31 +0800
Subject: [PATCH 17/33] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=91=E6=96=99?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=92=8C=E5=8F=91=E6=96=99=E6=8E=A5=E6=94=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/issue/job/issueDetail.vue           | 61 +++++++++--------
 .../job/productionReceiptDetail.vue           | 65 ++++++++++---------
 2 files changed, 63 insertions(+), 63 deletions(-)

diff --git a/src/pages/issue/job/issueDetail.vue b/src/pages/issue/job/issueDetail.vue
index 2bfd64cd..ba6a0030 100644
--- a/src/pages/issue/job/issueDetail.vue
+++ b/src/pages/issue/job/issueDetail.vue
@@ -171,12 +171,6 @@
 					this.$refs.comIssueDetailCard.forEach(r => {
 						r.resizeCollapse();
 					})
-					// this.$refs.mainCollapse.forEach(r => {
-					// 	r.childrens.forEach(i => {
-					// 		i.init();
-					// 	})
-					// 	r.resize();
-					// })
 				});
 			},
 
@@ -290,6 +284,7 @@
 				getManagementPrecisions(itemCodes, locationCode, res => {
 					if (res.success) {
 						this.managementList = res.list;
+						console.log("自动提交submitJob")
 						this.submitJob();
 					} else {
 						uni.hideLoading();
@@ -455,39 +450,43 @@
 
 			afterScan() {
 				this.resizeCollapse();
+				let str = ""
 				this.detailSource.forEach(detail => {
-					let s = '';
 					detail.Items.forEach(item => {
-						let totalHandleQty = 0;
-						var isHandleEmpty = false; //多个库位时 handleQty =0;
 						item.Locations.forEach(lco => {
 							lco.Batchs.forEach(batch => {
-								if (batch.handleQty != 0) {
-									totalHandleQty = calc.add(totalHandleQty, batch
-										.handleQty)
-								} else {
-									isHandleEmpty = true;
-								}
+								batch.Records.forEach(record => {
+									if (batch.qty != record.qty) {
+										var tempHandleQty = 0
+										if (record.qty) {
+											tempHandleQty = record.qty
+										} else {
+											tempHandleQty = 0
+										}
+										str +=
+											`包装号【${record.packingNumber}】提交数量【${tempHandleQty}】与任务物料数量【${batch.qty}】不一致\n`
+									}
+								})
 							})
 						})
-						if (item.qty == totalHandleQty) {
-							if (isHandleEmpty) {
-								return;
-							}
-							this.submit();
-						} else {
-							this.$refs.comMessage.showQuestionMessage('实际扫描数量【' + totalHandleQty +
-								'】与物料需求数量【' + item.qty +
-								'】不一致，是否继续提交', res => {
-									if (res) {
-										this.submit();
-									}else {
-										this.scanPopupGetFocus()
-									}
-								});
-						}
 					})
 				})
+
+				if (str) {
+					str = '任务明细未全部完成,是否提交?\n' + str
+					this.$refs.comMessage.showQuestionMessage1(str, 'red', res => {
+						if (res) {
+							//防止重复点击
+							this.$throttle(this.submit,2000,this)()
+						} else {
+							this.scanPopupGetFocus()
+						}
+					});
+				} else {
+					//防止重复点击
+					this.$throttle(this.submit,2000,this)()
+				
+				}
 			},
 
 			scanPopupGetFocus() {
diff --git a/src/pages/productionReceipt/job/productionReceiptDetail.vue b/src/pages/productionReceipt/job/productionReceiptDetail.vue
index 1e246e2a..3968605d 100644
--- a/src/pages/productionReceipt/job/productionReceiptDetail.vue
+++ b/src/pages/productionReceipt/job/productionReceiptDetail.vue
@@ -217,9 +217,7 @@
 			},
 			autoCommit(){
 				//判断数量是否相等
-				var noCommitInfo=null
 				let str=""
-				
 				this.detailSource.forEach((item) => {
 					item.subList.forEach(cur => {
 						if (cur.qty != cur.handleQty) {
@@ -238,11 +236,11 @@
 					str = '任务明细未全部完成,是否提交?\n'+str
 					this.$refs.comMessage.showQuestionMessage1(str, 'red', res => {
 						if (res) {
-							this.commit()
+							this.$throttle(this.commit,2000,this)()
 						}
 					});
 				} else {
-					this.commit()
+					this.$throttle(this.commit,2000,this)()
 				}
 				
 			},
@@ -364,6 +362,7 @@
 													itemDetail.balance.packQty = Number(result.package.packQty)
 													itemDetail.balance.packUnit = result.package.packUnit
 													this.calcHandleQty();
+													console.log("自动提交")
 													this.autoCommit();
 												} else {
 													this.scanPopupGetFocus();
@@ -387,6 +386,7 @@
 									itemDetail.balance.packQty = Number(result.package.packQty)
 									itemDetail.balance.packUnit = result.package.packUnit
 									this.calcHandleQty();
+									
 									this.autoCommit();
 								}
 							}
@@ -411,12 +411,14 @@
 				//扫描数量和任务数量相等，直接提交
 				if (this.scanCount == this.subList.length) {
 					this.submitJob();
+					console.log("提交this.submitJob()")
 				} else if (this.scanCount < this.subList.length) {
 					//扫描数量小于任务数量，判断是否允许部分提交
 					if (this.jobContent.allowPartialComplete == "TRUE") {
 						//提交
 						this.$refs.comMessage.showQuestionMessage1("任务明细未全部完成,是否提交?", 'red', res => {
 							if (res) {
+								console.log("提交this.submitJob()")
 								this.submitJob()
 							}
 						});
@@ -470,34 +472,33 @@
 					this.showErrorMessage(error)
 				})
 
-
-				var itemCodes = []
-				this.detailSource.forEach(item => {
-					itemCodes.push(item.itemCode)
-				})
-
-				getManagementPrecisions(itemCodes, this.toLocationCode, res => {
-					if (res.success) {
-						this.managementList = res.list;
-						var params = this.setParams()
-						console.log("提交参数", JSON.stringify(params));
-
-						productionReceiptJobSubmit(params).then(res => {
-							uni.hideLoading()
-							if (res.data) {
-								this.showCommitSuccessMessage("提交成功\n生成发料接收记录\n" + res.data)
-							} else {
-								this.showErrorMessage("提交失败[" + res.msg + "]")
-							}
-						}).catch(error => {
-							uni.hideLoading()
-							this.showErrorMessage(error)
-						})
-					} else {
-						uni.hideLoading();
-						this.showErrorMessage(res.message);
-					}
-				});
+				// var itemCodes = []
+				// this.detailSource.forEach(item => {
+				// 	itemCodes.push(item.itemCode)
+				// })
+
+				// getManagementPrecisions(itemCodes, this.toLocationCode, res => {
+				// 	if (res.success) {
+				// 		this.managementList = res.list;
+				// 		var params = this.setParams()
+				// 		console.log("提交参数", JSON.stringify(params));
+
+				// 		productionReceiptJobSubmit(params).then(res => {
+				// 			uni.hideLoading()
+				// 			if (res.data) {
+				// 				this.showCommitSuccessMessage("提交成功\n生成发料接收记录\n" + res.data)
+				// 			} else {
+				// 				this.showErrorMessage("提交失败[" + res.msg + "]")
+				// 			}
+				// 		}).catch(error => {
+				// 			uni.hideLoading()
+				// 			this.showErrorMessage(error)
+				// 		})
+				// 	} else {
+				// 		uni.hideLoading();
+				// 		this.showErrorMessage(res.message);
+				// 	}
+				// });
 			},
 
 			setParams() {

From be34c04d36bbf0d250e220907b8728cd3fe70d35 Mon Sep 17 00:00:00 2001
From: lijuncheng <juncheng.li@ccwin-in.com>
Date: Thu, 15 Aug 2024 11:54:31 +0800
Subject: [PATCH 18/33] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/manifest.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/manifest.json b/src/manifest.json
index b7047d24..82cae880 100644
--- a/src/manifest.json
+++ b/src/manifest.json
@@ -3,8 +3,8 @@
     "package" : "uni.UNI43932FE",
     "appid" : "__UNI__C9CF4BF",
     "description" : "",
-    "versionName" : "1.0.58",
-    "versionCode" : 58,
+    "versionName" : "1.0.60",
+    "versionCode" : 60,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {

From 6e36f0d4c15d31afffb1f0194ebf8abebd31c4dd Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Thu, 15 Aug 2024 15:43:05 +0800
Subject: [PATCH 19/33] =?UTF-8?q?=E6=A3=80=E9=AA=8C=E7=94=B3=E8=AF=B7?=
 =?UTF-8?q?=E5=8D=95=E6=8F=90=E7=A4=BA=E6=A3=80=E9=AA=8C=E7=94=B3=E8=AF=B7?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/pointPutawayJob/index.vue | 121 ++++++++++++++++++++--------
 1 file changed, 86 insertions(+), 35 deletions(-)

diff --git a/src/pages/pointPutawayJob/index.vue b/src/pages/pointPutawayJob/index.vue
index d3c1fe15..97ac306b 100644
--- a/src/pages/pointPutawayJob/index.vue
+++ b/src/pages/pointPutawayJob/index.vue
@@ -35,6 +35,15 @@
 								<td>抽检数量</td>
 								<td>{{item.sampleQty}}</td>
 							</tr>
+							<tr>
+								<td>到货数量</td>
+								<td>{{item.quantityQty}}</td>
+								<td>抽检数量</td>
+								<td>{{item.sampleQty}}</td>
+							</tr>
+							<tr v-if="!item.haveInspectionRequest">
+								<td  colspan='4' style="color:#ff0000;font-weight: bold;font-size: 15px;">未生成检验申请</td>
+							</tr>
 						</tbody>
 					</table>
 				</view>
@@ -197,41 +206,83 @@
 					this.readFile(htmlFileUrl1, (htmlContent) => {
 						this.newHtmlContent1 = htmlContent
 						this.data1.inspectDTOList.forEach(item => {
-							str += `
-									<div class="box" style="page-break-before:always;"><br />
-										<div class="relative" > 
-											<div class="q">Q</div>
-											<table border='1'>
-												<thead>
-													<tr class='top1'>
-														<th>物料代码:</th>
-														<th colspan='3'>${item.itemCode}</th>
-													</tr>
-												</thead>
-												<tbody>
-													<tr>
-														<td>物料名称</td>
-														<td>${item.itemName}</td>
-														<td>发货单号</td>
-														<td>${this.data1.asnNumber}</td>
-													</tr>
-													<tr>
-														<td>供应商</td>
-														<td>${item.supplierCode}</td>
-														<td>供应商批次</td>
-														<td>${item.supplierBatch}</td>
-													</tr>
-													<tr>
-														<td>到货数量</td>
-														<td>${item.quantityQty}</td>
-														<td>抽检数量</td>
-														<td>${item.sampleQty}</td>
-													</tr>
-												</tbody>
-											</table>
+							if(!item.haveInspectionRequest){
+								str += `
+										<div class="box" style="page-break-before:always;"><br />
+											<div class="relative" > 
+												<div class="q">Q</div>
+												<table border='1'>
+													<thead>
+														<tr class='top1'>
+															<th>物料代码:</th>
+															<th colspan='3'>${item.itemCode}</th>
+														</tr>
+													</thead>
+													<tbody>
+														<tr>
+															<td>物料名称</td>
+															<td>${item.itemName}</td>
+															<td>发货单号</td>
+															<td>${this.data1.asnNumber}</td>
+														</tr>
+														<tr>
+															<td>供应商</td>
+															<td>${item.supplierCode}</td>
+															<td>供应商批次</td>
+															<td>${item.supplierBatch}</td>
+														</tr>
+														<tr>
+															<td>到货数量</td>
+															<td>${item.quantityQty}</td>
+															<td>抽检数量</td>
+															<td>${item.sampleQty}</td>
+														</tr>
+														<tr>
+															<td  colspan='4' style="color:#ff0000;font-weight: bold;font-size: 15px;">未生成检验申请</td>
+														</tr>
+													</tbody>
+												</table>
+											</div>
 										</div>
-									</div>
-									`
+										`
+							}else{
+								str += `
+										<div class="box" style="page-break-before:always;"><br />
+											<div class="relative" > 
+												<div class="q">Q</div>
+												<table border='1'>
+													<thead>
+														<tr class='top1'>
+															<th>物料代码:</th>
+															<th colspan='3'>${item.itemCode}</th>
+														</tr>
+													</thead>
+													<tbody>
+														<tr>
+															<td>物料名称</td>
+															<td>${item.itemName}</td>
+															<td>发货单号</td>
+															<td>${this.data1.asnNumber}</td>
+														</tr>
+														<tr>
+															<td>供应商</td>
+															<td>${item.supplierCode}</td>
+															<td>供应商批次</td>
+															<td>${item.supplierBatch}</td>
+														</tr>
+														<tr>
+															<td>到货数量</td>
+															<td>${item.quantityQty}</td>
+															<td>抽检数量</td>
+															<td>${item.sampleQty}</td>
+														</tr>
+													</tbody>
+												</table>
+											</div>
+										</div>
+										`
+							}
+							
 						})
 						this.newHtmlContent1 = this.newHtmlContent1.replace(
 							"mainBody", str); //替换物品代码
@@ -306,9 +357,9 @@
 				await queryInspectionFreeFlag({
 					number: this.number
 				}).then(async res1 => {
+					console.log(444,res1)
 					this.data1 = res1.data
 					this.data1.inspectDTOList = this.data1.inspectDTOList.filter(item=>item.sampleQty>0)
-					// this.data1.inspectDTOList=[]
 					if(this.data1&&this.data1.inspectDTOList&&this.data1.inspectDTOList.length == 0){
 						this.tabIndex =2
 					}

From 6c59175d87fecd1b709e0526c6fc43ee7f5ff224 Mon Sep 17 00:00:00 2001
From: lijuncheng <juncheng.li@ccwin-in.com>
Date: Thu, 15 Aug 2024 16:13:08 +0800
Subject: [PATCH 20/33] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=9B=98=E7=82=B9?=
 =?UTF-8?q?=E5=BC=B9=E6=A1=86=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/count/job/fuzzyCountDetail.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/count/job/fuzzyCountDetail.vue b/src/pages/count/job/fuzzyCountDetail.vue
index ad1a4642..617d404c 100644
--- a/src/pages/count/job/fuzzyCountDetail.vue
+++ b/src/pages/count/job/fuzzyCountDetail.vue
@@ -318,7 +318,7 @@
 
 			scanPopupLoseFocus() {
 				if (this.$refs.scanPopup != undefined) {
-					this.$refs.scanPopup.packLoseFocus();
+					this.$refs.scanPopup.losefocus();
 				}
 			},
 

From 6e1ba14992c9eb7ce04ab9710d4575a856a4f7b1 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Thu, 15 Aug 2024 17:12:53 +0800
Subject: [PATCH 21/33] =?UTF-8?q?=E6=A3=80=E9=AA=8C=E5=8D=95=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/pointPutawayJob/index.vue | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/pages/pointPutawayJob/index.vue b/src/pages/pointPutawayJob/index.vue
index 97ac306b..df63a6e8 100644
--- a/src/pages/pointPutawayJob/index.vue
+++ b/src/pages/pointPutawayJob/index.vue
@@ -85,6 +85,7 @@
 			</button>
 		</view>
 
+		<comMessage ref="comMessage"></comMessage>
 	</view>
 </template>
 
@@ -319,7 +320,14 @@
 					this.showTableInspectDTOList = this.data1.inspectDTOList
 				}
 				console.log(233, this.showTableInspectDTOList)
-			}
+			},
+			showMessage(message) {
+				this.$refs.comMessage.showMessage(message, res => {
+					if (res) {
+			
+					}
+				});
+			},
 		},
 		watch: {
 			isLoadFinish: {
@@ -364,6 +372,12 @@
 						this.tabIndex =2
 					}
 					this.getTableInspectDTOList()
+				}).catch(error=>{
+					this.$refs.comMessage.showMessage(error, res => {
+						if (res) {
+					
+						}
+					});
 				})
 			}
 			

From b21fbc2f76dd49ce80ad3644ec3c6662f02b77d6 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Thu, 15 Aug 2024 19:14:52 +0800
Subject: [PATCH 22/33] =?UTF-8?q?=E6=A3=80=E9=AA=8C=E5=8D=95=E5=9B=9E?=
 =?UTF-8?q?=E9=80=80=E5=88=B0=E6=B2=A1=E6=9C=89=E6=8F=90=E7=A4=BA=E7=9A=84?=
 =?UTF-8?q?=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/manifest.json                   |  6 +-
 src/pages/pointPutawayJob/index.vue | 99 +++++++++++++++--------------
 2 files changed, 53 insertions(+), 52 deletions(-)

diff --git a/src/manifest.json b/src/manifest.json
index 82cae880..c5464834 100644
--- a/src/manifest.json
+++ b/src/manifest.json
@@ -1,10 +1,10 @@
 {
     "name" : "wms",
     "package" : "uni.UNI43932FE",
-    "appid" : "__UNI__C9CF4BF",
+    "appid" : "__UNI__F36DDCF",
     "description" : "",
-    "versionName" : "1.0.60",
-    "versionCode" : 60,
+    "versionName" : "1.0.62",
+    "versionCode" : 62,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
diff --git a/src/pages/pointPutawayJob/index.vue b/src/pages/pointPutawayJob/index.vue
index df63a6e8..82418c03 100644
--- a/src/pages/pointPutawayJob/index.vue
+++ b/src/pages/pointPutawayJob/index.vue
@@ -41,9 +41,9 @@
 								<td>抽检数量</td>
 								<td>{{item.sampleQty}}</td>
 							</tr>
-							<tr v-if="!item.haveInspectionRequest">
+							<!-- <tr v-if="!item.haveInspectionRequest">
 								<td  colspan='4' style="color:#ff0000;font-weight: bold;font-size: 15px;">未生成检验申请</td>
-							</tr>
+							</tr> -->
 						</tbody>
 					</table>
 				</view>
@@ -207,7 +207,46 @@
 					this.readFile(htmlFileUrl1, (htmlContent) => {
 						this.newHtmlContent1 = htmlContent
 						this.data1.inspectDTOList.forEach(item => {
-							if(!item.haveInspectionRequest){
+							// if(!item.haveInspectionRequest){
+							// 	str += `
+							// 			<div class="box" style="page-break-before:always;"><br />
+							// 				<div class="relative" > 
+							// 					<div class="q">Q</div>
+							// 					<table border='1'>
+							// 						<thead>
+							// 							<tr class='top1'>
+							// 								<th>物料代码:</th>
+							// 								<th colspan='3'>${item.itemCode}</th>
+							// 							</tr>
+							// 						</thead>
+							// 						<tbody>
+							// 							<tr>
+							// 								<td>物料名称</td>
+							// 								<td>${item.itemName}</td>
+							// 								<td>发货单号</td>
+							// 								<td>${this.data1.asnNumber}</td>
+							// 							</tr>
+							// 							<tr>
+							// 								<td>供应商</td>
+							// 								<td>${item.supplierCode}</td>
+							// 								<td>供应商批次</td>
+							// 								<td>${item.supplierBatch}</td>
+							// 							</tr>
+							// 							<tr>
+							// 								<td>到货数量</td>
+							// 								<td>${item.quantityQty}</td>
+							// 								<td>抽检数量</td>
+							// 								<td>${item.sampleQty}</td>
+							// 							</tr>
+							// 							<tr>
+							// 								<td  colspan='4' style="color:#ff0000;font-weight: bold;font-size: 15px;">未生成检验申请</td>
+							// 							</tr>
+							// 						</tbody>
+							// 					</table>
+							// 				</div>
+							// 			</div>
+							// 			`
+							// }else{
 								str += `
 										<div class="box" style="page-break-before:always;"><br />
 											<div class="relative" > 
@@ -238,51 +277,12 @@
 															<td>抽检数量</td>
 															<td>${item.sampleQty}</td>
 														</tr>
-														<tr>
-															<td  colspan='4' style="color:#ff0000;font-weight: bold;font-size: 15px;">未生成检验申请</td>
-														</tr>
 													</tbody>
 												</table>
 											</div>
 										</div>
 										`
-							}else{
-								str += `
-										<div class="box" style="page-break-before:always;"><br />
-											<div class="relative" > 
-												<div class="q">Q</div>
-												<table border='1'>
-													<thead>
-														<tr class='top1'>
-															<th>物料代码:</th>
-															<th colspan='3'>${item.itemCode}</th>
-														</tr>
-													</thead>
-													<tbody>
-														<tr>
-															<td>物料名称</td>
-															<td>${item.itemName}</td>
-															<td>发货单号</td>
-															<td>${this.data1.asnNumber}</td>
-														</tr>
-														<tr>
-															<td>供应商</td>
-															<td>${item.supplierCode}</td>
-															<td>供应商批次</td>
-															<td>${item.supplierBatch}</td>
-														</tr>
-														<tr>
-															<td>到货数量</td>
-															<td>${item.quantityQty}</td>
-															<td>抽检数量</td>
-															<td>${item.sampleQty}</td>
-														</tr>
-													</tbody>
-												</table>
-											</div>
-										</div>
-										`
-							}
+							// }
 							
 						})
 						this.newHtmlContent1 = this.newHtmlContent1.replace(
@@ -372,13 +372,14 @@
 						this.tabIndex =2
 					}
 					this.getTableInspectDTOList()
-				}).catch(error=>{
-					this.$refs.comMessage.showMessage(error, res => {
-						if (res) {
-					
-						}
-					});
 				})
+				// .catch(error=>{
+				// 	this.$refs.comMessage.showMessage(error, res => {
+				// 		if (res) {
+					
+				// 		}
+				// 	});
+				// })
 			}
 			
 			this.getPointPutawayJobHtml()

From 9eb9161274a10d7e0fbac3c12c11ca171e46cf20 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Thu, 15 Aug 2024 20:21:58 +0800
Subject: [PATCH 23/33] =?UTF-8?q?=E6=A3=80=E9=AA=8C=E5=8D=95=E6=96=87?=
 =?UTF-8?q?=E5=AD=97=E9=87=8D=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/manifest.json                   | 4 ++--
 src/pages/pointPutawayJob/index.vue | 6 ------
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/manifest.json b/src/manifest.json
index c5464834..3da3f3cc 100644
--- a/src/manifest.json
+++ b/src/manifest.json
@@ -3,8 +3,8 @@
     "package" : "uni.UNI43932FE",
     "appid" : "__UNI__F36DDCF",
     "description" : "",
-    "versionName" : "1.0.62",
-    "versionCode" : 62,
+    "versionName" : "1.0.63",
+    "versionCode" : 63,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
diff --git a/src/pages/pointPutawayJob/index.vue b/src/pages/pointPutawayJob/index.vue
index 82418c03..67f69a46 100644
--- a/src/pages/pointPutawayJob/index.vue
+++ b/src/pages/pointPutawayJob/index.vue
@@ -35,12 +35,6 @@
 								<td>抽检数量</td>
 								<td>{{item.sampleQty}}</td>
 							</tr>
-							<tr>
-								<td>到货数量</td>
-								<td>{{item.quantityQty}}</td>
-								<td>抽检数量</td>
-								<td>{{item.sampleQty}}</td>
-							</tr>
 							<!-- <tr v-if="!item.haveInspectionRequest">
 								<td  colspan='4' style="color:#ff0000;font-weight: bold;font-size: 15px;">未生成检验申请</td>
 							</tr> -->

From 2fb8148b9f27badc27ad7cd6822e5a082bbd7dd2 Mon Sep 17 00:00:00 2001
From: lijuncheng <juncheng.li@ccwin-in.com>
Date: Thu, 15 Aug 2024 20:39:07 +0800
Subject: [PATCH 24/33] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=91=E6=96=99?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/issue/job/issueDetail.vue | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/pages/issue/job/issueDetail.vue b/src/pages/issue/job/issueDetail.vue
index ba6a0030..374ef22a 100644
--- a/src/pages/issue/job/issueDetail.vue
+++ b/src/pages/issue/job/issueDetail.vue
@@ -284,7 +284,6 @@
 				getManagementPrecisions(itemCodes, locationCode, res => {
 					if (res.success) {
 						this.managementList = res.list;
-						console.log("自动提交submitJob")
 						this.submitJob();
 					} else {
 						uni.hideLoading();
@@ -463,8 +462,11 @@
 										} else {
 											tempHandleQty = 0
 										}
-										str +=
-											`包装号【${record.packingNumber}】提交数量【${tempHandleQty}】与任务物料数量【${batch.qty}】不一致\n`
+										if (batch.qty != 0) {
+											str +=
+												`包装号【${record.packingNumber}】提交数量【${tempHandleQty}】与任务物料数量【${batch.qty}】不一致\n`
+										}
+
 									}
 								})
 							})
@@ -477,15 +479,15 @@
 					this.$refs.comMessage.showQuestionMessage1(str, 'red', res => {
 						if (res) {
 							//防止重复点击
-							this.$throttle(this.submit,2000,this)()
+							this.$throttle(this.submit, 2000, this)()
 						} else {
 							this.scanPopupGetFocus()
 						}
 					});
 				} else {
 					//防止重复点击
-					this.$throttle(this.submit,2000,this)()
-				
+					this.$throttle(this.submit, 2000, this)()
+
 				}
 			},
 

From 14061c3dc9d938a45513ed17ea884b4b2f0fc1b4 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Thu, 15 Aug 2024 21:04:39 +0800
Subject: [PATCH 25/33] =?UTF-8?q?=E6=A3=80=E9=AA=8C=E6=89=93=E5=8D=B0?=
 =?UTF-8?q?=E6=81=A2=E5=A4=8D=E6=9C=80=E6=96=B0=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/pointPutawayJob/index.vue | 98 ++++++++++++++---------------
 1 file changed, 49 insertions(+), 49 deletions(-)

diff --git a/src/pages/pointPutawayJob/index.vue b/src/pages/pointPutawayJob/index.vue
index 67f69a46..dab39818 100644
--- a/src/pages/pointPutawayJob/index.vue
+++ b/src/pages/pointPutawayJob/index.vue
@@ -35,9 +35,9 @@
 								<td>抽检数量</td>
 								<td>{{item.sampleQty}}</td>
 							</tr>
-							<!-- <tr v-if="!item.haveInspectionRequest">
+							<tr v-if="!item.haveInspectionRequest">
 								<td  colspan='4' style="color:#ff0000;font-weight: bold;font-size: 15px;">未生成检验申请</td>
-							</tr> -->
+							</tr>
 						</tbody>
 					</table>
 				</view>
@@ -201,46 +201,46 @@
 					this.readFile(htmlFileUrl1, (htmlContent) => {
 						this.newHtmlContent1 = htmlContent
 						this.data1.inspectDTOList.forEach(item => {
-							// if(!item.haveInspectionRequest){
-							// 	str += `
-							// 			<div class="box" style="page-break-before:always;"><br />
-							// 				<div class="relative" > 
-							// 					<div class="q">Q</div>
-							// 					<table border='1'>
-							// 						<thead>
-							// 							<tr class='top1'>
-							// 								<th>物料代码:</th>
-							// 								<th colspan='3'>${item.itemCode}</th>
-							// 							</tr>
-							// 						</thead>
-							// 						<tbody>
-							// 							<tr>
-							// 								<td>物料名称</td>
-							// 								<td>${item.itemName}</td>
-							// 								<td>发货单号</td>
-							// 								<td>${this.data1.asnNumber}</td>
-							// 							</tr>
-							// 							<tr>
-							// 								<td>供应商</td>
-							// 								<td>${item.supplierCode}</td>
-							// 								<td>供应商批次</td>
-							// 								<td>${item.supplierBatch}</td>
-							// 							</tr>
-							// 							<tr>
-							// 								<td>到货数量</td>
-							// 								<td>${item.quantityQty}</td>
-							// 								<td>抽检数量</td>
-							// 								<td>${item.sampleQty}</td>
-							// 							</tr>
-							// 							<tr>
-							// 								<td  colspan='4' style="color:#ff0000;font-weight: bold;font-size: 15px;">未生成检验申请</td>
-							// 							</tr>
-							// 						</tbody>
-							// 					</table>
-							// 				</div>
-							// 			</div>
-							// 			`
-							// }else{
+							if(!item.haveInspectionRequest){
+								str += `
+										<div class="box" style="page-break-before:always;"><br />
+											<div class="relative" > 
+												<div class="q">Q</div>
+												<table border='1'>
+													<thead>
+														<tr class='top1'>
+															<th>物料代码:</th>
+															<th colspan='3'>${item.itemCode}</th>
+														</tr>
+													</thead>
+													<tbody>
+														<tr>
+															<td>物料名称</td>
+															<td>${item.itemName}</td>
+															<td>发货单号</td>
+															<td>${this.data1.asnNumber}</td>
+														</tr>
+														<tr>
+															<td>供应商</td>
+															<td>${item.supplierCode}</td>
+															<td>供应商批次</td>
+															<td>${item.supplierBatch}</td>
+														</tr>
+														<tr>
+															<td>到货数量</td>
+															<td>${item.quantityQty}</td>
+															<td>抽检数量</td>
+															<td>${item.sampleQty}</td>
+														</tr>
+														<tr>
+															<td  colspan='4' style="color:#ff0000;font-weight: bold;font-size: 15px;">未生成检验申请</td>
+														</tr>
+													</tbody>
+												</table>
+											</div>
+										</div>
+										`
+							}else{
 								str += `
 										<div class="box" style="page-break-before:always;"><br />
 											<div class="relative" > 
@@ -276,7 +276,7 @@
 											</div>
 										</div>
 										`
-							// }
+							}
 							
 						})
 						this.newHtmlContent1 = this.newHtmlContent1.replace(
@@ -367,13 +367,13 @@
 					}
 					this.getTableInspectDTOList()
 				})
-				// .catch(error=>{
-				// 	this.$refs.comMessage.showMessage(error, res => {
-				// 		if (res) {
+				.catch(error=>{
+					this.$refs.comMessage.showMessage(error, res => {
+						if (res) {
 					
-				// 		}
-				// 	});
-				// })
+						}
+					});
+				})
 			}
 			
 			this.getPointPutawayJobHtml()

From 22d90fa4c13c56847615b08a5a20d30754ad3c2a Mon Sep 17 00:00:00 2001
From: lijuncheng <juncheng.li@ccwin-in.com>
Date: Fri, 16 Aug 2024 08:52:34 +0800
Subject: [PATCH 26/33] =?UTF-8?q?=E7=9B=AE=E6=A0=87=E5=BA=93=E4=BD=8D?=
 =?UTF-8?q?=E5=92=8C=E7=8A=B6=E6=80=81=E9=83=BD=E4=B8=80=E8=87=B4=E6=97=B6?=
 =?UTF-8?q?=E4=B8=8D=E5=8F=AF=E4=BB=A5=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../inventoryMove/coms/comMoveRecord.vue      | 48 +++++++++++++------
 1 file changed, 34 insertions(+), 14 deletions(-)

diff --git a/src/pages/inventoryMove/coms/comMoveRecord.vue b/src/pages/inventoryMove/coms/comMoveRecord.vue
index 89863e59..690ddbff 100644
--- a/src/pages/inventoryMove/coms/comMoveRecord.vue
+++ b/src/pages/inventoryMove/coms/comMoveRecord.vue
@@ -372,20 +372,7 @@
 					getPrecisionStrategyList(precisionStrategParams, res => {
 						if (res.success) {
 							this.managementList = res.list;
-							var params = this.setParams()
-							console.log("提交" + JSON.stringify(params))
-							inventoryMoveRecordSubmit(params).then(res => {
-								uni.hideLoading()
-								if (res.data) {
-									this.showCommitSuccessMessage("提交成功\n生成" + this.title + "\n" +
-										res.data)
-								} else {
-									this.showErrorMessage("提交失败[" + res.msg + "]")
-								}
-							}).catch(error => {
-								uni.hideLoading()
-								this.showErrorMessage(error)
-							})
+								this.submit()
 						} else {
 							uni.hideLoading();
 							this.showErrorMessage(res.message);
@@ -398,6 +385,39 @@
 				}
 
 			},
+			
+			submit(){
+				//目标库位和状态都一致时不可以提交
+				var params = this.setParams()
+				let hint=""
+				this.dataContent.subList.forEach(res=>{
+					if(res.fromLocationCode==res.toLocationCode&&
+					res.fromInventoryStatus&&res.toInventoryStatus){
+						hint +=`包装号【${res.fromPackingNumber}】来源库位与目标库位 来源状态与目标状态一致,不可以提交\n`
+					}
+				})
+				if(hint){
+					uni.hideLoading()
+					this.$refs.comMessage.showQuestionMessage1(hint, 'red', res => {
+						if (res) {
+						} 
+					});
+					return;
+				}
+				console.log("提交" + JSON.stringify(params))
+				inventoryMoveRecordSubmit(params).then(res => {
+					uni.hideLoading()
+					if (res.data) {
+						this.showCommitSuccessMessage("提交成功\n生成" + this.title + "\n" +
+							res.data)
+					} else {
+						this.showErrorMessage("提交失败[" + res.msg + "]")
+					}
+				}).catch(error => {
+					uni.hideLoading()
+					this.showErrorMessage(error)
+				})
+			},
 
 			setPrecisionStrategParams() {
 				var itemList = []

From 06bc901945557c883b1566ee32cc13e2bee5e97b Mon Sep 17 00:00:00 2001
From: lijuncheng <juncheng.li@ccwin-in.com>
Date: Fri, 16 Aug 2024 09:15:03 +0800
Subject: [PATCH 27/33] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=9B=B4=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=91=E6=96=99=E6=89=AB=E6=8F=8F=E7=84=A6=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/issue/record/directIssue.vue | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/pages/issue/record/directIssue.vue b/src/pages/issue/record/directIssue.vue
index a9f1c41f..02938feb 100644
--- a/src/pages/issue/record/directIssue.vue
+++ b/src/pages/issue/record/directIssue.vue
@@ -268,7 +268,9 @@
 
 			showErrorMessage(message) {
 				this.$refs.comMessage.showErrorMessage(message, res => {
-					if (res) {}
+					if (res) {
+						this.scanPopupGetFocus()
+					}
 				});
 			},
 

From 7113fa4c29f02801d4c77ec5ee800d4cd202c04f Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Fri, 16 Aug 2024 10:35:15 +0800
Subject: [PATCH 28/33] =?UTF-8?q?HL-5275=20=E7=9B=B4=E6=8E=A5=E7=A7=BB?=
 =?UTF-8?q?=E5=BA=93=E6=89=AB=E6=8F=8F=E7=AC=AC=E4=B8=80=E4=B8=AA=E7=AE=B1?=
 =?UTF-8?q?=E7=AD=BE=E5=90=8E=EF=BC=8C=E5=9C=A8=E6=89=AB=E6=8F=8F=E7=AC=AC?=
 =?UTF-8?q?=E4=BA=8C=E4=B8=AA=E6=97=B6=E6=B2=A1=E6=9C=89=E5=85=89=E6=A0=87?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=EF=BC=8C=E9=9C=80=E8=A6=81=E7=82=B9=E5=87=BB?=
 =?UTF-8?q?=E6=89=AB=E6=8F=8F=E6=A1=86=E6=89=8D=E8=83=BD=E7=BB=A7=E7=BB=AD?=
 =?UTF-8?q?=E6=89=AB=E6=8F=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/mycomponents/scan/winScanPackAndLocation.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/mycomponents/scan/winScanPackAndLocation.vue b/src/mycomponents/scan/winScanPackAndLocation.vue
index e958c8d4..d7504bf6 100644
--- a/src/mycomponents/scan/winScanPackAndLocation.vue
+++ b/src/mycomponents/scan/winScanPackAndLocation.vue
@@ -434,7 +434,7 @@
 					balance: item,
 					fromLocationCode: this.fromLocationCode,
 				}
-				// this.packGetFocus();
+				this.packGetFocus();
 				this.$emit("getResult", data);
 			},
 

From 908af9994956ae634c3876fe255837b5f0683e4c Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Fri, 16 Aug 2024 13:10:08 +0800
Subject: [PATCH 29/33] =?UTF-8?q?HL-5359=20=E5=9C=A8=E5=BC=80=E5=85=B3?=
 =?UTF-8?q?=E8=A1=A8=E4=B8=AD=E5=A2=9E=E5=8A=A0=E5=BC=80=E5=85=B3=EF=BC=9A?=
 =?UTF-8?q?semiProductReceipCommitValidate=EF=BC=8C=E5=9C=A8=E9=A2=84?=
 =?UTF-8?q?=E7=94=9F=E4=BA=A7=E5=AE=8C=E5=B7=A5=E6=94=B6=E8=B4=A7=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E6=8F=90=E4=BA=A4=E6=97=B6=E6=A0=B9=E6=8D=AE=E5=BC=80?=
 =?UTF-8?q?=E5=85=B3=E6=A0=A1=E9=AA=8C=E6=98=AF=E5=90=A6=E8=A6=81=E6=89=AB?=
 =?UTF-8?q?=E6=8F=8F=E7=9B=AE=E6=A0=87=E5=BA=93=E4=BD=8D=EF=BC=8C=E5=A6=82?=
 =?UTF-8?q?=E6=9E=9C=E4=B8=8D=E6=89=AB=E6=8F=8F=E7=9B=AE=E6=A0=87=E5=BA=93?=
 =?UTF-8?q?=E4=BD=8D=E5=8F=96=E4=BB=BB=E5=8A=A1=E4=B8=AD=E7=9A=84=E7=9B=AE?=
 =?UTF-8?q?=E6=A0=87=E5=BA=93=E4=BD=8D=EF=BC=8C=E5=8F=82=E8=80=83=E8=A3=85?=
 =?UTF-8?q?=E9=85=8D=E4=BB=BB=E5=8A=A1=E4=B8=AD=E7=9A=84fgProductReceipCom?=
 =?UTF-8?q?mitValidate=E5=BC=80=E5=85=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/index/index.vue                     |  2 +-
 .../job/productReceiptDetail.vue              | 20 +++++++++++--------
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue
index 8fb3b6c7..1fa86ce7 100644
--- a/src/pages/index/index.vue
+++ b/src/pages/index/index.vue
@@ -388,7 +388,7 @@
 					console.log("包装规格获取失败", res)
 				})
 				
-				var switchCode="FgPutawayLocationCodeValidate,SemiPutawayLocationCodeValidate,PurchasePutawayToLocationCodeValidate,IssueToLocationCodeValidate,fgProductReceipCommitValidate,purchasereceiptPrintPDA,purchaseReceiptLocationCodeValidate,CreateProductputawayRequestAfterProductreceiptRecordCreated";
+				var switchCode="FgPutawayLocationCodeValidate,SemiPutawayLocationCodeValidate,PurchasePutawayToLocationCodeValidate,IssueToLocationCodeValidate,fgProductReceipCommitValidate,semiProductReceipCommitValidate,purchasereceiptPrintPDA,purchaseReceiptLocationCodeValidate,CreateProductputawayRequestAfterProductreceiptRecordCreated";
 
 				getSwitchByCode(switchCode).then(res=>{
 					uni.setStorageSync("switch", res.data)
diff --git a/src/pages/productReceipt/job/productReceiptDetail.vue b/src/pages/productReceipt/job/productReceiptDetail.vue
index 7a898713..1c6c3cb3 100644
--- a/src/pages/productReceipt/job/productReceiptDetail.vue
+++ b/src/pages/productReceipt/job/productReceiptDetail.vue
@@ -85,7 +85,8 @@
 	import {
 		goHome,
 		navigateBack,
-		getPackingNumberAndBatch,
+		getPackingNumberAndBatch,
+		getSwitchInfoByCode
 	} from '@/common/basic.js';
 
 	import {
@@ -334,18 +335,21 @@
 				});
 			},
 
-			commit() {
+			commit() {
 				this.scanCount = getScanCount(this.subList);
 				if (this.scanCount == 0) {
 					this.showErrorMessage("扫描数为0,请先扫描")
 					return;
+				}
+				var valiDate = getSwitchInfoByCode("semiProductReceipCommitValidate")
+				//校验库位、
+				if(valiDate){
+					if (!this.checkLocation()) {
+						return
+					}
+				}else{
+					this.toLocationCode = this.jobToLocationCode
 				}
-				//校验库位、
-				if (!this.checkLocation()) {
-					return
-				}
-
-
 				//扫描数量和任务数量相等，直接提交
 				if (this.scanCount == this.subList.length) {
 					if (this.checkCount()) {

From 110767de2ade859596c77b47a4d5a0490d84f7ce Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Fri, 16 Aug 2024 14:50:22 +0800
Subject: [PATCH 30/33] =?UTF-8?q?HL-4766=20=E5=9C=A8WMS=E7=9A=84=E7=99=BB?=
 =?UTF-8?q?=E5=BD=95=E9=A1=B5=E9=9D=A2=E5=92=8CPDA=E7=9A=84=E7=99=BB?=
 =?UTF-8?q?=E5=BD=95=E9=A1=B5=E9=9D=A2=E5=8F=96=E6=B6=88=E9=AA=8C=E8=AF=81?=
 =?UTF-8?q?=E7=A0=81=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/request2.js       |  2 +-
 src/pages/login/index.vue | 13 ++++++++-----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/api/request2.js b/src/api/request2.js
index f654afbd..8dc5ef33 100644
--- a/src/api/request2.js
+++ b/src/api/request2.js
@@ -19,7 +19,7 @@ export function getCaptchaImage(params) {
  */
 export function login(username, password, code, uuid, tenantName) {
 	return request({
-		url: baseApi + '/system/auth/login',
+		url: baseApi + '/system/auth/loginNoCode',
 		headers: {
 			isToken: false
 		},
diff --git a/src/pages/login/index.vue b/src/pages/login/index.vue
index 50420dd7..71ac4b30 100644
--- a/src/pages/login/index.vue
+++ b/src/pages/login/index.vue
@@ -65,13 +65,13 @@
 						</view>
 
 					</view>
-					<view style="display: flex;flex-direction: row;">
+					<view style="display: flex;flex-direction: row;" v-if="needCode">
 						<!-- <view class="uni-input">
 							<input class="" placeholder="请输入验证码"
 							v-model="code"
 								style="background-color: lightgray;padding-top: 40rpx;padding-bottom: 40rpx;margin-right: 20rpx;" />
 						</view> -->
-						<view class="uni-input-wrapper">
+						<view class="uni-input-wrapper" >
 							<input class="" style="height: 80rpx; background-color: #F7F9FF;margin-right: 20rpx;"
 								placeholder="请输入验证码" type="number" v-model="code" />
 						</view>
@@ -119,7 +119,8 @@
 				imageSrc: "",
 				code: "",
 				uuid: "",
-				version: ""
+				version: "",
+				needCode:false
 			}
 		},
 		// computed: mapState(['forcedLogin', 'hasLogin']),
@@ -185,13 +186,15 @@
 						icon: 'none',
 						mask: true
 					})
-				} else if (this.code === '') {
+				} 
+				else if (this.needCode&&this.code === '') {
 					uni.showToast({
 						title: '验证码不能为空',
 						icon: 'none',
 						mask: true
 					})
-				} else {
+				} 
+				else {
 					// console.log("用户名：", this.username, "密码：", this.password, this.tapstyle, this.smloginmsg)
 					let logininfo = {
 						username: "",

From 61d96a6582861ea729837ece9822a2ea70d64807 Mon Sep 17 00:00:00 2001
From: lijuncheng <juncheng.li@ccwin-in.com>
Date: Fri, 16 Aug 2024 14:57:22 +0800
Subject: [PATCH 31/33] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A2=84=E7=94=9F?=
 =?UTF-8?q?=E4=BA=A7=E4=B8=8A=E6=9E=B6=E6=89=AB=E6=8F=8F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../record/productPutawayRecord.vue           | 48 +++++++++++--------
 1 file changed, 28 insertions(+), 20 deletions(-)

diff --git a/src/pages/productPutaway/record/productPutawayRecord.vue b/src/pages/productPutaway/record/productPutawayRecord.vue
index 1c98771d..d3362b7d 100644
--- a/src/pages/productPutaway/record/productPutawayRecord.vue
+++ b/src/pages/productPutaway/record/productPutawayRecord.vue
@@ -1,10 +1,10 @@
 <template>
-	<view class="">
+	<view class="page-wraper">
 		<view class="">
 			<com-blank-view @goScan='openScanPopup' v-if="detailSource.length==0"></com-blank-view>
 		</view>
-		<view class="uni-flex uni-column" v-if="detailSource.length>0" style="height: calc(100vh - 44px);">
-			<view class="" style="flex: 1;">
+		<view class="page-wraper" v-if="detailSource.length>0" style="height: calc(100vh - 44px);">
+			<view class="page-main">
 				<scroll-view scroll-y="true" class="page-main-scroll">
 					<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
 						<view class="">
@@ -30,9 +30,11 @@
 					</view>
 				</view>
 			</view>
-			<win-scan-button @goScan='openScanPopup'></win-scan-button>
+
 		</view>
 
+		<win-scan-button v-if="detailSource.length>0" @goScan='openScanPopup'></win-scan-button>
+
 		<win-scan-package ref="scanPopup" @getResult='getScanResult'></win-scan-package>
 		<win-scan-location ref="scanLocationCode" title="目标库位" @getLocation='getToLocationCode'
 			:locationAreaTypeList="toLocationAreaTypeList"></win-scan-location>
@@ -142,7 +144,7 @@
 		},
 
 		methods: {
-			 getScanResult(result) {
+			getScanResult(result) {
 				let label = result.label;
 				let pack = result.package;
 				result.balance.forEach(
@@ -155,17 +157,14 @@
 						})
 						if (item == undefined) {
 							var itemp = createItemInfo(balance, pack);
+							itemp.containerNumber = balance.parentPackingNumber
 							//查询推荐的目标库位
-							let newDetail = createDetailInfo(balance, pack); 
+							let newDetail = createDetailInfo(balance, pack);
 							newDetail.fromInventoryStatus = balance.inventoryStatus;
 							itemp.subList.push(newDetail);
-							this.getRecommendLocation(balance, res => {
-								itemp.toLocationCode = res.code;
-								itemp.expectinNumber = res.expectinNumber;
-								this.detailSource.push(itemp)
-								this.$forceUpdate();
-							})
-							
+							this.detailSource.push(itemp)
+							this.calcHandleQty();
+							this.getRecommendLocation(balance)
 						} else {
 							var detail = item.subList.find(r => {
 								if (r.packingNumber == balance.packingNumber &&
@@ -191,7 +190,7 @@
 				)
 			},
 
-			getRecommendLocation(balance, callback) {
+			getRecommendLocation(balance) {
 				uni.showLoading({
 					title: '扫描中...',
 					mask: true
@@ -201,11 +200,21 @@
 					expectinNumber: balance.packingNumber + "-" + Date.now(),
 					itemCode: balance.itemCode,
 					inventoryStatus: balance.inventoryStatus,
+					batch: balance.batch
 				};
 				console.log(JSON.stringify(param))
-				getrecommendLocationExpectin(param).then(res => {
-					callback(res.data);
+				getrecommendLocationExpectin(param).then(result => {
 					uni.hideLoading();
+					let item = this.detailSource.find(res => {
+						if (res.itemCode == balance.itemCode && res.containerNumber == balance
+							.parentPackingNumber) {
+							return res
+						}
+					})
+					item.toLocationCode = result.data.code;
+					item.expectinNumber = result.data.expectinNumber;
+					this.$forceUpdate();
+
 				}).catch(error => {
 					uni.hideLoading()
 					this.showErrorMessage(error);
@@ -277,7 +286,7 @@
 					this.$refs.scanPopup.getfocus();
 				}
 			},
-			
+
 			scanPopupLoseFocus() {
 				if (this.$refs.scanPopup != undefined) {
 					this.$refs.scanPopup.losefocus();
@@ -460,9 +469,8 @@
 					}
 				}
 			},
-			
-			cancel()
-			{
+
+			cancel() {
 				this.clearData();
 				this.openScanPopup();
 			}

From 1e82452cf91ce137cc7b77909c2c0e77042276f8 Mon Sep 17 00:00:00 2001
From: lijuncheng <juncheng.li@ccwin-in.com>
Date: Fri, 16 Aug 2024 15:02:52 +0800
Subject: [PATCH 32/33] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BA=93=E7=A7=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/inventoryMove/coms/comMoveRecord.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/inventoryMove/coms/comMoveRecord.vue b/src/pages/inventoryMove/coms/comMoveRecord.vue
index 690ddbff..161473dc 100644
--- a/src/pages/inventoryMove/coms/comMoveRecord.vue
+++ b/src/pages/inventoryMove/coms/comMoveRecord.vue
@@ -392,7 +392,7 @@
 				let hint=""
 				this.dataContent.subList.forEach(res=>{
 					if(res.fromLocationCode==res.toLocationCode&&
-					res.fromInventoryStatus&&res.toInventoryStatus){
+					res.fromInventoryStatus==res.toInventoryStatus){
 						hint +=`包装号【${res.fromPackingNumber}】来源库位与目标库位 来源状态与目标状态一致,不可以提交\n`
 					}
 				})

From 31710c05bcdd4339008643b040ba0ea2cb35f7d9 Mon Sep 17 00:00:00 2001
From: lijuncheng <juncheng.li@ccwin-in.com>
Date: Fri, 16 Aug 2024 15:03:10 +0800
Subject: [PATCH 33/33] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages.json                                |  39 ++
 src/pages/putaway/job/quantityPutawayJob.vue  | 431 +++++++++++++
 .../putaway/job/quantityPutawayJobDetail.vue  | 604 ++++++++++++++++++
 3 files changed, 1074 insertions(+)
 create mode 100644 src/pages/putaway/job/quantityPutawayJob.vue
 create mode 100644 src/pages/putaway/job/quantityPutawayJobDetail.vue

diff --git a/src/pages.json b/src/pages.json
index 33a6771c..de431de2 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -458,6 +458,45 @@
 				"enablePullDownRefresh": false
 			}
 		},
+		
+		{
+			"path": "pages/putaway/job/quantityPutawayJob",
+			"style": {
+				"navigationBarTitleText": "采购上架(批量)",
+				"enablePullDownRefresh": false,
+				"titleNView": {
+					// "autoBackButton": "true",
+					"buttons": [
+						// 右边按钮
+						{
+		
+							"float": "right",
+							"fontSize": "58rpx", //按钮上文字的大小
+							"text": "\ue696",
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
+		
+						},
+						{
+		
+							"float": "right",
+							"fontSize": "52rpx", //按钮上文字的大小
+							"text": "\ue6e2",
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
+						}
+					]
+				}
+			}
+		},
+		
+		{
+			"path": "pages/putaway/job/quantityPutawayJobDetail",
+			"style": {
+				"navigationBarTitleText": "采购上架(批量)详情",
+				"enablePullDownRefresh": false
+			}
+		},
+		
+		
 		{
 			"path": "pages/putaway/record/putawayRecord",
 			"style": {
diff --git a/src/pages/putaway/job/quantityPutawayJob.vue b/src/pages/putaway/job/quantityPutawayJob.vue
new file mode 100644
index 00000000..9c903838
--- /dev/null
+++ b/src/pages/putaway/job/quantityPutawayJob.vue
@@ -0,0 +1,431 @@
+<template>
+	<view class="">
+		<com-empty-view v-if="jobList.length==0"></com-empty-view>
+		<job-filter ref="filter" otherTitle="ASN" @switchChangeToday="switchChangeToday"
+			@switchChangeWait="switchChangeWait" @onScanNumber="getScanNumber" :checkedToday="checkedToday"
+			:checkedWaitTask="checkedWaitTask">
+		</job-filter>
+
+		<view v-if="jobList.length>0">
+			<uni-swipe-action ref="swipeAction">
+				<view v-for="(item, index) in jobList" :key="index">
+					<uni-swipe-action-item :right-options="item.status=='2'?detailGiveupOptions:detailOptions"
+						@click="swipeClick($event,item)">
+						<com-putaway-job-card :dataContent="item" @click='openJobDetail(item)'></com-putaway-job-card>
+					</uni-swipe-action-item>
+				</view>
+			</uni-swipe-action>
+
+			<putaway-info-popup ref='jobInfoPopup'></putaway-info-popup>
+			<putaway-job-list-popup ref="jobListPopup" @selectedItem="selectedItem"></putaway-job-list-popup>
+			<uni-load-more :status="loadingType" v-if="jobList.length>0" />
+
+		</view>
+		<win-scan-button @goScan='openScanPopup' v-if="jobList.length>0"></win-scan-button>
+
+		<winScanPackJob ref="scanPopup" @getResult='getScanResult'>
+		</winScanPackJob>
+		<jobList ref="jobList" @selectItem="selectItem"></jobList>
+
+		<comMessage ref="comMessage"></comMessage>
+	</view>
+</template>
+
+<script>
+	import jobList from '@/mycomponents/jobList/jobList.vue'
+
+	import {
+		getPutawayJobList,
+		cancleTakePutawayJob
+	} from '@/api/request2.js';
+
+	import {
+		goHome,
+		updateTitle
+	} from '@/common/basic.js';
+
+	import {
+		getDetailOption,
+		getDetailGiveupOption
+	} from '@/common/array.js';
+	import winScanButton from '@/mycomponents/scan/winScanButton.vue'
+
+	import comEmptyView from '@/mycomponents/common/comEmptyView.vue'
+	import jobFilter from '@/mycomponents/job/jobFilter.vue'
+	import comPutawayJobCard from '@/pages/putaway/coms/comPutawayJobCard.vue'
+	import putawayJobListPopup from '@/pages/putaway/coms/putawayJobListPopup.vue'
+	import putawayInfoPopup from '@/pages/putaway/coms/putawayInfoPopup.vue'
+	import winScanPackJob from "@/mycomponents/scan/winScanPackJob.vue"
+	import {
+		Exception
+	} from 'sass';
+
+	export default {
+		name: 'Putaway',
+		components: {
+			comEmptyView,
+			jobFilter,
+			comPutawayJobCard,
+			putawayJobListPopup,
+			putawayInfoPopup,
+			winScanButton,
+			winScanPackJob,
+			jobList
+		},
+		data() {
+			return {
+				jobList: [],
+				pageNo: 1,
+				pageSize: 10,
+				totalCount: 0,
+				loadingType: "nomore",
+				checkedToday: false,
+				checkedWaitTask: false,
+				todayTime: "",
+				status: '1,2', //待处理 、进行中
+				detailOptions: [],
+				detailGiveupOptions: [],
+				title: '',
+				scanMessage: ""
+			};
+		},
+
+		onLoad(option) {
+			this.title = option.title
+		},
+
+		onShow() {
+			this.getList('refresh');
+
+		},
+
+		onReady() {
+			this.detailOptions = getDetailOption();
+			this.detailGiveupOptions = getDetailGiveupOption();
+		},
+
+		//后退按钮
+		onBackPress(options) {
+			if (options.from === 'navigateBack') {
+				uni.navigateBack({
+					delta: 1
+				})
+				return false;
+			}
+		},
+
+		//返回首页
+		onNavigationBarButtonTap(e) {
+			if (e.index === 0) {
+				goHome();
+			} else if (e.index == 1) {
+				this.$refs.filter.openFilter();
+			}
+		},
+		onReachBottom() {
+			//避免多次触发
+			if (this.loadingType == 'loading' || this.loadingType == 'nomore') {
+				return;
+			}
+			this.getList("more");
+		},
+		onPullDownRefresh() {
+			this.getList('refresh');
+		},
+
+		methods: {
+			getList(type) {
+				let that = this;
+				uni.showLoading({
+					title: "加载中­....",
+					mask: true
+				});
+
+				this.loadingType = "loading";
+				if (type === "refresh") {
+					this.pageNo = 1;
+					this.jobList = [];
+				}
+
+				var filters = []
+				if (this.checkedToday) {
+					filters.push({
+						column: "create_time",
+						action: "betweeen",
+						value: this.todayTime
+					})
+				}
+
+				filters.push({
+					column: "status",
+					action: "in",
+					value: this.status
+				})
+				filters.push({
+					column: "accept_user_id",
+					action: "==",
+					value: this.$store.state.user.id
+				})
+				var params = {
+					filters: filters,
+					pageNo: this.pageNo,
+					pageSize: this.pageSize,
+				}
+
+				getPutawayJobList(params).then(res => {
+					uni.hideLoading();
+					if (type === "refresh") {
+						uni.stopPullDownRefresh();
+						this.openScanPopup()
+					}
+
+					var list = res.data.list;
+					this.totalCount = res.data.total
+					updateTitle(this.title + "(" + this.totalCount + ")");
+					this.loadingType = "loadmore";
+					if (list == null || list.length == 0) {
+						this.loadingType = "nomore";
+						return;
+					}
+					this.jobList = type === "refresh" ? list : this.jobList.concat(list);
+					this.pageNo++;
+
+				}).catch(error => {
+					if (type === "refresh") {
+						uni.stopPullDownRefresh();
+					}
+					this.loadingType = "";
+					updateTitle(this.title);
+					uni.hideLoading();
+					that.showMessage(error)
+				})
+			},
+
+			openJobDetail(item) {
+				uni.navigateTo({
+					url: './putawayDetail?id=' + item.masterId + '&status=' + item.status + '&title=' + this.title
+				});
+				this.scanMessage = ""
+			},
+
+			showItemList(itemList) {
+				this.$refs.scanList.openPopup(itemList);
+			},
+
+			selectedItem(item) {
+				this.openJobDetail(item);
+			},
+
+			swipeClick(e, dataContent) {
+				if (e.content.text == "详情") {
+					this.openjobInfoPopup(dataContent);
+				} else if (e.content.text == "放弃") {
+					this.$refs.comMessage.showQuestionMessage("确定要放弃当前任务?",
+						res => {
+							if (res) {
+								this.cancleJob(dataContent.masterId);
+							}
+						});
+				}
+			},
+
+			openjobInfoPopup(item) {
+				this.$refs.jobInfoPopup.openPopup(item)
+			},
+
+			cancleJob(id) {
+				cancleTakePutawayJob(id).then(res => {
+					if (res.data) {
+						this.getList("refresh")
+						uni.showToast({
+							title: "放弃任务成功"
+						})
+					} else {
+						this.showMessage("放弃任务失败")
+					}
+				}).catch(error => {
+					this.showMessage(error)
+				})
+			},
+
+			switchChangeToday(state, creationTime) {
+				this.checkedToday = state;
+				this.todayTime = creationTime;
+				this.getList("refresh");
+			},
+
+			switchChangeWait(state, jobStatus) {
+				this.checkedWaitTask = state;
+				this.status = jobStatus;
+				this.getList("refresh");
+			},
+
+			getScanNumber(code) {
+				this.getDataListByType(code)
+			},
+
+			getDataListByType(code) {
+				let that = this;
+				uni.showLoading({
+					title: "加载中....",
+					mask: true
+				});
+				var filters = []
+				filters.push({
+					column: "status",
+					action: "in",
+					value: '1,2'
+				})
+				filters.push({
+					column: "number",
+					action: "==",
+					value: code
+				})
+
+				filters.push({
+					column: "accept_user_id",
+					action: "==",
+					value: this.$store.state.user.id
+				})
+
+				var params = {
+					filters: filters,
+					pageNo: 1,
+					pageSize: 100,
+				}
+				getPutawayJobList(params).then(res => {
+					uni.hideLoading();
+					if (res.data.list.length == 0) {
+						that.showMessage('未查找到' + '【' + code + '】的收货任务');
+					} else if (res.data.list.length == 1) {
+						that.openJobDetail(res.data.list[0]);
+					}
+				}).catch(error => {
+					uni.hideLoading();
+					that.showMessage(error);
+				})
+			},
+
+
+			showMessage(message) {
+				if(this.$refs.scanPopup){
+					this.$refs.scanPopup.packLoseFocus()
+				}
+				this.$refs.comMessage.showErrorMessage(message, res => {
+					if (res) {
+						if(this.$refs.scanPopup){
+							this.$refs.scanPopup.packGetFocus()
+						}
+					}
+				});
+			},
+			openScanPopup() {
+				this.$refs.scanPopup.openScanPopup();
+			},
+			selectItem(item) {
+				this.$refs.scanPopup.closeScanPopup();
+				uni.navigateTo({
+					url: './putawayDetail?id=' +
+						item.masterId +
+						'&status=' + item.status +
+						'&scaned=' + item.packingNumber +
+						'&title=' + this.title +
+						"&scanMessage=" + this.scanMessage
+				});
+				this.scanMessage = ""
+			},
+			getScanResult(result) {
+				try {
+					this.scanMessage = ""
+					var filters = [{
+							column: "packingNumber",
+							action: "in",
+							value: result.package.number + "," + result.package.parentNumber
+						},
+						{
+							column: "batch",
+							action: "==",
+							value: result.package.batch
+						},
+						// {
+						// 	column: "qty",
+						// 	action: "==",
+						// 	value: result.label.qty
+						// },
+						{
+							column: "itemCode",
+							action: "==",
+							value: result.package.itemCode
+						},
+						{
+							column: "status",
+							action: "in",
+							value: '1,2',
+						},
+						// {
+						// 	column: "accept_user_id",
+						// 	action: "==",
+						// 	value: this.$store.state.user.id
+						// }
+						// {
+						// 	column: "fromLocationCode",
+						// 	action: "==",
+						// 	value: result.label.fromLocationCode
+						// },
+					]
+					getPutawayJobList({
+						filters: filters,
+						pageNo: 1,
+						pageSize: 100,
+					}).then(res => {
+						this.scanMessage = result.scanMessage
+						let resultList = res.data.list;
+						if (resultList.length > 0) {
+							resultList.forEach(item => {
+								item.title = item.number;
+								item.selected = false
+							})
+							let list = []
+							resultList.forEach(item => {
+								if (!list.find(subItem => subItem.title == item.title)) {
+									list.push(item)
+								}
+							})
+							if (list.length == 1) {
+								//待处理
+								if (list[0].status == 1) {
+									this.selectItem(list[0])
+								} else if (list[0].status == 2) {
+									//进行中
+									if (list[0].acceptUserId == this.$store.state.user.id) {
+										this.selectItem(list[0])
+									} else {
+										this.showMessage("该任务已经被[" + list[0].acceptUserName + "]承接" + "\n任务号[" +
+											list[0].number + "]扫描[" + result.scanMessage + "]")
+									}
+								} else if (list[0].status == 3) {
+									this.showMessage("该任务已经完成\n承接人[" + list[0].acceptUserName + "]\n任务号[" +
+										list[0].number + "]扫描[" + result.scanMessage + "]")
+								}
+							} else {
+								this.showMessage("查询到多条任务\n" + "扫描[" + result.scanMessage + "]")
+							}
+
+						} else {
+							this.showMessage("未查找到任务\n" + "扫描[" + result.scanMessage + "]")
+						}
+					}).catch(error => {
+						this.showMessage(error + "\n扫描[" + result.scanMessage + "]")
+					})
+
+				} catch (e) {
+					this.showMessage(e + "\n扫描[" + result.scanMessage + "]")
+				}
+			},
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+
+</style>
\ No newline at end of file
diff --git a/src/pages/putaway/job/quantityPutawayJobDetail.vue b/src/pages/putaway/job/quantityPutawayJobDetail.vue
new file mode 100644
index 00000000..80540675
--- /dev/null
+++ b/src/pages/putaway/job/quantityPutawayJobDetail.vue
@@ -0,0 +1,604 @@
+<template>
+	<view class="page-wraper">
+		<view class="page-header">
+			<view class="header-view">
+				<view class="header_job_top">
+					<job-top :dataContent="jobContent"></job-top>
+				</view>
+				<view class="header_item">
+					申请单号 : {{jobContent.requestNumber}}
+				</view>
+			</view>
+		</view>
+
+		<view class="page-main">
+			<scroll-view scroll-y="true" class="page-main-scroll">
+				<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
+					<view class="">
+						<comJobDetailCard :dataContent="item" :index="index" :settingParam="jobContent"
+							:isShowStatus="false" @remove="updateData" @updateData="updateData"
+							:locationAreaTypeList='toLocationAreaTypeList'>
+						</comJobDetailCard>
+					</view>
+				</view>
+			</scroll-view>
+		</view>
+
+		<view class="page-footer">
+			<view class="uni-flex u-col-center space-between padding_10"
+				style="background-color:ghostwhite; width: 100%; ">
+				<view class="">
+					<locationCompare ref='comScanLocation' title="目标库位" :recommendLocationCode="jobToLocationCode"
+						:locationCode="toLocationCode" @getLocation='scanLocationCode' :isShowEdit="isCheckLocation"
+						:locationAreaTypeList="toLocationAreaTypeList"></locationCompare>
+				</view>
+				<view class=" uni-flex uni-row">
+					<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
+				</view>
+			</view>
+		</view>
+
+		<win-scan-button @goScan='openScanPopup'></win-scan-button>
+		<!-- 		<winScanPackAndLocationNoBalance ref="scanPopup" @getResult='getScanResult' :allowNullBalance="true">
+		</winScanPackAndLocationNoBalance> -->
+
+		<winScanPackAndLocation :balanceFromInventoryStatuses="false" ref="scanPopup" @getResult='getScanResult'
+			:noShowBalanceMessage="true">
+		</winScanPackAndLocation>
+
+		<comMessage ref="comMessage"></comMessage>
+	</view>
+</template>
+
+<script>
+	import {
+		getManagementPrecisions,
+	} from '@/common/balance.js';
+
+	import {
+		getPutawayJobDetail,
+		putawayJobSubmit,
+		takePutawayJob,
+		cancleTakePutawayJob,
+		getSwitchByCode
+	} from '@/api/request2.js';
+	import {
+		goHome,
+		getCurrDateTime,
+		getPackingNumberAndBatch,
+		navigateBack,
+		compareAsc,
+		getSwitchInfoByCode
+	} from '@/common/basic.js';
+
+	import {
+		getDirectoryItemArray,
+		getInventoryStatusName
+	} from '@/common/directory.js';
+
+	import {
+		getTreeDataSource,
+		calcHandleQty,
+		calcTreeHandleQty,
+		getScanCount
+	} from '@/common/detail.js';
+
+	import winScanButton from '@/mycomponents/scan/winScanButton.vue'
+	import winScanPackAndLocation from "@/mycomponents/scan/winScanPackAndLocation.vue"
+	import comJobDetailCard from "@/mycomponents/detail/comJobDetailCard.vue"
+	import locationCompare from '@/mycomponents/location/locationCompare.vue'
+	import jobTop from '@/mycomponents/job/jobTop.vue'
+
+
+	export default {
+		components: {
+			winScanButton,
+			winScanPackAndLocation,
+			locationCompare,
+			comJobDetailCard,
+			jobTop
+		},
+		data() {
+			return {
+				id: '',
+				scanCount: 0,
+				jobContent: {}, //任务内容
+				subList: [], //接口返回的任务subList
+				detailSource: [], //绑定在页面上的数据源
+				managementList: [],
+				fromLocationCode: "",
+				toLocationCode: "",
+				toLocationAreaTypeList: [],
+				jobStatus: "",
+				jobToLocationCode: "",
+				isCheckLocation: false,
+				scanMessage: ""
+			};
+		},
+		onLoad(option) {
+			uni.setNavigationBarTitle({
+				title: option.title + '详情'
+			})
+			this.id = option.id;
+			this.scanMessage = option.scanMessage
+			if (this.id != undefined) {
+				//新建的任务自动接收
+				if (option.status == "1") {
+					this.receive((callback => {
+						this.getDetail();
+					}));
+				} else {
+					this.getDetail();
+				}
+			}
+
+
+		},
+		//返回首页
+		onNavigationBarButtonTap(e) {
+			if (e.index === 0) {
+				goHome();
+			}
+		},
+		//拦截返回按钮事件
+		onBackPress(e) {
+			//已经接收但是没提交任务
+			if (e.from == 'backbutton') {
+				if (this.jobStatus == "2") {
+					//取消承接任务
+					cancleTakePutawayJob(this.id).then(res => {
+						uni.navigateBack();
+					}).catch(error => {
+						uni.navigateBack();
+					})
+				} else {
+					uni.navigateBack();
+				}
+
+				return true;
+			}
+		},
+
+		onPullDownRefresh() {
+			this.getDetail();
+			uni.stopPullDownRefresh();
+		},
+
+		mounted() {
+
+		},
+		methods: {
+			//接收
+			receive(callback) {
+				if (this.id != null) {
+					takePutawayJob(this.id).then(res => {
+						callback();
+					}).catch(error => {
+						this.showErrorMessage(error)
+					})
+				}
+			},
+
+			getDetail() {
+				var that = this;
+				uni.showLoading({
+					title: "加载中....",
+					mask: true
+				});
+				getPutawayJobDetail(that.id).then(res => {
+					uni.hideLoading();
+					if (res.data == null) {
+						that.showMessage('未获取到详情');
+					} else {
+						if (res.data.subList.length > 0) {
+							that.jobContent = res.data;
+							that.jobStatus = res.data.status
+							that.subList = res.data.subList;
+							that.detailSource = getTreeDataSource(that.subList)
+							that.fromLocationCode = that.subList[0].fromLocationCode
+							that.jobToLocationCode = that.subList[0].toLocationCode;
+							that.toLocationAreaTypeList = getDirectoryItemArray(that.jobContent.toAreaTypes)
+							that.isCheckLocation = getSwitchInfoByCode("PurchasePutawayToLocationCodeValidate")
+							if (that.isCheckLocation) {
+								that.toLocationCode = ""
+							} else {
+								that.toLocationCode = that.jobToLocationCode;
+							}
+							//外部进入详情，如果有扫描信息，模拟自动扫描
+							if (this.scanMessage) {
+								this.openScanPopupSimulate(this.scanMessage)
+							}
+
+						} else {
+							that.showMessage('列表数据为0');
+						}
+					}
+				}).catch(error => {
+					uni.hideLoading()
+					this.showErrorMessage(error)
+				})
+			},
+
+			calcScanCount(closeScan) {
+				let items = this.subList.filter(r => {
+					if (r.scaned) {
+						return r;
+					}
+				})
+				this.scanCount = items != null ? items.length : 0;
+				if (this.scanCount == this.subList.length) {
+					this.closeScanPopup();
+				}
+			},
+
+			calcHandleQty() {
+				calcTreeHandleQty(this.detailSource);
+				this.continueScan()
+				this.$forceUpdate();
+			},
+
+			//继续扫描
+			continueScan() {
+				this.scanCount = getScanCount(this.subList);
+				if (this.scanCount == this.subList.length) {
+					this.closeScanPopup();
+				} else {
+					this.scanPopupGetFocus();
+				}
+			},
+
+			updateData() {
+				console.log("updateData")
+				// this.calcHandleQty();
+				calcTreeHandleQty(this.detailSource)
+			},
+			//模拟扫描功能
+			openScanPopupSimulate(message) {
+
+				let fromlocationCode = '';
+				let fromlocationList = [];
+				for (var i = 0; i < this.detailSource.length; i++) {
+					let item = this.detailSource[i];
+					item.subList.forEach(l => {
+						//重复的库位不往里面插入
+						var location = fromlocationList.find(res => res == l.fromLocationCode)
+						if (location == undefined) {
+							fromlocationList.push(l.fromLocationCode);
+						}
+						//来源库位赋默认值
+						if (fromlocationCode == '') {
+							fromlocationCode = l.fromLocationCode;
+						}
+					})
+				}
+				this.$refs.scanPopup.openScanPopupForJobSimulate(fromlocationCode, fromlocationList, this.jobContent,
+					message);
+			},
+
+			openScanPopup() {
+				let fromlocationCode = '';
+				let fromlocationList = [];
+				for (var i = 0; i < this.detailSource.length; i++) {
+					let item = this.detailSource[i];
+					item.subList.forEach(l => {
+						//重复的库位不往里面插入
+						var location = fromlocationList.find(res => res == l.fromLocationCode)
+						if (location == undefined) {
+							fromlocationList.push(l.fromLocationCode);
+						}
+						//来源库位赋默认值
+						if (fromlocationCode == '') {
+							if (!l.scaned) {
+								fromlocationCode = l.fromLocationCode;
+							}
+						}
+					})
+				}
+				this.$refs.scanPopup.openScanPopupForJob(fromlocationCode, fromlocationList, this.jobContent);
+			},
+
+			closeScanPopup() {
+				this.$refs.scanPopup.closeScanPopup();
+			},
+
+			getScanResult(result) {
+				try {
+					var packingNumber = result.label.packingNumber;
+					var batch = result.label.batch;
+					var qty = result.label.qty;
+					var itemCode = result.label.itemCode;
+					var locationCode = result.fromLocationCode;
+
+					if (!result.balance) {
+						this.showMessage("箱码【" + packingNumber + "】没有库存余额")
+						return;
+					}
+
+					// var inventoryStatus = "OK";
+					var detail = this.detailSource.find(r => r.itemCode == itemCode);
+
+					if (detail == undefined) {
+						this.showErrorMessage("物料号【" + itemCode + "】不在列表中")
+					} else {
+						var itemDetail = detail.subList.find(r => {
+							return r.packingNumber == packingNumber &&
+								r.batch == batch &&
+								r.fromLocationCode == result.fromLocationCode
+						})
+
+						if (itemDetail == undefined) {
+							var isExit;
+							for (let subItem of detail.subList) {
+								var item;
+								for (let pack of subItem.packList) {
+									if (pack.packingNumber == packingNumber &&
+										pack.batch == batch) {
+										item = pack;
+										isExit = pack;
+										break;
+									}
+								}
+								if (item != undefined) {
+									subItem.scaned = true
+									subItem.handleQty = 0;
+									item = undefined
+								}
+							}
+							if (isExit == undefined) {
+								this.showErrorMessage("箱码【" + packingNumber + "】,批次【" + batch + "】库位【" + result
+									.fromLocationCode + "】不在列表中")
+							} else {
+								if (!isExit.cancleScanedHiht && isExit.scaned) {
+									this.showMessage("箱码【" + packingNumber + "】已经扫描")
+								} else {
+									isExit.scaned = true
+									let qty = 0;
+									if (result.balance != null) {
+										qty = Number(result.balance.qty);
+									} else {
+										qty = Number(result.label.qty);
+									}
+
+									isExit.handleQty = Number(result.label.qty);
+									isExit.toLocationCode = this.toLocationCode;
+								}
+							}
+							calcTreeHandleQty(this.detailSource);
+							this.continueScan()
+							this.$forceUpdate()
+						} else {
+							var scanedLength = 0;
+							itemDetail.packList.forEach(res => {
+								if (res.scaned) {
+									scanedLength++;
+								}
+							})
+
+							//大哥让加的
+							itemDetail.fromInventoryStatus = result.balance.inventoryStatus;
+
+							if (!itemDetail.cancleScanedHiht && itemDetail.scaned && scanedLength == itemDetail.packList
+								.length) {
+								this.showMessage("箱码【" + packingNumber + "】已经扫描")
+							} else {
+								itemDetail.scaned = true;
+								this.detailSource[0].subList.sort(compareAsc('scaned')); //按扫描信息排序
+								itemDetail.handleQty = result.label.qty;
+								// itemDetail.toInventoryStatus = "OK"
+								itemDetail.packList.forEach(pac => {
+									pac.scaned = true
+									pac.handleQty = Number(pac.qty);
+									pac.toLocationCode = this.toLocationCode;
+								})
+
+								calcTreeHandleQty(this.detailSource);
+								this.continueScan()
+								this.$forceUpdate()
+							}
+						}
+					}
+				} catch (e) {
+					this.showMessage(e.message)
+				}
+			},
+
+			scanLocationCode(location, code) {
+				this.toLocationCode = code
+				this.detailSource.forEach(item => {
+					item.subList.forEach(detail => {
+						detail.toLocationCode = code
+					})
+				})
+			},
+
+			openDetail(item) {
+				this.$refs.jobDetailPopup.openPopup(item)
+			},
+
+			checkLocation() {
+				var isPass = true;
+				if (this.toLocationCode == "" || this.toLocationCode == null) {
+					this.showMessageHint('请扫描收货库位', callback => {
+						this.$refs.comScanLocation.showLocation();
+					})
+
+					return isPass = false;
+				}
+				return isPass;
+			},
+
+			showMessageHint(hint, callback) {
+				this.$refs.comMessage.showErrorMessage(hint, res => {
+					if (res) {
+						callback()
+					}
+				});
+			},
+
+			commit() {
+				this.scanCount = getScanCount(this.subList);
+				if (this.scanCount == 0) {
+					this.showErrorMessage("扫描数为0,请先扫描")
+					return;
+				}
+				if (!this.checkLocation()) {
+					return
+				}
+
+				//扫描数量和任务数量相等，直接提交
+				if (this.scanCount == this.subList.length) {
+					this.submitJob();
+				} else if (this.scanCount < this.subList.length) {
+					//扫描数量小于任务数量，判断是否允许部分提交
+					if (this.jobContent.allowPartialComplete == "TRUE") {
+						//提交
+						this.$refs.comMessage.showQuestionMessage1("任务明细未全部完成,是否提交?", 'red', res => {
+							if (res) {
+								this.submitJob()
+							}
+						});
+					} else {
+						//不允许部分提交，提示
+						this.$refs.comMessage.showErrorMessage("任务明细未全部完成,不允许部分提交!", res => {
+								if (res) {
+									this.openScanPopup();
+								}
+							});
+					}
+				}
+			},
+
+			submitJob() {
+				uni.showLoading({
+					title: "提交中....",
+					mask: true
+				});
+
+				var itemCodes = []
+				this.detailSource.forEach(item => {
+					itemCodes.push(item.itemCode)
+				})
+
+				//获取管理模式，封装参数
+				getManagementPrecisions(itemCodes, this.toLocationCode, res => {
+					if (res.success) {
+						this.managementList = res.list;
+						var params = this.setParams()
+						console.log("提交参数", JSON.stringify(params));
+						putawayJobSubmit(params).then(res => {
+							uni.hideLoading()
+							if (res.data) {
+								this.showCommitSuccessMessage("提交成功\n生成采购上架记录\n" + res.data)
+							} else {
+								this.showErrorMessage("提交失败[" + res.msg + "]")
+							}
+						}).catch(error => {
+							uni.hideLoading()
+							this.showErrorMessage(error)
+						})
+					} else {
+						uni.hideLoading();
+						this.showErrorMessage(res.message);
+					}
+				});
+
+			},
+			setParams() {
+				var subList = []
+				var creator = this.$store.state.user.id
+				this.detailSource.forEach(item => {
+					item.subList.forEach(detail => {
+						if (detail.scaned) {
+							var info = getPackingNumberAndBatch(this.managementList, detail.itemCode,
+								detail.packingNumber, detail.batch);
+							detail.toPackingNumber = info.packingNumber;
+							detail.toBatch = info.batch;
+							detail.toContainerNumber = '';
+
+							detail.singlePrice = 1;
+							detail.amount = 11;
+
+							detail.arriveDate = getCurrDateTime();
+							detail.produceDate = getCurrDateTime();
+							detail.expireDate = getCurrDateTime();
+
+
+							let packList = detail.packList.filter(p => p.scaned == true);
+							detail.packList = packList;
+
+
+							// detail.singlePrice = detail.balance.singlePrice;
+							// detail.amount = detail.balance.singlePrice * detail.handleQty;
+
+							// detail.arriveDate = detail.balance.arriveDate;
+							// detail.produceDate = detail.balance.produceDate;
+							// detail.expireDate = detail.balance.expireDate;
+							subList.push(detail)
+						}
+					})
+				})
+
+				this.jobContent.subList = subList
+				this.jobContent.creator = creator;
+				return this.jobContent;
+			},
+
+
+			showMessage(message) {
+				setTimeout(r => {
+					this.scanPopupLoseFocus();
+					this.$refs.comMessage.showMessage(message, res => {
+						if (res) {
+							this.afterCloseMessage()
+						}
+					});
+				})
+			},
+
+			showErrorMessage(message) {
+				setTimeout(r => {
+					this.scanPopupLoseFocus();
+					this.$refs.comMessage.showErrorMessage(message, res => {
+						if (res) {
+							this.afterCloseMessage()
+						}
+					});
+				})
+			},
+
+			showQuestionMessage(message, callback) {
+				setTimeout(r => {
+					this.scanPopupLoseFocus();
+					this.$refs.comMessage.showQuestionMessage(message, res => {
+						if (res) {
+							callback(res);
+						}
+					});
+				})
+			},
+
+			scanPopupGetFocus() {
+				this.$refs.scanPopup.packGetFocus();
+			},
+
+			scanPopupLoseFocus() {
+				this.$refs.scanPopup.packLoseFocus();
+			},
+
+			afterCloseMessage() {
+				this.scanPopupGetFocus();
+			},
+
+
+			showCommitSuccessMessage(hint) {
+				this.$refs.comMessage.showSuccessMessage(hint, res => {
+					navigateBack(1)
+				})
+			},
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+
+</style>
\ No newline at end of file