From 37fb2d9bad16b6f49af4fefcb4bb6c2afd7c711c Mon Sep 17 00:00:00 2001
From: niexiting <85552560@qq.com>
Date: Wed, 13 Dec 2023 17:30:18 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=8F=91=E6=96=99?=
 =?UTF-8?q?=E5=92=8C=E8=A1=A5=E6=96=99=E7=9A=84=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/issue/job/issueDetail.vue             |  7 +++
 pages/repleinsh/coms/comScanReplishPack.vue | 60 +++++++++++----------
 pages/repleinsh/job/repleinshDetail.vue     | 24 ++++++---
 static/config.json                          |  2 +-
 4 files changed, 55 insertions(+), 38 deletions(-)

diff --git a/pages/issue/job/issueDetail.vue b/pages/issue/job/issueDetail.vue
index d24b55da..d58f7ad5 100644
--- a/pages/issue/job/issueDetail.vue
+++ b/pages/issue/job/issueDetail.vue
@@ -291,6 +291,13 @@
 									batch.Records.forEach(r => {
 										let record = {};
 										record.handleQty = r.qty;
+										
+										record.fromPackingNumber = r
+											.packingNumber;
+										record.fromBatch = r.batch;
+										record.fromContainerNumber = r
+											.ContainerNumber;
+										
 										record.toContainerNumber = r
 											.ContainerNumber;
 										record.toInventoryStatus = r
diff --git a/pages/repleinsh/coms/comScanReplishPack.vue b/pages/repleinsh/coms/comScanReplishPack.vue
index d441399f..95f1824c 100644
--- a/pages/repleinsh/coms/comScanReplishPack.vue
+++ b/pages/repleinsh/coms/comScanReplishPack.vue
@@ -7,7 +7,7 @@
 						扫描箱码
 						<text class="fr" @click="closeScanPopup()">关闭</text>
 					</view>
-				<!-- 	<view class="uni-flex uni-row" style="align-items: center;
+					<!-- 	<view class="uni-flex uni-row" style="align-items: center;
 						background-color: #fff; 
 						margin-left: 20rpx;
 						margin-right: 20rpx;
@@ -145,8 +145,8 @@
 				positionInfo: "请选择位置",
 				positionList: [],
 				defaultValueList: [],
-				label:{},
-				fromInventoryStatuses :"",
+				label: {},
+				fromInventoryStatuses: "",
 			}
 		},
 		created() {
@@ -179,13 +179,13 @@
 				let that = this;
 				that.fromLocationList = [];
 				if (that.dataContent != null) {
-					that.fromInventoryStatuses =this.jobContent.outInventoryStatuses
+					that.fromInventoryStatuses = this.jobContent.outInventoryStatuses
 					that.toLocation = that.dataContent[0];
 					that.toLocationCode = that.dataContent[0].toLocationCode;
 					that.fromLocationList = that.getFromLocationList();
 				}
 			},
-			
+
 			showBalanceSelect(items) {
 				this.$refs.balanceSelect.openPopup(items);
 			},
@@ -243,24 +243,25 @@
 							title: '加载中',
 							mask: true
 						})
-						getBalanceByManagementPrecision(result.label, that.fromLocationCode, that.fromInventoryStatuses, balanceRes => {
-							if (balanceRes.success) {
-								if (balanceRes.data.list.length == 0) {
-									this.showErrorMessage('在来源库位[' + this.fromLocationCode + '],未查找到该包装的库存记录',
-										res => {
-											this.packGetFocus();
-										})
-								} else if (balanceRes.data.list.length == 1) {
-									let balance = balanceRes.data.list[0];
-									this.afterGetBalance(result.label, balance,packageInfo);
+						getBalanceByManagementPrecision(result.label, that.fromLocationCode, that.fromInventoryStatuses,
+							balanceRes => {
+								if (balanceRes.success) {
+									if (balanceRes.data.list.length == 0) {
+										this.showErrorMessage('在来源库位[' + this.fromLocationCode + '],未查找到该包装的库存记录',
+											res => {
+												this.packGetFocus();
+											})
+									} else if (balanceRes.data.list.length == 1) {
+										let balance = balanceRes.data.list[0];
+										this.afterGetBalance(result.label, balance, packageInfo);
+									} else {
+										this.showBalanceSelect(balanceRes.data.list);
+									}
 								} else {
-									this.showBalanceSelect(balanceRes.data.list);
+									this.showErrorMessage(balanceRes.message.message);
 								}
-							} else {
-								this.showErrorMessage(balanceRes.message.message);
-							}
-							uni.hideLoading();
-						});
+								uni.hideLoading();
+							});
 					}
 				} catch (e) {
 					this.showErrorMessage(e.stack)
@@ -271,7 +272,7 @@
 				this.afterGetBalance(this.label, balance);
 			},
 
