修改采购上架

fe/PDA/api/index.js

@@ -1342,6 +1342,12 @@ export const semiPutaway = (params) => request(
 		data: params,
 		method: "post"
 	});
+//通过箱码获取采购订单详细箱码
+export const getPurchaseDetailAsyncNew = (toPackingCode) => promise(
+	devUrl + "/api/pda/split-packing-rec/get-same-ponumber-list-by-topackingcode?toPackingCode=" + toPackingCode, { //
+		data: {},
+		method: "get"
+	});
 
 //
 export const getPurchaseDetailAsync = (itemCode, packingCode) => promise(
@@ -1620,7 +1626,7 @@ export const injectionRequestHandle = (id) => promise(
 
 //注塑发料申请 获取任务号
 export const getInjectionRequestJobByRequest = (requestNumber) => promise(
-	devUrl + "/api/pda/job/injection-request/by-request-number/"+requestNumber, {
+	devUrl + "/api/pda/job/injection-issue/by-request-number/"+requestNumber, {
 		method: 'post',
 		data: {}
 	})

fe/PDA/pages/container/containerCall.vue

@@ -218,8 +218,6 @@
 			},
 
 			submit() {
-				this.showCommitSuccess("提交成功");
-				return;
 				if (this.containerModelCode == "") {
 					this.showMessage("请选择器具规格")
 					return;
@@ -237,7 +235,7 @@
 				console.log(JSON.stringify(params))
 				containerRequest(params).then(res => {
 					uni.hideLoading();
-					this.showMessage("提交成功");
+					this.showCommitSuccess("提交成功");
 					this.clearData();
 				}).catch(err => {
 					uni.hideLoading();

fe/PDA/pages/putaway/purchasePutaway.vue

@@ -79,7 +79,8 @@
 		getBalancesByFilterAsync,
 		getPurchaseDetailAsync,
 		purchasePutaway,
-		getPurchasePutawayAsyncDetail
+		getPurchasePutawayAsyncDetail,
+		getPurchaseDetailAsyncNew
 	} from '@/api/index.js';
 
 	import {
@@ -241,9 +242,27 @@
 					that.showScanMessage('箱码【' + packingCode + '】在【待检库】未查询到库存状态为【合格】的库存信息');
 				} else if (balanceRes.totalCount === 1) {
 					let balanceItem = balanceRes.items[0];
+					//获取采购订单信息和原箱码
+					let infoList = await getPurchaseDetailAsyncNew(balanceItem
+						.packingCode)
+					if (infoList) {
+						var fromTopPackingCode=""
+						for (var i = 0; i < infoList.length; i++) {
+							if(infoList[i].fromPackingCode==balanceItem.packingCode){
+								fromTopPackingCode=infoList[i].fromTopPackingCode
+								break
+							}
+						}
+						
+						this.poNumber = infoList[0].purchaseInfo_PoNumber
+						this.showPopList=[]
+						infoList.forEach(res=>{
+							this.showPopList.push(res.fromTopPackingCode)
+						})
+					}
+
 					//根据零件号和箱码获取采购信息
-					let purchaseDetail = await getPurchaseDetailAsync(balanceItem.itemCode, balanceItem
+					let purchaseDetail = await getPurchaseDetailAsync(balanceItem.itemCode, fromTopPackingCode);
-						.packingCode);
 					if (purchaseDetail.error) {
 						that.showScanMessage(purchaseDetail.error.message);
 					} else {
@@ -260,14 +279,16 @@
 				let locationErpCode = purchaseDetail.recommendErpCode;
 				if (this.itemList.length == 0) {
 					this.recommendErpLocationCode = locationErpCode;
-					this.checkData(balanceItem, purchaseDetail)
+					// this.checkData(balanceItem, purchaseDetail)
+					this.createItem(balanceItem, purchaseDetail);
 				} else {
 					if (this.recommendErpLocationCode != locationErpCode) {
 						this.showScanMessage('当前零件的ERP储位是【' + locationErpCode + '】与【' + this
 							.recommendErpLocationCode +
 							'】不是同一ERP储位,请重新扫描');
 					} else {
-						this.checkData(balanceItem, purchaseDetail)
+						this.createItem(balanceItem, purchaseDetail);
+						// this.checkData(balanceItem, purchaseDetail)
 					}
 				}
 			},

fe/PDA/pages/task/assembleIssueJobDetail.vue

@@ -389,17 +389,17 @@
 								"]不一致,是否继续发料?",
 								res => {
 									if (res) {
-										this.setData(result,data)
+										this.setData(result,data,fromData)
 									}
 								})
 						})
 					}
 				} else {
-					this.setData(result,data)
+					this.setData(result,data,fromData)
 				}
 
 			},
