diff --git a/src/api/production/production-inbound.js b/src/api/production/production-inbound.js index 133f274..7f63157 100644 --- a/src/api/production/production-inbound.js +++ b/src/api/production/production-inbound.js @@ -31,3 +31,14 @@ export const scanMaterialLabel = data => createAPI(`/production/inbound/scanMate export const getRequestMaterials = data => createAPI(`/production/inbound/getRequestMaterials`,'post',data) // 确认生产入库 export const confirmProductionInbound = data => createAPI(`/production/inbound/confirmProductionInbound`,'post',data) + +// 根据工单号从IFS获取工单信息 +export const getShopOrderFromIfs = data => createAPI(`/production/inbound/getShopOrderFromIfs`,'post',data) +// 获取下一个序号 +export const getNextSequenceNo = data => createAPI(`/production/inbound/getNextSequenceNo`,'post',data) +// 提交生产订单入库 +export const submitShopOrderInbound = data => createAPI(`/production/inbound/submitShopOrderInbound`,'post',data) +// 验证物料是否已发料 +export const validateMaterialIssued = data => createAPI(`/production/inbound/validateMaterialIssued`,'post',data) +// 打印标签 +export const printLabel = data => createAPI('/label/setting/printLabel','post',data) diff --git a/src/router/index.js b/src/router/index.js index d6434db..6dc3128 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -65,10 +65,7 @@ const globalRoutes = [ meta: { transition: 'instant' ,preload: true,keepAlive: true}}, // 生产入库 {path: "/productionInboundProduction",name: "productionInboundProduction", component: resolve => require(["@/views/modules/production-inbound/production.vue"], resolve), meta: { transition: 'instant' ,preload: true,keepAlive: true}}, - {path: "/productionPick",name: "productionPick", component: resolve => require(["@/views/modules/production-inbound/productionPick.vue"], resolve), meta: { transition: 'instant' ,preload: true,keepAlive: true}}, - {path: "/productionInboundDetail/:inboundNo",name: "productionInboundDetail", component: resolve => require(["@/views/modules/production-inbound/productionPickingDetail.vue"], resolve), meta: { transition: 'instant' ,preload: true,keepAlive: true}}, - {path: "/inboundRegister",name: "inboundRegister", component: resolve => require(["@/views/modules/production-inbound/inboundRegister.vue"], resolve), meta: { transition: 'instant' ,preload: true,keepAlive: true}}, - {path: "/inboundRegisterDetail/:inboundNo",name: "inboundRegisterDetail", component: resolve => require(["@/views/modules/production-inbound/inboundRegisterDetail.vue"], resolve), meta: { transition: 'instant' ,preload: true,keepAlive: true}}, + {path: "/productionInboundRegister",name: "productionInboundRegister", component: resolve => require(["@/views/modules/production-inbound/inboundRegister.vue"], resolve), meta: { transition: 'instant' ,preload: true,keepAlive: true}}, // 委外发料 { path: "/outsource",name: "outsource", component: resolve => require(["@/views/modules/outsourcing-issue/index.vue"], resolve), meta: { transition: 'instant' ,preload: true,keepAlive: true}}, diff --git a/src/views/main.vue b/src/views/main.vue index 96e269b..5cdc14e 100644 --- a/src/views/main.vue +++ b/src/views/main.vue @@ -46,7 +46,7 @@
采购入库
-
+
diff --git a/src/views/modules/other-transaction/inventory-move.vue b/src/views/modules/other-transaction/inventory-move.vue index c88f0f2..f1bb12a 100644 --- a/src/views/modules/other-transaction/inventory-move.vue +++ b/src/views/modules/other-transaction/inventory-move.vue @@ -240,34 +240,13 @@ export default { return; } - /* // 校验HU是否在库 + // 校验HU是否在库 if (huInfo.inStockFlag !== 'Y') { this.$message.error('HandlingUnit不在库，无法移库'); return; - }*/ - - // 校验过期日期一致性 - if (this.scannedItems.length > 0) { - const firstItemExpiryDate = this.scannedItems[0].expiredDate; - const currentExpiryDate = huInfo.expiredDate; - - // 如果两个日期都存在且不相等，则不允许添加 - if (firstItemExpiryDate && currentExpiryDate) { - const firstDate = new Date(firstItemExpiryDate).toDateString(); - const currentDate = new Date(currentExpiryDate).toDateString(); - - if (firstDate !== currentDate) { - this.$message.error(`HandlingUnit的过期日期不一致，无法一起移库。已扫描的过期日期：${firstDate}，当前扫描的过期日期：${currentDate}`); - return; - } - } - // 如果一个有过期日期，另一个没有，也不允许 - else if (firstItemExpiryDate || currentExpiryDate) { - this.$message.error('HandlingUnit的过期日期不一致，部分有过期日期，部分没有，无法一起移库'); - return; - } } + // 添加到列表 this.scannedItems.push({ id: Date.now(), diff --git a/src/views/modules/production-inbound/inboundRegisterDetail.vue b/src/views/modules/production-inbound/inboundRegisterDetail.vue deleted file mode 100644 index db637b9..0000000 --- a/src/views/modules/production-inbound/inboundRegisterDetail.vue +++ /dev/null @@ -1,1027 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/views/modules/production-inbound/index.vue b/src/views/modules/production-inbound/index.vue deleted file mode 100644 index 1245b42..0000000 --- a/src/views/modules/production-inbound/index.vue +++ /dev/null @@ -1,166 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/views/modules/production-inbound/production.vue b/src/views/modules/production-inbound/production.vue index b43a7eb..9727377 100644 --- a/src/views/modules/production-inbound/production.vue +++ b/src/views/modules/production-inbound/production.vue @@ -33,17 +33,17 @@ export default { buttons: [ { icon: "passed", - label: "入库登记", + label: "生产入库", iconClass: "qualified", - to: "inboundRegister", + to: "/productionInboundRegister", disabled: false, }, { icon: "revoke", label: "生产退库", iconClass: "qualified", - to: "inboundRegister", - disabled: false, + to: "productionReturn", + disabled: true, }, ], }; diff --git a/src/views/modules/production-inbound/productionPick.vue b/src/views/modules/production-inbound/productionPick.vue deleted file mode 100644 index b960192..0000000 --- a/src/views/modules/production-inbound/productionPick.vue +++ /dev/null @@ -1,387 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/views/modules/production-inbound/productionPickingDetail.vue b/src/views/modules/production-inbound/productionPickingDetail.vue deleted file mode 100644 index e082559..0000000 --- a/src/views/modules/production-inbound/productionPickingDetail.vue +++ /dev/null @@ -1,987 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/views/modules/recv/recv.vue b/src/views/modules/recv/recv.vue index 0b97447..b7f4791 100644 --- a/src/views/modules/recv/recv.vue +++ b/src/views/modules/recv/recv.vue @@ -463,6 +463,10 @@ export default { this.fullscreenLoading = false; return this.$message.error("请填写完整信息"); } + if(item.qtyToReceive>item.qtyToReceive){ + this.fullscreenLoading = false; + return this.$message.error("接收数量不能大于待收数量"); + } // 提交前再次校验库位 try {