diff --git a/fe/PC/src/api/wms-api.js b/fe/PC/src/api/wms-api.js index eaf2bb796..79cfc27f8 100644 --- a/fe/PC/src/api/wms-api.js +++ b/fe/PC/src/api/wms-api.js @@ -417,6 +417,15 @@ export function notifyMessage(params, id) { // }) // } +// 库存列表 +export function inventoryBalanceList(data) { + return request({ + url: baseURL + 'wms/inventory/Inventory-Balance/list', + method: 'post', + data + }) +} + // 库存-启用 | 库存余额 改 export function inventoryBalanceActive(params) { return request({ diff --git a/fe/PC/src/api/wms-core.js b/fe/PC/src/api/wms-core.js index 40ad301dc..04dd36b43 100644 --- a/fe/PC/src/api/wms-core.js +++ b/fe/PC/src/api/wms-core.js @@ -35,4 +35,13 @@ export function postInventoryLabelCode_count(params,data) { method: 'post', data }) +} + +// 拆箱 | 标签管理-拆分箱标签 +export function postSplitPacking(data) { + return request({ + url: baseURL + 'wms/store/transfer-note/split-packing', + method: 'post', + data + }) } \ No newline at end of file diff --git a/fe/PC/src/mixins/printMixin.js b/fe/PC/src/mixins/printMixin.js index c3964a473..44e91ba35 100644 --- a/fe/PC/src/mixins/printMixin.js +++ b/fe/PC/src/mixins/printMixin.js @@ -42,7 +42,7 @@ export function initPrintPackingCodeData(propsData,options,name,url){ "packingCode": item[_options.packingCode] || item.packingCode,//条形码 "printIndex":item[_options.printIndex] || Number(key)+1,//打印序列 // "itemName": item[_options.itemName] || item.itemName,//物品名称 暂未使用 - // "stdPackQty": item[_options.stdPackQty] || item.stdPackQty,//整包数量 暂未使用 + "stdPackQty": item[_options.stdPackQty] || item.stdPackQty,//整包数量 暂未使用 } ], }) @@ -85,7 +85,8 @@ export function initPrintPackingCodeTwoData(oldData,newData,options,name,url){ "oldLot": oldData[_options.lot] || oldData.lot,//上方_生产批次 "oldLocationErpCode": oldData[_options.locationErpCode] || oldData.locationErpCode,//上方_储位 "oldItemCode": oldData[_options.itemCode] || oldData.itemCode,//上方_物品代码(ERP号) - "oldQty": oldData[_options.qty] || oldData.qty,//上方_要货数量 + 整包数量 + "oldQty": oldData[_options.qty] || oldData.qty,//上方_要货数量 + "oldStdPackQty": oldData[_options.stdPackQty] || oldData.stdPackQty,//上方_整包数量 "oldPackingCode": oldData[_options.packingCode] || oldData.packingCode,//上方_条形码 "oldPrintIndex":oldData[_options.printIndex] || 1,//上方_打印序列 ..._printData @@ -108,7 +109,8 @@ export function initPrintPackingCodeTwoData(oldData,newData,options,name,url){ "newLot": newData[_options.lot] || newData.lot,//下方_生产批次 "newLocationErpCode": newData[_options.locationErpCode] || newData.locationErpCode,//下方_储位 "newItemCode": newData[_options.itemCode] || newData.itemCode,//下方_物品代码(ERP号) - "newQty": newData[_options.qty] || newData.qty,//下方_要货数量 + 整包数量 + "newQty": newData[_options.qty] || newData.qty,//下方_数量 + 整包数量 + "newStdPackQty": newData[_options.stdPackQty] || newData.stdPackQty,//上方_整包数量 "newPackingCode": newData[_options.packingCode] || newData.packingCode,//下方_条形码 "newPrintIndex":newData[_options.printIndex] || 1,//下方_打印序列 ..._printData @@ -177,7 +179,7 @@ export function initPrintPackingCodeTwoData(oldData,newData,options,name,url){ _label['lot'+Number(key2 + 1)] = item[_options.lot] || item2.lot;//生产批次 _label['locationErpCode'+Number(key2 + 1)] = item[_options.locationErpCode] || item2.locationErpCode;//储位 _label['itemCode'+Number(key2 + 1)] = item[_options.itemCode] || item2.itemCode;//物品代码(ERP号) - // _label['stdPackQty'+Number(key2 + 1)] = item[_options.stdPackQty] || item2.stdPackQty;//整包数量 暂未使用 + _label['stdPackQty'+Number(key2 + 1)] = item[_options.stdPackQty] || item2.stdPackQty;//整包数量 暂未使用 _label['qty'+Number(key2 + 1)] = item[_options.qty] || item2.qty;//要货数量 + 整包数量 _label['packingCode'+Number(key2 + 1)] = item[_options.packingCode] || item2.packingCode;//条形码 _label['printIndex'+Number(key2 + 1)] = item[_options.printIndex] || item2.printIndex;//序号 diff --git a/fe/PC/src/router/index.js b/fe/PC/src/router/index.js index 1464badd1..9867553c3 100644 --- a/fe/PC/src/router/index.js +++ b/fe/PC/src/router/index.js @@ -135,21 +135,21 @@ export const constantRoutes = [ }] }, // 开发中模拟路由 - // { - // path: '/', - // component: Layout, - // redirect: '/splitLabels', - // hidden: true, - // children: [{ - // path: 'splitLabels', - // component: () => import('@/views/labelManage/PartiallyPreparedProducts/splitLabels.vue'), - // name: 'splitLabels', - // meta: { - // title: 'splitLabels', - // icon: '拆分箱标签', - // } - // }] - // }, + { + path: '/', + component: Layout, + redirect: '/splitLabels', + hidden: true, + children: [{ + path: 'splitLabels', + component: () => import('@/views/labelManage/PartiallyPreparedProducts/splitLabels.vue'), + name: 'splitLabels', + meta: { + title: 'splitLabels', + icon: '拆分箱标签', + } + }] + }, // { // path: '/', // component: Layout, diff --git a/fe/PC/src/views/labelManage/PartiallyPreparedProducts/splitLabels.vue b/fe/PC/src/views/labelManage/PartiallyPreparedProducts/splitLabels.vue index 413acf48d..49b76513e 100644 --- a/fe/PC/src/views/labelManage/PartiallyPreparedProducts/splitLabels.vue +++ b/fe/PC/src/views/labelManage/PartiallyPreparedProducts/splitLabels.vue @@ -57,9 +57,9 @@