-			afterGetBalance(label, balance,packageInfo) {
+			afterGetBalance(label, balance, packageInfo) {
 				try {
 					let that = this;
 					let itemCode = label.itemCode;
@@ -292,11 +293,11 @@
 								if (batch.Recommends.length > 0) {
 									let recommend = batch.Recommends.find(r => r.packingNumber == packingCode);
 									if (recommend != undefined) {
-										that.addRecord(batch, label, balance,packageInfo)
+										that.addRecord(batch, label, balance, packageInfo)
 									} else {
 										//允许修改箱码
 										if (this.jobContent.allowModifyPackingNumber == 'TRUE') {
-											that.addRecord(batch, label, balance,packageInfo);
+											that.addRecord(batch, label, balance, packageInfo);
 										} else {
 											that.showErrorMessage('未查找到该箱码【' + packingCode + '】的明细',
 												res => {
@@ -306,7 +307,7 @@
 										}
 									}
 								} else {
-									that.addRecord(batch, label, balance,packageInfo)
+									that.addRecord(batch, label, balance, packageInfo)
 								}
 							} else {
 								that.showErrorMessage('箱码【' + packingCode + '】已经扫描,请继续扫描下一箱',
@@ -361,14 +362,15 @@
 				return batch;
 			},
 
-			creatRecord(label, balance,packageInfo) {
+			creatRecord(label, balance, packageInfo) {
 				balance.stdPackQty = packageInfo.stdPackQty
 				balance.stdPackUnit = packageInfo.stdPackUnit
 				let record = {
 					itemCode: label.itemCode,
 					packingNumber: label.packingNumber,
 					batch: label.batch,
-					qty: Number(label.qty)>Number(balance.qty)?Number(balance.qty):Number(label.qty),
+					qty: Number(balance.qty),
+					// qty: Number(label.qty)>Number(balance.qty)?Number(balance.qty):Number(label.qty),
 					uom: balance.uom,
 					inventoryStatus: balance.inventoryStatus,
 					balance: balance,
@@ -386,8 +388,8 @@
 				batch.handleQty = handleQty;
 			},
 
-			addRecord(batch, label, balance,packageInfo) {
-				let record = this.creatRecord(label, balance,packageInfo);
+			addRecord(batch, label, balance, packageInfo) {
+				let record = this.creatRecord(label, balance, packageInfo);
 				batch.Records.push(record);
 				this.issueRecord.unshift(record)
 				this.calcBatchHandleQty(batch);
diff --git a/pages/repleinsh/job/repleinshDetail.vue b/pages/repleinsh/job/repleinshDetail.vue
index 8093028c..08437cf9 100644
--- a/pages/repleinsh/job/repleinshDetail.vue
+++ b/pages/repleinsh/job/repleinshDetail.vue
@@ -12,12 +12,13 @@
 		<view class="page-main">
 			<scroll-view scroll-y="true" class="">
 				<view v-for="(toLocation, index) in detailSource">
-					<com-repleish-detail-card ref='comIssueDetailCard' :dataContent="toLocation" @updateData='updateData'>
+					<com-repleish-detail-card ref='comIssueDetailCard' :dataContent="toLocation"
+						@updateData='updateData'>
 					</com-repleish-detail-card>
 				</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%; ">
@@ -72,7 +73,7 @@
 	import comScanReplishPack from '@/pages/repleinsh/coms/comScanReplishPack.vue'
 	import comMessage from '@/mycomponents/common/comMessage.vue'
 	import jobTop from '@/mycomponents/job/jobTop.vue'
-	
+
 	export default {
 		name: 'issueDetail',
 		components: {
@@ -92,8 +93,8 @@
 				detailSource: [], //绑定在页面上的数据源
 				detailOptions: [],
 				scanOptions: [],
-				toLocationCode:'',
-				tolocationTypeList:[]
+				toLocationCode: '',
+				tolocationTypeList: []
 			};
 		},
 
@@ -237,7 +238,7 @@
 					if (res.data) {
 						this.showCommitSuccessMessage("提交成功<br>生成补料记录" + res.data)
 					} else {
-						this.showErrorMessage("提交失败[" + res.msg+"]")
+						this.showErrorMessage("提交失败[" + res.msg + "]")
 					}
 				}).catch(error => {
 					uni.hideLoading()
@@ -259,6 +260,13 @@
 									batch.Records.forEach(r => {
 										let record = {};
 										record.handleQty = r.qty;
+
+										record.fromPackingNumber = r
+											.packingNumber;
+										record.fromBatch = r.batch;
+										record.fromContainerNumber = r
+											.ContainerNumber;
+
 										record.toContainerNumber = r
 											.ContainerNumber;
 										record.toInventoryStatus = r
@@ -347,7 +355,7 @@
 						}
 					})
 				}
-				
+
 				// item.handleQty=itemHandleQty;
 			},
 
@@ -420,7 +428,7 @@
 			scanLocationCode(location, code) {
 				this.$refs.comMessage.showQuestionMessage("是否把所有的目标库位都变成默认库位[" + code + "]", res => {
 					this.toLocationCode = code
-					
+
 				})
 			},
 		}
diff --git a/static/config.json b/static/config.json
index 4a668deb..1c570702 100644
--- a/static/config.json
+++ b/static/config.json
@@ -18,7 +18,7 @@
 
 		"request_url": {
 			"name": "request_url",
-			"value": "http://192.168.0.106:12080/admin-api",
+			"value": "http://192.168.0.230:12080/admin-api",
 			"dev2": "http://192.168.0.157:12080/admin-api",
 			"chefang": "http://192.168.0.178:12080/admin-api",
 			"chenxinming": "http://192.168.0.230:12080/admin-api",

From 44ad7670226912941925680e0d9ea96fb8724f1f Mon Sep 17 00:00:00 2001
From: niexiting <85552560@qq.com>
Date: Wed, 13 Dec 2023 17:36:08 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A3=80=E9=AA=8C?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mycomponents/detail/comRequestDetailCard.vue  |  1 -
 mycomponents/scan/winScanPackAndLocation.vue  |  1 -
 .../deliver/request/deliverRequestCreate.vue  | 61 +++++++++----------
 pages/inspect/job/inspectFullDetail.vue       | 34 +++++------
 pages/issue/job/issueDetail.vue               |  1 -
 pages/issue/request/issueRequest.vue          |  8 ---
 6 files changed, 47 insertions(+), 59 deletions(-)

diff --git a/mycomponents/detail/comRequestDetailCard.vue b/mycomponents/detail/comRequestDetailCard.vue
index 4be275d2..96110434 100644
--- a/mycomponents/detail/comRequestDetailCard.vue
+++ b/mycomponents/detail/comRequestDetailCard.vue
@@ -75,7 +75,6 @@
 		watch: {
 			dataContent(newVal) {
 				var test =this.dataContent
-				debugger
 				this.requestItem = newVal.subList[0];
 			},
 		},
diff --git a/mycomponents/scan/winScanPackAndLocation.vue b/mycomponents/scan/winScanPackAndLocation.vue
index 62b61d78..e3ec3242 100644
--- a/mycomponents/scan/winScanPackAndLocation.vue
+++ b/mycomponents/scan/winScanPackAndLocation.vue
@@ -139,7 +139,6 @@
 				this.$refs.popup.open('bottom');  
 				this.fromInventoryStatuses = jobContent.outInventoryStatuses
 				this.inventoryStatus = getDirectoryItemArray(jobContent.outInventoryStatuses); //出库库存状态; //出库库存状态
-				debugger
 				this.fromLocationTypeArray = getDirectoryItemArray(jobContent.fromLocationTypes); //出库库存状态
 			},
 
diff --git a/pages/deliver/request/deliverRequestCreate.vue b/pages/deliver/request/deliverRequestCreate.vue
index 76134316..fb2d7209 100644
--- a/pages/deliver/request/deliverRequestCreate.vue
+++ b/pages/deliver/request/deliverRequestCreate.vue
@@ -64,7 +64,7 @@
 				detailOptions: [],
 				scanOptions: [],
 				fromType: "",
-				dataContent:{}
+				dataContent: {}
 
 			}
 		},
@@ -167,39 +167,38 @@
 
 
 			},
-			
-			setRequestParams(){
+
+			setRequestParams() {
 				var subList = []
 				this.detailSource.subList.forEach(detail => {
-					debugger
-							detail.soNumber = detail.package.soNumber;
-							detail.soLine = detail.package.soLine;
-							detail.remark =""
-							// soNumber: 926926926,
-							// soLine: 926,
-							// itemCode: THILDD0A691AG,
-							// remark: ,
-							// qty: 2,
-							// uom: EA
-							subList.push(detail)
+					detail.soNumber = detail.package.soNumber;
+					detail.soLine = detail.package.soLine;
+					detail.remark = ""
+					// soNumber: 926926926,
+					// soLine: 926,
+					// itemCode: THILDD0A691AG,
+					// remark: ,
+					// qty: 2,
+					// uom: EA
+					subList.push(detail)
 				})
-				
-					this.detailSource.subList = subList
-				    this.detailSource.deliverPlanNumber = "DP20231130-0001"
-					this.detailSource.customerCode = this.detailSource.customerCode
-					this.detailSource.customerDockCode = ""
-					this.detailSource.carrierCode = ""
-					this.detailSource.transferMode = ""
-					this.detailSource.vehiclePlateNumber = ""
-					this.detailSource.remark = ""
-					this.detailSource.dueTime = ""
-					this.detailSource.departmentCode = "研发部门"
-					this.detailSource.status = 1
-					this.detailSource.autoCommit = "FALSE"
-					this.detailSource.autoAgree = "FALSE"
-					this.detailSource.autoExecute = "FALSE"
-					this.detailSource.directCreateRecord = "FALSE"
-				
+
+				this.detailSource.subList = subList
+				this.detailSource.deliverPlanNumber = "DP20231130-0001"
+				this.detailSource.customerCode = this.detailSource.customerCode
+				this.detailSource.customerDockCode = ""
+				this.detailSource.carrierCode = ""
+				this.detailSource.transferMode = ""
+				this.detailSource.vehiclePlateNumber = ""
+				this.detailSource.remark = ""
+				this.detailSource.dueTime = ""
+				this.detailSource.departmentCode = "研发部门"
+				this.detailSource.status = 1
+				this.detailSource.autoCommit = "FALSE"
+				this.detailSource.autoAgree = "FALSE"
+				this.detailSource.autoExecute = "FALSE"
+				this.detailSource.directCreateRecord = "FALSE"
+
 				return this.detailSource;
 			},
 			showCommitSuccessMessage(hint) {
diff --git a/pages/inspect/job/inspectFullDetail.vue b/pages/inspect/job/inspectFullDetail.vue
index bdab4d99..12d6754b 100644
--- a/pages/inspect/job/inspectFullDetail.vue
+++ b/pages/inspect/job/inspectFullDetail.vue
@@ -330,23 +330,23 @@
 
 			commit() {
 				this.scanCount = getScanCount(this.subList);
-				if (this.scanCount == 0) {
-					this.showErrorMessage("扫描数为0,请先扫描")
-					return;
+				// if (this.scanCount == 0) {
+				// 	this.showErrorMessage("扫描数为0,请先扫描")
+				// 	return;
+				// }
+				//如果是全检，必须全部扫描-------改为:任务中的是否允许部分提交：nxt 2023年12月13日
+				if (this.jobContent.allowPartialComplete == "TRUE") {
+					this.submitJob();
+				} else {
+					//不允许部分提交，提示
+					this.$refs.comMessage.showErrorMessage('请完成扫描后,再进行提交<br>' + "已经扫描[" + this.scanCount +
+						"]箱总共[" + this
+						.subList.length + "]箱", res => {
+							if (res) {
+								this.openScanPopup();
+							}
+						});
 				}
-				//如果是全检，必须全部扫描
-					if (this.scanCount == this.subList.length) {
-						this.submitJob();
-					} else {
-						//不允许部分提交，提示
-						this.$refs.comMessage.showErrorMessage('请完成扫描后,再进行提交<br>' + "已经扫描[" + this.scanCount +
-							"]箱总共[" + this
-							.subList.length + "]箱", res => {
-								if (res) {
-									this.openScanPopup();
-								}
-							});
-					}
 			},
 
 			submitJob() {
@@ -455,7 +455,7 @@
 						list.push(detail)
 					})
 				})
-				this.jobContent.notPassedQty = Number(this.jobContent.failedQty)+ Number(this.jobContent.crackQty)
+				this.jobContent.notPassedQty = Number(this.jobContent.failedQty) + Number(this.jobContent.crackQty)
 				this.jobContent.subList = list
 				this.jobContent.nextAction = "PARTIAL_OK";
 				return this.jobContent;
diff --git a/pages/issue/job/issueDetail.vue b/pages/issue/job/issueDetail.vue
index d58f7ad5..5860906e 100644
--- a/pages/issue/job/issueDetail.vue
+++ b/pages/issue/job/issueDetail.vue
@@ -140,7 +140,6 @@
 		methods: {
 			resizeCollapse() {
 				this.$nextTick(r => {
-					// debugger;
 					this.$refs.comIssueDetailCard.forEach(r => {
 						r.resizeCollapse();
 					})
diff --git a/pages/issue/request/issueRequest.vue b/pages/issue/request/issueRequest.vue
index d562b237..c09f2418 100644
--- a/pages/issue/request/issueRequest.vue
+++ b/pages/issue/request/issueRequest.vue
@@ -373,18 +373,10 @@
 		},
 		
 		requestConfirmsss(action, item) {
-			debugger;
 			uni.navigateTo({
 				url: './issueRequestDetail?type=add&item=' + item.id
 			});
 		}
-
-		// requestConfirm(action, item) {
-		// 	debugger;
-		// 	uni.navigateTo({
-		// 		url: './issueRequestDetail?type=add&item=' + item.id
-		// 	});
-		// }
 	}
 </script>