半成品上架

fe/PDA/pages/putaway/semiPutaway.vue

@@ -205,7 +205,7 @@
 						})
 					})
 					if (datas.length > 0) {
-						this.showRescanMessage('箱码【' + code + '】已经存在,是否要重新扫描?');
+						this.showScanMessage('箱码【' + code + '】已经存在,是否要重新扫描?');
 						// showConfirmMsg('箱码【' + code + '】已经存在,是否要重新扫描?', confirm => {
 						// 	if (confirm) {
 						// 		that.itemList.forEach(l => {
@@ -390,16 +390,13 @@
 				});
 
 				let item = {
-					company: localStorage.company,
 					number: "",
 					worker: localStorage.userName,
-					warehouseCode: localStorage.warehouseCode,
+					jobNumber: "",
-					jobNumber: "validation errors",
 					putawayType: 2,
 
 					details: []
 				}
-
 				that.itemList.forEach(i => {
 					i.labelList.forEach(r => {
 						r.fromLot = '',
@@ -422,32 +419,32 @@
 							r.toWarehouseCode = i.balanceItem.warehouseCode,
 							// ========================================
 
-							// r.recommendContainerCode = "",
+							r.recommendContainerCode = i.balanceItem.containerCode,
-							// r.recommendPackingCode = r.packingCode,
+							r.recommendPackingCode = r.packingCode,
-							// r.recommendSupplierBatch = "",
+							r.recommendSupplierBatch = i.balanceItem.supplierBatch,
-							// r.recommendArriveDate = r.arriveDate,
+							r.recommendArriveDate = r.arriveDate,
-							// r.recommendProduceDate = "",
+							r.recommendProduceDate = i.balanceItem.produceDate,
-							// r.recommendExpireDate = "",
+							r.recommendExpireDate = i.balanceItem.expireDate;
-							// r.recommendLot = "",
+							r.recommendLot = r.lot,
-							// r.recommendToLocationCode = "",
+							r.recommendToLocationCode = this.toLocation.code,
-							// r.recommendToLocationArea = "",
+							r.recommendToLocationArea = this.toLocation.areaCode,
-							// r.recommendToLocationGroup = "",
+							r.recommendToLocationGroup = this.toLocation.locationGroupCode,
-							// r.recommendToLocationErpCode = "",
+							r.recommendToLocationErpCode = this.toLocation.erpLocationCode,
-							// r.recommendToWarehouseCode = "",
+							r.recommendToWarehouseCode = i.balanceItem.warehouseCode,
-							// r.recommendQty ": 0,
+							r.recommendQty = r.qty,
-						 //    r.handledContainerCode = "",
+						    r.handledContainerCode = i.balanceItem.containerCode,
-							// r.handledPackingCode = r.packingCode,
+							r.handledPackingCode = r.packingCode,
-							// r.handledSupplierBatch = "",
+							r.handledSupplierBatch = i.balanceItem.supplierBatch,
-							// r.handledArriveDate = r.arriveDate,
+							r.handledArriveDate = r.arriveDate,
-							// r.handledProduceDate = "",
+							r.handledProduceDate = i.balanceItem.produceDate,
-							// r.handledExpireDate = "",
+							r.handledExpireDate = i.balanceItem.expireDate;
-							// r.handledLot = r.lot,
+							r.handledLot = r.lot,
-							// r.handledToLocationCode = this.toLocation.code,
+							r.handledToLocationCode = this.toLocation.code,
-							// r.handledToLocationArea = this.toLocation.areaCode,
+							r.handledToLocationArea = this.toLocation.areaCode,
-							// r.handledToLocationGroup = this.toLocation.locationGroupCode,
+							r.handledToLocationGroup = this.toLocation.locationGroupCode,
-							// r.handledToLocationErpCode = this.toLocation.erpLocationCode,
+							r.handledToLocationErpCode = this.toLocation.erpLocationCode,
-							// r.handledToWarehouseCode = i.balanceItem.warehouseCode,
+							r.handledToWarehouseCode = i.balanceItem.warehouseCode,
-							// r.handledQty = 0,
+							r.handledQty = r.qty,
 
 							item.details.push(r);
 					})