diff --git a/src/views/modules/recv/qualifiedStorage.vue b/src/views/modules/recv/qualifiedStorage.vue
index 87ec17b..5af7604 100644
--- a/src/views/modules/recv/qualifiedStorage.vue
+++ b/src/views/modules/recv/qualifiedStorage.vue
@@ -30,7 +30,7 @@
入库
+ style="margin-top: 10px;margin-left: 20px" size="small">入库
@@ -98,18 +98,6 @@
入库信息确认
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
- 回退
+ 回退
@@ -269,7 +261,7 @@ export default {
this.inboundData.inboundQty = item.qualifiedQty;
this.inboundData.targetLocationId = item.locationId; // 默认使用原库位
this.inboundData.inboundDate = this.getCurrentDate();
- this.inboundData.operatorName = 'current_user'; // 这里应该从用户信息中获取
+ this.inboundData.operatorName = this.$store.state.user.userDisplay; // 这里应该从用户信息中获取
this.processFlag = 2;
},
diff --git a/src/views/modules/recv/recv.vue b/src/views/modules/recv/recv.vue
index 2621f4b..ffbb11d 100644
--- a/src/views/modules/recv/recv.vue
+++ b/src/views/modules/recv/recv.vue
@@ -21,7 +21,7 @@
{{ poDetail.partNo }}
- {{ poDetail.lineNo }}/{{ poDetail.wdr }}
+ {{ poDetail.lineNo }}/{{ poDetail.wdr || '*' }}
@@ -72,8 +72,23 @@
style="font-size: 16px" size="small">包装记录
-
-
+
+
+
+
+
+
+
+
+
+
+
+
回退
@@ -127,6 +142,7 @@ export default {
handlingUnit: [],
hanlingItem: { code: '', qty: '', perQty: '', packageQty: '' },
site:localStorage.getItem('site'),
+ warehouseId:localStorage.getItem('selectedWarehouse'),
fullscreenLoading: false // 控制全屏loading
};
},
@@ -140,7 +156,7 @@ export default {
return `hu_${this.recvItem.poNumber}_${this.recvItem.lineNo}`;
},
displayLineWdr() {
- return `${this.recvItem.lineNo || ''}/${this.recvItem.wdr || ''}`;
+ return `${this.recvItem.lineNo || ''}/${this.recvItem.wdr || '*'}`;
}
},
methods: {
@@ -174,6 +190,9 @@ export default {
});
},
recvLine(row) {
+ /* if (row.receiveCaseDB!='INVDIR' && row.receiveCaseDB!='QAINV') {
+ return this.$message.warning("该采购订单行的收货方式为"+row.receiveCase+"，无法接收");
+ }*/
if (row.poStatus === 'Stopped' || row.poStatus === 'Closed' || row.poStatus === 'Cancelled' || row.poStatus === 'Planned') {
return this.$message.warning("该采购订单状态为"+row.poStatus+"，无法接收");
}
@@ -184,10 +203,24 @@ export default {
...row,
poNo: row.poNumber || this.scanCode,
dueinQty: row.qtyToReceive || row.invQtyToReceive,
- transQty: row.invQtyToReceive || 0
+ transQty: row.invQtyToReceive || 0,
+ batchNo: row.partNo+'-'+row.lineNo+'-'+row.releaseNo+'-'+1,
+ deliveryDate: row.plannedDeliveryDate || '',
+ arrivalDate: this.getCurrentDate(),
+ supplierBatchNo: '',
};
this.processFlag = 2;
},
+ // 获取当前日期
+ getCurrentDate() {
+ const now = new Date();
+ return now.getFullYear() + '-' +
+ String(now.getMonth() + 1).padStart(2, '0') + '-' +
+ String(now.getDate()).padStart(2, '0') + ' ' +
+ String(now.getHours()).padStart(2, '0') + ':' +
+ String(now.getMinutes()).padStart(2, '0') + ':' +
+ String(now.getSeconds()).padStart(2, '0');
+ },
handlingUnitStep() {
this.processFlag = 3;
const saved = localStorage.getItem(this.huKey);
@@ -221,12 +254,17 @@ export default {
const receiveData = {
// 基本字段
site: this.site,
+ warehouseId: this.warehouseId,
partNo: item.partNo,
+ partDesc: item.description,
transQty: item.transQty,
batchNo: item.batchNo,
locationNo: item.locationNo,
itemNo: 1,
-
+ wdr: item.wdr || '*',
+ deliveryDate: item.deliveryDate,
+ arrivalDate: item.arrivalDate,
+ supplierBatchNo: item.supplierBatchNo,
// PO相关字段
poNo: item.poNumber || item.poNo,
orderNo: item.orderNo,
@@ -238,6 +276,7 @@ export default {
purchaseUOM: item.purchaseUOM,
receiveCase: item.receiveCase,
receiveCaseDB: item.receiveCaseDB,
+ inventoryPartDB: item.inventoryPartDB,
// 业务控制字段
needHandlingUnit: item.needHandlingUnit ,
needCheck: item.needCheck ,