提交代码

fe/PDA/api/index.js

@@ -253,9 +253,9 @@ export const getReceiptJobByNumber = (params) => request(
 
 //根据Asn Number 获取收货任务列表
 export const getReceiptJobByAsnNumber = (params) => request(
-	devUrl + "/api/pda/job/purchase-receipt/list/by-asn/asnNumber=" + params.number + "&isToday=" + params
-	.isToday, {
-		data: {},
+	devUrl + "/api/pda/job/purchase-receipt/list/by-asn"
+	, {
+		data: params,
 		method: "get"
 	});
 
@@ -664,7 +664,7 @@ export const finshIssueJob = (id, params) => request(
 	})
 //发货任务列表
 export const getDeliverList = (params) => request(
-	'devUrl' + "/api/pda/job/deliver/list", {
+	devUrl + "/api/pda/job/deliver/list", {
 		method: 'get',
 		data: params
 	});
@@ -1199,11 +1199,20 @@ export const semiPutaway = (params) => request(
 
 //
 export const getPurchaseDetailAsync = (itemCode, packingCode) => promise(
+	devUrl + "/api/pda/store/purchase-receipt-request/detail-by-item-and-packing?itemCode=" + itemCode + '&packingCode=' +
+	packingCode, { //
+		data: {},
+		method: "get"
+	});
+
+export const getPurchaseDetailAsync_old = (itemCode, packingCode) => promise(
 	devUrl + "/api/pda/store/purchase-receipt/detail-by-item-and-packing?itemCode=" + itemCode + '&packingCode=' +
 	packingCode, { //
 		data: {},
 		method: "get"
 	});
+	
+	
 
 export const getFileByCode = (fileCode) => request(
 	devUrl + "/api/pda/file/filestore/by-code/" + fileCode, { //

fe/PDA/pages/inventory/scrap.vue

@@ -197,6 +197,7 @@
 			selectedBalanceItem(balanceItem) {
 				let item = this.createItem(balanceItem);
 				this.itemList.unshift(item)
+				this.getLocationInfo();
 			},
 
 			createItem(item) {

fe/PDA/pages/note.js

@@ -20,5 +20,5 @@
 Mes缴库: Mes缴库, 从线边到成品库或者半成品库
 采购收货
 待检 = 1,
-	合格 = 2,
-	不合格 = 3
+合格 = 2,
+不合格 = 3

fe/PDA/pages/putaway/rapReceipt.vue

@@ -275,8 +275,6 @@
 				})
 				let item = {
 					worker: localStorage.userName,
-					company: localStorage.company,
-					warehouseCode: localStorage.warehouseCode,
 					// details: that.itemList
 				};
 				that.itemList.forEach(r => {

fe/PDA/pages/putaway/semiPutaway.vue

@@ -420,7 +420,35 @@
 							r.toLocationGroup = this.toLocation.locationGroupCode,
 							r.toStatus = i.status,
 							r.toWarehouseCode = i.balanceItem.warehouseCode,
-							r.worker = localStorage.userName,
+							// ========================================
+
+							// r.recommendContainerCode = "",
+							// r.recommendPackingCode = r.packingCode,
+							// r.recommendSupplierBatch = "",
+							// r.recommendArriveDate = r.arriveDate,
+							// r.recommendProduceDate = "",
+							// r.recommendExpireDate = "",
+							// r.recommendLot = "",
+							// r.recommendToLocationCode = "",
+							// r.recommendToLocationArea = "",
+							// r.recommendToLocationGroup = "",
+							// r.recommendToLocationErpCode = "",
+							// r.recommendToWarehouseCode = "",
+							// r.recommendQty ": 0,
+						 //    r.handledContainerCode = "",
+							// r.handledPackingCode = r.packingCode,
+							// r.handledSupplierBatch = "",
+							// r.handledArriveDate = r.arriveDate,
+							// r.handledProduceDate = "",
+							// r.handledExpireDate = "",
+							// r.handledLot = r.lot,
+							// r.handledToLocationCode = this.toLocation.code,
+							// r.handledToLocationArea = this.toLocation.areaCode,
+							// r.handledToLocationGroup = this.toLocation.locationGroupCode,
+							// r.handledToLocationErpCode = this.toLocation.erpLocationCode,
+							// r.handledToWarehouseCode = i.balanceItem.warehouseCode,
+							// r.handledQty = 0,
+
 							item.details.push(r);
 					})
 				})

fe/PDA/pages/return/productionReturn_detail.vue

@@ -23,7 +23,7 @@
 								</view>
 								<view class="ljh_right">
 									<text class="tnum">{{item.recommendQty}}</text>
-									<text class="tunit">{{item.recommendUom}}</text>
+									<text class="tunit">{{item.uom}}</text>
 								</view>
 							</view>
 						</view>
@@ -258,13 +258,13 @@
 				data.handledPackingCode = result.data.packingCode;
 				data.handledLot = result.data.lot;
 				data.handledQty = result.data.qty;
-				data.handledUom = result.data.uom ? '无' : result.data.uom;
+				data.uom = result.data.uom ? '无' : result.data.uom;
 				data.handledBatch = data.recommendBatch;
 
-				data.handledLocationCode = data.recommendLocationCode;
-				data.handledLocationArea = data.recommendLocationArea
-				data.handledLocationGroup = data.recommendLocationGroup
-				data.handledLocationErpCode = data.recommendLocationErpCode
+				data.handledToLocationCode = data.recommendLocationCode;
+				data.handledToLocationArea = data.recommendLocationArea
+				data.handledToLocationGroup = data.recommendLocationGroup
+				data.handledToLocationErpCode = data.recommendLocationErpCode
 
 				this.scanPopupGetFocus();
 			},

fe/PDA/pages/return/returnToWarehouse.vue

@@ -537,29 +537,33 @@
 						//===========================================
 						detail.recommendContainerCode = balanceItem.containerCode;
 						detail.recommendPackingCode = l.packingCode;
-						detail.recommendSupplierBatch = balanceItem.supplierBatch;;
+						detail.recommendSupplierBatch = balanceItem.supplierBatch;
 						detail.recommendArriveDate = balanceItem.arriveDate;
 						detail.recommendProduceDate = balanceItem.produceDate;
 						detail.recommendExpireDate = balanceItem.expireDate;
 						detail.recommendLot = l.lot;
-						detail.recommendToLocationCode = "";
-						detail.recommendToLocationArea = "";
-						detail.recommendToLocationGroup = "";
-						detail.recommendToLocationErpCode = "";
+						detail.recommendToLocationCode = l.toLocationCode ?? that.defaultToLocation.code;
+						detail.recommendToLocationArea = l.toLocationArea ?? that.defaultToLocation.areaCode;
+						detail.recommendToLocationGroup = l.toLocationGroup ?? that.defaultToLocation
+							.locationGroupCode;
+						detail.recommendToLocationErpCode =  l.toLocationErpCode ?? that.defaultToLocation
+							.erpLocationCode;
 						detail.recommendToWarehouseCode = balanceItem.warehouseCode;
 						detail.recommendQty = l.qty;
-						detail.handledContainerCode = "";
-						detail.handledPackingCode = "";
-						detail.handledSupplierBatch = "";
+						detail.handledContainerCode = balanceItem.containerCode;
+						detail.handledPackingCode = l.packingCode;
+						detail.handledSupplierBatch = balanceItem.supplierBatch;
 						detail.handledArriveDate = balanceItem.arriveDate;
 						detail.handledProduceDate = balanceItem.produceDate;
 						detail.handledExpireDate = balanceItem.expireDate;
-						detail.handledLot = "";
-						detail.handledToLocationCode = "";
-						detail.handledToLocationArea = "";
-						detail.handledToLocationGroup = "";
-						detail.handledToLocationErpCode = "";
-						detail.handledToWarehouseCode = "";
+						detail.handledLot =  l.lot;
+						detail.handledToLocationCode = l.toLocationCode ?? that.defaultToLocation.code;
+						detail.handledToLocationArea = l.toLocationArea ?? that.defaultToLocation.areaCode;
+						detail.handledToLocationGroup = l.toLocationGroup ?? that.defaultToLocation
+							.locationGroupCode;
+						detail.handledToLocationErpCode =  l.toLocationErpCode ?? that.defaultToLocation
+							.erpLocationCode;
+						detail.handledToWarehouseCode = balanceItem.warehouseCode;
 						detail.handledQty = l.qty;
 						item.details.push(detail);
 					});