-			setData(result,data) {
+			setData(result,data,fromData) {
 				this.getBalance(result, res => {
 					if (res.totalCount > 0) {
 						var balancesItem = res.items[0];
@@ -414,6 +414,7 @@
 							item.handledToLot = balancesItem.lot
 							item.handledToWarehouseCode = balancesItem.warehouseCode
 							item.handledToQty = balancesItem.qty
+							item.stdPackQty =balancesItem.stdPackQty
 							
 							item.handledFromContainerCode = balancesItem.containerCode
 							item.handledFromPackingCode = balancesItem.packingCode
@@ -438,6 +439,7 @@
 										item.handledToLot = balancesItem.lot
 										item.handledToWarehouseCode = balancesItem.warehouseCode
 										item.handledToQty = balancesItem.qty
+										item.stdPackQty =balancesItem.stdPackQty
 										
 										item.handledFromContainerCode = balancesItem.containerCode
 										item.handledFromPackingCode = balancesItem.packingCode

fe/PDA/pages/task/coatingIssuleJobDetail.vue

@@ -389,17 +389,17 @@
 								"]不一致,是否继续发料?",
 								res => {
 									if (res) {
-										this.setData(result,data)
+										this.setData(result,data,fromData)
 									}
 								})
 						})
 					}
 				} else {
-					this.setData(result,data)
+					this.setData(result,data,fromData)
 				}
 
 			},
-			setData(result,data) {
+			setData(result,data,fromData) {
 				this.getBalance(result, res => {
 					if (res.totalCount > 0) {
 						var balancesItem = res.items[0];
@@ -414,6 +414,7 @@
 							item.handledToLot = balancesItem.lot
 							item.handledToWarehouseCode = balancesItem.warehouseCode
 							item.handledToQty = balancesItem.qty
+							item.stdPackQty =balancesItem.stdPackQty
 							
 							item.handledFromContainerCode = balancesItem.containerCode
 							item.handledFromPackingCode = balancesItem.packingCode
@@ -438,6 +439,7 @@
 										item.handledToLot = balancesItem.lot
 										item.handledToWarehouseCode = balancesItem.warehouseCode
 										item.handledToQty = balancesItem.qty
+										item.stdPackQty =balancesItem.stdPackQty
 										
 										item.handledFromContainerCode = balancesItem.containerCode
 										item.handledFromPackingCode = balancesItem.packingCode

fe/PDA/pages/task/injectionIssueJobDetail.vue

@@ -389,18 +389,18 @@
 								"]不一致,是否继续发料?",
 								res => {
 									if (res) {
-										this.setData(result,data)
+										this.setData(result,data,fromData)
 									}
 								})
 						})
 					}
 				} else {
-					this.setData(result,data)
+					this.setData(result,data,fromData)
 				}
 
 			},
 			
