From 2430faf0b9cc5efd41ad849f66a442296b28cd6a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=B8=85?= <3115919733@qq.com> Date: Wed, 21 May 2025 16:25:04 +0800 Subject: [PATCH 01/10] =?UTF-8?q?=E7=89=A9=E6=96=99=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=EF=BC=8C=E6=81=92=E6=B8=A9=E6=81=92=E6=B9=BF=E6=9D=A1=E4=BB=B6?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/basics/flatWarehouse/materialInfo/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/basics/flatWarehouse/materialInfo/index.vue b/src/views/basics/flatWarehouse/materialInfo/index.vue index 3e00238..4d32ca4 100644 --- a/src/views/basics/flatWarehouse/materialInfo/index.vue +++ b/src/views/basics/flatWarehouse/materialInfo/index.vue @@ -235,7 +235,7 @@ const state = reactive({ title: '新增用户', visible: false }, - TEMPList: [{ label: '全部', value: '' },{ label: '是', value: '01' }, { label: '否', value: '02' }] as any, + TEMPList: [{ label: '全部', value: '' },{ label: '是', value: '02' }, { label: '否', value: '否' }] as any, formData: { total: 0, SUPPLIERNO: '', From 0460c717b4208a4d480151c121cd812562d1baf3 Mon Sep 17 00:00:00 2001 From: 18110972313 <780768673@qq.com> Date: Wed, 21 May 2025 18:19:27 +0800 Subject: [PATCH 02/10] =?UTF-8?q?update=20=E5=88=B0=E8=B4=A7=E5=8D=95?= =?UTF-8?q?=EF=BC=8C=E7=82=B9=E5=87=BB=E5=85=A5=E5=BA=93=E6=8C=89=E9=92=AE?= =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E6=94=B9=E6=8F=90=E7=A4=BA=E6=B6=88=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/stockIn/deliveryStockIn/index.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/src/views/stockIn/deliveryStockIn/index.vue b/src/views/stockIn/deliveryStockIn/index.vue index 95f0a5a..91be5ed 100644 --- a/src/views/stockIn/deliveryStockIn/index.vue +++ b/src/views/stockIn/deliveryStockIn/index.vue @@ -728,7 +728,6 @@ async function sendToERP() { .then((res: any) => { console.log(res) if (res.success) { - ;(state.OpCode = ''), ElMessageBox.alert('入库成功', '提醒框', { confirmButtonText: 'OK' }) From 912e26abef67a00808865b7e8ab4f9e45f0508c8 Mon Sep 17 00:00:00 2001 From: 18110972313 <780768673@qq.com> Date: Wed, 21 May 2025 18:45:15 +0800 Subject: [PATCH 03/10] =?UTF-8?q?update=20=E5=88=B0=E8=B4=A7=E5=8D=95?= =?UTF-8?q?=EF=BC=8C=E5=BA=93=E4=BD=8D=E4=B8=8B=E6=8B=89=E6=A1=86=E9=80=89?= =?UTF-8?q?=E6=8B=A9=E6=8C=89=E7=85=A7=E5=BA=93=E4=BD=8D=E7=BC=96=E7=A0=81?= =?UTF-8?q?=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/stockIn/deliveryStockIn/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/stockIn/deliveryStockIn/index.vue b/src/views/stockIn/deliveryStockIn/index.vue index 91be5ed..92f9a38 100644 --- a/src/views/stockIn/deliveryStockIn/index.vue +++ b/src/views/stockIn/deliveryStockIn/index.vue @@ -846,7 +846,7 @@ function getStorageSpec(value: any) { function getERPLocation(erpfactory: any) { getQueryList({ queryId: 'GetERPLocationForCreatePO', - version: '00001', + version: '00002', params: { SITENAME: 'SDK', ERPFACTORYNAME: erpfactory //PO From 054a8b3df7b6f461e3224b390580ba8c3c16e5e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=B8=85?= <3115919733@qq.com> Date: Wed, 21 May 2025 19:30:50 +0800 Subject: [PATCH 04/10] =?UTF-8?q?=E5=87=BA=E5=85=A5=E5=BA=93=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/Query/StockQuery/Invoice/index.vue | 7 ++++--- src/views/Query/StockQuery/StockIn/index.vue | 12 ++++++------ 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/views/Query/StockQuery/Invoice/index.vue b/src/views/Query/StockQuery/Invoice/index.vue index e5dd8d8..7433f78 100644 --- a/src/views/Query/StockQuery/Invoice/index.vue +++ b/src/views/Query/StockQuery/Invoice/index.vue @@ -10,7 +10,7 @@ - + @@ -18,7 +18,7 @@ - + @@ -36,7 +36,7 @@ - + @@ -205,6 +205,7 @@ onMounted(() => { state.column = [ { header: "组织", field: "ERPFACTORY", hide: false, width: 70 }, + { header: "组织(CN)", field: "ORGNAME", hide: false, width: 80 }, { header: "发货单", field: "SHIPREQUESTNAME", hide: false, width: 120 }, { header: "单据类型", field: "SHIPREQUESTTYPE", hide: false, width: 100}, { header: "单据状态", field: "SHIPREQUESTSTATE", hide: false, width: 100 }, diff --git a/src/views/Query/StockQuery/StockIn/index.vue b/src/views/Query/StockQuery/StockIn/index.vue index 55d95c0..79e2462 100644 --- a/src/views/Query/StockQuery/StockIn/index.vue +++ b/src/views/Query/StockQuery/StockIn/index.vue @@ -9,7 +9,7 @@ - + @@ -17,7 +17,7 @@ - + @@ -30,7 +30,7 @@ - + @@ -66,10 +66,10 @@ - + - + @@ -203,7 +203,7 @@ onMounted(() => { state.column = [ { header: "组织", field: "ERPFACTORY", hide: false, width: 70 }, { header: "组织(CN)", field: "ORGNAME", hide: false, width: 80 }, - { header: "订单编号", field: "RECEIVEREQUESTNAME", hide: false, width: 100 }, + { header: "订单编号", field: "RECEIVEREQUESTNAME", hide: false, width: 130 }, { header: "料号", field: "MATERIALSPECNAME", hide: true }, { header: "品名", field: "DESC_CN", hide: true }, { header: "单据类型", field: "RECEIVEREQUESTTYPE", hide: false, width: 110 }, From b61a418d618cd3a7bbe9cd2f12922005891a2f2e Mon Sep 17 00:00:00 2001 From: 18110972313 <780768673@qq.com> Date: Wed, 21 May 2025 19:42:16 +0800 Subject: [PATCH 05/10] =?UTF-8?q?update=20=E5=88=B0=E8=B4=A7=E5=8D=95?= =?UTF-8?q?=EF=BC=8C=E6=96=B0=E5=A2=9E=E5=B7=B2=E6=8E=A5=E5=8F=97=E6=95=B0?= =?UTF-8?q?=E9=87=8F=E3=80=81=E5=B7=B2=E5=85=A5=E5=BA=93=E6=95=B0=E9=87=8F?= =?UTF-8?q?=E3=80=81=E6=9C=AC=E6=AC=A1=E5=88=9B=E5=BB=BA=E6=95=B0=E9=87=8F?= =?UTF-8?q?=E3=80=81=E5=89=A9=E4=BD=99=E6=95=B0=E9=87=8F=E7=9A=84=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E5=80=BC=E4=B8=BA0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/stockIn/deliveryStockIn/index.vue | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/views/stockIn/deliveryStockIn/index.vue b/src/views/stockIn/deliveryStockIn/index.vue index 92f9a38..ad36f0e 100644 --- a/src/views/stockIn/deliveryStockIn/index.vue +++ b/src/views/stockIn/deliveryStockIn/index.vue @@ -659,6 +659,16 @@ function handleQuery() { // 加载库位 if (res.resultObj.storeDetail && res.resultObj.storeDetail.length > 0) { getERPLocation(res.resultObj.storeDetail[0].ERPFACTORY) + // 处理 CREATEQTY 和 STOCKINQTY 为空的情况，设置默认值为 0 + res.resultObj.storeDetail = res.resultObj.storeDetail.map((item: any) => ({ + ...item, + CREATEQTY: item.CREATEQTY ?? 0, + STOCKINQTY: item.STOCKINQTY ?? 0, + MINUSQTY: item.MINUSQTY ?? 0, + REQUESTQUANTITY: item.REQUESTQUANTITY ?? 0, + RECEIVEDQUANTITY: item.RECEIVEDQUANTITY ?? 0, + RECEIVEDQUANTITY2: item.RECEIVEDQUANTITY2 ?? 0 + })); } state.MATERIALPACKINGLIST = res.resultObj.storeCharge state.MATERIALRECEIVEACT = res.resultObj.storeDetail From c50b2ee64626f1b0101bae7928d42053e7880b09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=B8=85?= <3115919733@qq.com> Date: Thu, 22 May 2025 10:29:32 +0800 Subject: [PATCH 06/10] =?UTF-8?q?=E6=89=B9=E6=AC=A1=E5=85=A5=E5=BA=93?= =?UTF-8?q?=E5=8E=BB=E6=8E=89=E5=B7=B2=E5=85=A5=E5=BA=93=E6=95=B0=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/basics/flatWarehouse/materialInfo/index.vue | 2 +- src/views/stockIn/StockInByCharge/index.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/basics/flatWarehouse/materialInfo/index.vue b/src/views/basics/flatWarehouse/materialInfo/index.vue index 4d32ca4..6d68ebd 100644 --- a/src/views/basics/flatWarehouse/materialInfo/index.vue +++ b/src/views/basics/flatWarehouse/materialInfo/index.vue @@ -70,7 +70,7 @@ v-loading="materialTableConfig.loading" :data="state.MaterialList" highlight-current-row - :height="tableHeight" + :height="250" row-key="id" @row-click="selectRow">