From b775c4bf178158d92960660dd1a9dec185765c92 Mon Sep 17 00:00:00 2001 From: "zangch@mesnac.com" Date: Mon, 25 Aug 2025 17:08:53 +0800 Subject: [PATCH] =?UTF-8?q?refactor(wms):=20=E4=BC=98=E5=8C=96=E5=BA=93?= =?UTF-8?q?=E5=AD=98=E7=AE=A1=E7=90=86=E5=92=8C=E5=87=BA=E5=BA=93=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E5=A4=8D=E5=88=B6=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 修改生成批号逻辑，使用当前日期并替换连字符为短横线 - 在库存查询中添加物料编码字段 - 优化出库订单复制功能，增加客户选择和物料大类筛选 --- src/api/wms/inventory/types.ts | 12 +++++++ src/views/wms/instockOrderCopy/index.vue | 11 ++----- src/views/wms/inventory/index.vue | 2 ++ src/views/wms/outstockOrderCopy/index.vue | 39 +++++++++++++++-------- 4 files changed, 43 insertions(+), 21 deletions(-) diff --git a/src/api/wms/inventory/types.ts b/src/api/wms/inventory/types.ts index ddad62a..9266e14 100644 --- a/src/api/wms/inventory/types.ts +++ b/src/api/wms/inventory/types.ts @@ -46,6 +46,10 @@ export interface InventoryVO { */ storeId: string | number; + materialCode: string; + + materialName: string; + } export interface InventoryForm extends BaseEntity { @@ -96,6 +100,10 @@ export interface InventoryForm extends BaseEntity { */ storeId?: string | number; + materialCode?: string; + + materialName?: string; + } export interface InventoryQuery extends PageQuery { @@ -145,6 +153,10 @@ export interface InventoryQuery extends PageQuery { */ storeId?: string | number; + materialCode?: string; + + materialName?: string; + /** * 日期范围参数 */ diff --git a/src/views/wms/instockOrderCopy/index.vue b/src/views/wms/instockOrderCopy/index.vue index 860644b..d09b103 100644 --- a/src/views/wms/instockOrderCopy/index.vue +++ b/src/views/wms/instockOrderCopy/index.vue @@ -748,8 +748,7 @@ const submitForm = async() => { } } -/* // 生成batchCode基于配置 - childrenTableInfoForm.value.batchCode = generateBatchCode(childrenTableInfoForm.value)*/ + childrenTableInfoForm.value.batchCode = generateBatchCode(childrenTableInfoForm.value) await updateInstockDetail(childrenTableInfoForm.value) getChildrenTable({instockId: partntTableSelectCell.value.instockId}) childrenTableInfoVisible.value = false @@ -771,15 +770,14 @@ const saveBatchConfig = () => { const generateBatchCode = (form) => { if (!selectedComponents.value.length) return '' // 或默认生成 return selectedComponents.value.map(comp => { - if (comp === '当前时间') return new Date().toISOString().slice(0,10) + if (comp === '当前时间') return new Date().toISOString().slice(0,10).replace(/-/g, '') if (comp === '入库单号') return form.instockCode if (comp === '物料编码') return form.materialCode return '' - }).join('-') // 假设用-连接，可配置 + }).join('') } - let mategoryOptions = ref([]); const getMaterialCategorySelect = async () => { const res = await getBaseMaterialCategoryListInWMS(null); @@ -833,9 +831,6 @@ const handlePrint = async (row?: InstockDetailVO) => { const _instockDetailId = row?.instockDetailId || ids.value[0] const res = await getInstockDetail(_instockDetailId); Object.assign(childrenTableInfoForm.value, res.data); - - - } // 查询 const query = async () => { diff --git a/src/views/wms/inventory/index.vue b/src/views/wms/inventory/index.vue index 3746e53..d4c4599 100644 --- a/src/views/wms/inventory/index.vue +++ b/src/views/wms/inventory/index.vue @@ -229,6 +229,7 @@ const initFormData: InventoryForm = { materialId: undefined, locationCode: undefined, materialCategoryId: undefined, + materialCode: undefined, materialCategoryName: undefined,//字段映射 inventoryQty: undefined, lockState: undefined, @@ -248,6 +249,7 @@ const data = reactive>({ materialCategoryName: undefined,//字段映射 inventoryQty: undefined, lockState: undefined, + materialCode: undefined, inventoryStatus: undefined, storeId: undefined, params: { diff --git a/src/views/wms/outstockOrderCopy/index.vue b/src/views/wms/outstockOrderCopy/index.vue index dab1c32..9252f6f 100644 --- a/src/views/wms/outstockOrderCopy/index.vue +++ b/src/views/wms/outstockOrderCopy/index.vue @@ -75,7 +75,9 @@ - + + + + + + + + + + + + + + + + + + @@ -202,7 +215,7 @@ -