-			setData(result,data) {
+			setData(result,data,fromData) {
 				this.getBalance(result, res => {
 					if (res.totalCount > 0) {
 						var balancesItem = res.items[0];
@@ -415,6 +415,7 @@
 							item.handledToLot = balancesItem.lot
 							item.handledToWarehouseCode = balancesItem.warehouseCode
 							item.handledToQty = balancesItem.qty
+							item.stdPackQty =balancesItem.stdPackQty
 			
 							item.handledFromContainerCode = balancesItem.containerCode
 							item.handledFromPackingCode = balancesItem.packingCode
@@ -439,7 +440,7 @@
 										item.handledToLot = balancesItem.lot
 										item.handledToWarehouseCode = balancesItem.warehouseCode
 										item.handledToQty = balancesItem.qty
-			
+										item.stdPackQty =balancesItem.stdPackQty
 										item.handledFromContainerCode = balancesItem.containerCode
 										item.handledFromPackingCode = balancesItem.packingCode
 										item.handledFromSupplierBatch = balancesItem.supplierBatch
@@ -567,7 +568,7 @@
 					mask: true
 				});
 				let params = that.details[0];
-				// console.log("提交",JSON.stringify(params))
+				console.log("提交",JSON.stringify(params))
 				finshInjectionIssueJob(that.id, params.id, params)
 					.then(res => {
 						uni.hideLoading();

fe/PDA/pages/task/kittingIssueJobDetail.vue

@@ -389,18 +389,18 @@
 								"]不一致,是否继续发料?",
 								res => {
 									if (res) {
-										this.setData(result,data)
+										this.setData(result,data,fromData)
 									}
 								})
-						})
+						},100)
 					}
 				} else {
-					this.setData(result,data)
+					this.setData(result,data,fromData)
 				}
 
 			},
 
-			setData(result,data) {
+			setData(result,data,fromData) {
 				this.getBalance(result, res => {
 					if (res.totalCount > 0) {
 						var balancesItem = res.items[0];
@@ -415,6 +415,7 @@
 							item.handledToLot = balancesItem.lot
 							item.handledToWarehouseCode = balancesItem.warehouseCode
 							item.handledToQty = balancesItem.qty
+							item.stdPackQty =balancesItem.stdPackQty
 							
 							item.handledFromContainerCode = balancesItem.containerCode
 							item.handledFromPackingCode = balancesItem.packingCode
@@ -439,6 +440,7 @@
 										item.handledToLot = balancesItem.lot
 										item.handledToWarehouseCode = balancesItem.warehouseCode
 										item.handledToQty = balancesItem.qty
+										item.stdPackQty =balancesItem.stdPackQty
 										
 										item.handledFromContainerCode = balancesItem.containerCode
 										item.handledFromPackingCode = balancesItem.packingCode

fe/PDA/pages/task/sparePartIssueJobDetail.vue

@@ -389,18 +389,18 @@
 								"]不一致,是否继续发料?",
 								res => {
 									if (res) {
-										this.setData(result,data)
+										this.setData(result,data,fromData)
 									}
 								})
 						})
 					}
 				} else {
-					this.setData(result,data)
+					this.setData(result,data,fromData)
 				}
 
 			},
 			
-			setData(result,data) {
+			setData(result,data,fromData) {
 				this.getBalance(result, res => {
 					if (res.totalCount > 0) {
 						var balancesItem = res.items[0];
@@ -415,6 +415,7 @@
 							item.handledToLot = balancesItem.lot
 							item.handledToWarehouseCode = balancesItem.warehouseCode
 							item.handledToQty = balancesItem.qty
+							item.stdPackQty =balancesItem.stdPackQty
 							
 							item.handledFromContainerCode = balancesItem.containerCode
 							item.handledFromPackingCode = balancesItem.packingCode
@@ -439,6 +440,7 @@
 										item.handledToLot = balancesItem.lot
 										item.handledToWarehouseCode = balancesItem.warehouseCode
 										item.handledToQty = balancesItem.qty
+										item.stdPackQty =balancesItem.stdPackQty
 										
 										item.handledFromContainerCode = balancesItem.containerCode
 										item.handledFromPackingCode = balancesItem.packingCode