fe/PDA/pages/store/deliverRaw.vue

@@ -162,6 +162,7 @@
 				let itemInfo = that.itemList.find(r => {
 					return r.itemCode == result.data.itemCode
 				})
+				
 				if (itemInfo == undefined) {
 					that.getBalance(result);
 				} else {
@@ -281,6 +282,7 @@
 				// item.produceDate = balanceItem.produceDate;
 				// item.expireDate = balanceItem.expireDate;
 				//================================================
+				label.status = balanceItem.status;
 				label.stdPackQty = balanceItem.stdPackQty;
 				label.fromPackingCode = balanceItem.packingCode;
 				label.toPackingCode = this.currentLabel.packingCode;

fe/PDA/pages/store/issueDirect.vue

@@ -310,39 +310,39 @@
 				// item.arriveDate = balanceItem.arriveDate;
 				// item.produceDate = balanceItem.produceDate;
 				// item.expireDate = balanceItem.expireDate;
-				
+
 				// ====================================
-				
-				
-			  label.recommendContainerCode=balanceItem.containerCode;
-			  label.recommendPackingCode=balanceItem.packingCode;
-			  label.recommendSupplierBatch=balanceItem.supplierBatch;;
-			  label.recommendArriveDate=balanceItem.arriveDate;
-			  label.recommendProduceDate=balanceItem.produceDate;
-			  label.recommendExpireDate= balanceItem.expireDate;
-		
-			  label.recommendLot= balanceItem.lot;;
-			  label.recommendFromLocationCode=balanceItem.locationCode;
-			  label.recommendFromLocationArea=balanceItem.locationArea;
-			  label.recommendFromLocationGroup=balanceItem.locationGroup;
-			  label.recommendFromLocationErpCode=balanceItem.locationErpCode;
-			  label.recommendFromWarehouseCode=localStorage.warehouseCode;;
-			  label.recommendQty= balanceItem.qty;
-			  label.handledContainerCode=balanceItem.containerCode;
-			  label.handledPackingCode=balanceItem.packingCode;;
-			  label.handledSupplierBatch= balanceItem.supplierBatch;
-			  label.handledArriveDate=balanceItem.arriveDate;
-			  label.handledProduceDate=balanceItem.produceDate;
-			  label.handledExpireDate=balanceItem.expireDate;
-			
-			  label.handledLot = balanceItem.lot;
-			  label.handledToLocationCode = balanceItem.locationCode;
-			  label.handledToLocationArea = balanceItem.locationArea;
-			  label.handledToLocationGroup =  balanceItem.locationGroup;
-			  label.handledToLocationErpCode = balanceItem.locationErpCode;
-			  label.handledToWarehouseCode = balanceItem.warehouseCode;
-			  label.handledQty = balanceItem.qty;
-			  item.labelList.unshift(label)
+
+
+			    label.recommendContainerCode = balanceItem.containerCode;
+				label.recommendPackingCode = balanceItem.packingCode;
+				label.recommendSupplierBatch = balanceItem.supplierBatch;;
+				label.recommendArriveDate = balanceItem.arriveDate;
+				label.recommendProduceDate = balanceItem.produceDate;
+				label.recommendExpireDate = balanceItem.expireDate;
+
+				label.recommendLot = balanceItem.lot;;
+				label.recommendFromLocationCode = balanceItem.locationCode;
+				label.recommendFromLocationArea = balanceItem.locationArea;
+				label.recommendFromLocationGroup = balanceItem.locationGroup;
+				label.recommendFromLocationErpCode = balanceItem.locationErpCode;
+				label.recommendFromWarehouseCode = localStorage.warehouseCode;;
+				label.recommendQty = balanceItem.qty;
+				label.handledContainerCode = balanceItem.containerCode;
+				label.handledPackingCode = balanceItem.packingCode;;
+				label.handledSupplierBatch = balanceItem.supplierBatch;
+				label.handledArriveDate = balanceItem.arriveDate;
+				label.handledProduceDate = balanceItem.produceDate;
+				label.handledExpireDate = balanceItem.expireDate;
+
+				label.handledLot = balanceItem.lot;
+				label.handledToLocationCode = balanceItem.locationCode;
+				label.handledToLocationArea = balanceItem.locationArea;
+				label.handledToLocationGroup = balanceItem.locationGroup;
+				label.handledToLocationErpCode = balanceItem.locationErpCode;
+				label.handledToWarehouseCode = balanceItem.warehouseCode;
+				label.handledQty = balanceItem.qty;
+				item.labelList.unshift(label)
 			},
 
 			calcScanCount(item) {

fe/PDA/pages/task/deliver_detail.vue

@@ -33,13 +33,13 @@
 									<uni-tr>
 										<uni-th width="50">数量</uni-th>
 										<uni-th width="120" align="center">
-											<view class="text_black">{{item.recommendQty}}({{item.recommendUom}})</text>
+											<view class="text_black">{{item.recommendQty}}({{item.uom}})</text>
 											</view>
 										</uni-th>
 										<!-- -->
 										<uni-th width="120" align="center">
 											<view v-if="item.scaned" class="text_black">
-												{{item.handledQty}}({{item.recommendUom}})
+												{{item.handledQty}}({{item.uom}})
 											</view>
 										</uni-th>
 									</uni-tr>
@@ -72,7 +72,7 @@
 											<view class="text_black">{{ item.recommendLocationCode }}</view>
 										</uni-th>
 										<uni-th width="120" align="center">
-											<view v-if="item.scaned" class="text_black">{{ item.handledLocationCode }}
+											<view v-if="item.scaned" class="text_black">{{ item.handledFromLocationCode }}
 											</view>
 										</uni-th>
 									</uni-tr>
@@ -272,8 +272,15 @@
 					item.handledPackingCode = that.balancesItem.packingCode;
 					item.handledBatch = that.balancesItem.batch;
 					item.handledLot = that.balancesItem.lot;
-					item.handledLocationCode = that.balancesItem.locationCode;
+					item.handledFromLocationArea = that.balancesItem.locationCode;
 					item.handledQty = that.balancesItem.qty;
+					
+					 // "toLocationCode": "string",
+					 //      "toLocationArea": "string",
+					 //      "toLocationGroup": "string",
+					 //      "toLocationErpCode": "string",
+					 //      "toWarehouseCode": "string",
+					 //      "onTheWayLocationCode": "string"
 					this.getScanCount();
 					this.closeScanPopup();
 					that.$forceUpdate();

fe/PDA/pages/task/issue_detail.vue

@@ -32,12 +32,12 @@
 									<uni-tr>
 										<uni-th width="50">数量</text></uni-th>
 										<uni-th width="120" align="center">
-											<text class="text_black">{{item.recommendQty}}({{item.recommendUom}})</text>
+											<text class="text_black">{{item.recommendQty}}({{item.uom}})</text>
 										</uni-th>
 										<uni-th width="120" align="center">
 											<view v-if="item.scaned">
 												<text
-													class="text_black">{{item.handledQty}}({{item.recommendUom}})</text>
+													class="text_black">{{item.handledQty}}({{item.uom}})</text>
 											</view>
 										</uni-th>
 									</uni-tr>
@@ -66,10 +66,10 @@
 									<uni-tr>
 										<uni-th width="60">库位</uni-th>
 										<uni-th width="100" align="center">
-											<view class="text_black">{{ item.recommendLocationCode }}</view>
+											<view class="text_black">{{ item.recommendFromLocationCode }}</view>
 										</uni-th>
 										<uni-th width="100" align="center">
-											<view class="text_black" v-if="item.scaned">{{ item.handledLocationCode }}
+											<view class="text_black" v-if="item.scaned">{{ item.handledFromLocationCode }}
 											</view>
 										</uni-th>
 									</uni-tr>
@@ -415,12 +415,15 @@
 				item.handledLot = balanceItem.lot;
 
 				item.handledQty = balanceItem.qty;
-				item.handledUom = balanceItem.uom;
 
-				item.handledLocationCode = balanceItem.locationCode;
-				item.handledLocationArea = balanceItem.locationArea;
-				item.handledLocationErpCode = balanceItem.locationErpCode;
-				item.handledLocationGroup = balanceItem.locationGroup;
+				item.handledFromLocationCode = balanceItem.locationCode;
+				item.handledFromLocationArea = balanceItem.locationArea;
+				item.handledFromLocationGroup = balanceItem.locationErpCode;
+				item.handledFromLocationErpCode = balanceItem.locationGroup;
+				
+				item.toLocationArea =balanceItem.locationArea;
+				item.toLocationGroup= balanceItem.locationGroup;
+				item.toLocationErpCode= balanceItem.locationErpCode;
 
 				//当前扫描标签的信息
 				item.scanItemCode = this.currentScanLebel.data.itemCode;
@@ -523,7 +526,6 @@
 					title: "提交中...",
 					mask: true
 				});
-				that.datacontent.company = localStorage.company;
 				that.datacontent.worker = localStorage.userName;
 				that.datacontent.details = that.details;
 				let params = JSON.stringify(that.datacontent);

fe/PDA/pages/task/receipt_detail.vue

@@ -233,9 +233,6 @@
 						res.details.sort(compareDesc('purchaseReceiptInspectStatus')); //按扫描信息排序
 						that.receiptJob = res;
 						callBack();
-						let params = JSON.stringify(that.receiptJob.details);
-						console.log("测试",params)
-						
 					})
 					.catch(err => {
 						this.showMessage(err.message);