From a54a089b68f0fbc27f3643544840876d9c27e099 Mon Sep 17 00:00:00 2001 From: mengjiao <3338049200@qq,com> Date: Wed, 11 Dec 2024 09:39:05 +0800 Subject: [PATCH 01/11] =?UTF-8?q?wms=E2=80=9C=E5=8C=85=E6=9D=90=E5=BA=93?= =?UTF-8?q?=E5=AD=98=E6=98=8E=E7=BB=86=E2=80=9D=E7=95=8C=E9=9D=A2=E8=A6=81?= =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=8C=E9=87=8D=E6=96=B0=E6=8E=92=E5=88=97?= =?UTF-8?q?=E8=8F=9C=E5=8D=95=E7=9A=84=E6=AC=A1=E5=BA=8F=E5=A6=82=E4=B8=8B?= =?UTF-8?q?=20=20=20=20=E9=80=81=E8=B4=A7=E6=97=B6=E9=97=B4=EF=BC=8C?= =?UTF-8?q?=E7=89=A9=E6=96=99=E5=8F=B7=EF=BC=8C=E7=89=A9=E6=96=99=E6=8F=8F?= =?UTF-8?q?=E8=BF=B0=EF=BC=8C=E9=80=81=E8=B4=A7=E5=8D=95=EF=BC=8C=E9=87=87?= =?UTF-8?q?=E8=B4=AD=E5=8D=95=EF=BC=8C=E6=89=B9=E6=AC=A1=EF=BC=8C=E5=85=A5?= =?UTF-8?q?=E5=BA=93=E6=95=B0=E9=87=8F=EF=BC=8C=E5=87=BA=E5=BA=93=E6=95=B0?= =?UTF-8?q?=E9=87=8F=EF=BC=8C=E5=89=A9=E4=BD=99=E6=95=B0=E9=87=8F(?= =?UTF-8?q?=E2=80=9C=E5=89=A9=E4=BD=99=E6=95=B0=E9=87=8F=E2=80=9D=E6=98=AF?= =?UTF-8?q?=E2=80=9C=E5=85=A5=E5=BA=93=E6=95=B0=E9=87=8F=E2=80=9D=E5=87=8F?= =?UTF-8?q?=E5=8E=BB=E2=80=9C=E5=87=BA=E5=BA=93=E6=95=B0=E9=87=8F=E2=80=9D?= =?UTF-8?q?=E5=BE=97=E5=87=BA)=EF=BC=8C=E7=8A=B6=E6=80=81=EF=BC=8C?= =?UTF-8?q?=E6=A0=87=E8=AF=86=E5=8D=A1=EF=BC=8C=E5=90=8E=E9=9D=A2=E8=8F=9C?= =?UTF-8?q?=E5=8D=95=E6=AC=A1=E5=BA=8F=E4=B8=8D=E5=8F=98=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wms/matetowsn/index.vue | 73 +++++++++---------------------- 1 file changed, 21 insertions(+), 52 deletions(-) diff --git a/src/views/wms/matetowsn/index.vue b/src/views/wms/matetowsn/index.vue index af51998..9e37643 100644 --- a/src/views/wms/matetowsn/index.vue +++ b/src/views/wms/matetowsn/index.vue @@ -43,15 +43,6 @@ @keyup.enter.native="handleQuery" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 搜索 重置 @@ -114,40 +84,44 @@ 删除 - - + - - - - - + + - + + + + + + + - + @@ -173,15 +147,8 @@ {{ parseTime(scope.row.gmtCreate, '{y}-{m}-{d}') }} - - - - - - - ({ mateOrderInSnId: id })); + console.log(postData) this.$modal.confirm('是否确认删除标识卡编号为"' + wlCode + '"的数据项？').then(function() { - return Removecard(); + return Removecard(postData); }).then(() => { this.editBatch(); this.$modal.msgSuccess("删除成功"); From 2c01c784db33203617798ae9e5abfdebb94f34f5 Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Wed, 11 Dec 2024 10:37:15 +0800 Subject: [PATCH 02/11] =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E6=A3=80=E9=AA=8C?= =?UTF-8?q?=E4=BA=8C=E6=AC=A1=E7=BC=96=E8=BE=91-=E5=9B=BE=E7=89=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/quality/checkTaskDefect.js | 4 +- src/api/quality/income.js | 14 +- .../quality/qcIncome/checkProjectType.vue | 279 ++++++++++++------ src/views/system/role/authUser.vue | 2 +- 4 files changed, 203 insertions(+), 96 deletions(-) diff --git a/src/api/quality/checkTaskDefect.js b/src/api/quality/checkTaskDefect.js index 562261d..45d5760 100644 --- a/src/api/quality/checkTaskDefect.js +++ b/src/api/quality/checkTaskDefect.js @@ -1,8 +1,8 @@ import request from '@/utils/request' -export function getDefectValue(belongToDetail) { +export function getDefectValue(belongToDetail,checkType) { return request({ - url: '/quality/qcCheckTaskDefect/getDefectValue/' + belongToDetail, + url: '/quality/qcCheckTaskDefect/getDefectValue/' + belongToDetail+'/'+checkType, method: 'get', }); } diff --git a/src/api/quality/income.js b/src/api/quality/income.js index ae04250..6b98800 100644 --- a/src/api/quality/income.js +++ b/src/api/quality/income.js @@ -150,9 +150,9 @@ export function commitCheckResult(data) { }) } -export function getDefectList(defectType) { +export function getDefectList(checkType) { const data = { - defectType + checkType } return request({ url: '/quality/qcIncome/getDefectList', @@ -243,4 +243,12 @@ export function getWarehouseList(query) { method: 'get', params: query }); -} \ No newline at end of file +} + +export function getClassInfoListByCheckType(query) { + return request({ + url: '/quality/defectClass/getClassInfoListByCheckType', + method: 'get', + params: query + }); +} diff --git a/src/views/quality/qcIncome/checkProjectType.vue b/src/views/quality/qcIncome/checkProjectType.vue index 7d14c46..672cea7 100644 --- a/src/views/quality/qcIncome/checkProjectType.vue +++ b/src/views/quality/qcIncome/checkProjectType.vue @@ -4,7 +4,7 @@ v-if="showFlag" :visible.sync="showFlag" :modal= false - width="1400px" + width="1300px" > @@ -51,26 +51,24 @@ - - - - - - - --> - - - - + --> + + + + + + + + @@ -79,9 +77,9 @@ - - - + + + diff --git a/src/views/system/role/authUser.vue b/src/views/system/role/authUser.vue index 147aa33..b066d37 100644 --- a/src/views/system/role/authUser.vue +++ b/src/views/system/role/authUser.vue @@ -151,7 +151,7 @@ export default { }, // 返回按钮 handleClose() { - const obj = { path: "/system/role" }; + const obj = { path: "/op/system/role" }; this.$tab.closeOpenPage(obj); }, /** 搜索按钮操作 */ From c3f86967c39a9b59583756c8eecadc2851dfb84c Mon Sep 17 00:00:00 2001 From: mengjiao <3338049200@qq,com> Date: Wed, 11 Dec 2024 11:35:16 +0800 Subject: [PATCH 03/11] =?UTF-8?q?wms=E2=80=9C=E5=85=A5=E5=BA=93=E6=95=B0?= =?UTF-8?q?=E9=87=8F=EF=BC=8C=E5=87=BA=E5=BA=93=E6=95=B0=E9=87=8F=EF=BC=8C?= =?UTF-8?q?=E5=89=A9=E4=BD=99=E6=95=B0=E9=87=8F=EF=BC=8C=E8=BF=99=E4=B8=89?= =?UTF-8?q?=E9=A1=B9=E8=8F=9C=E5=8D=95=E9=A1=B9=E7=9B=AE=E7=9A=84=E6=9C=80?= =?UTF-8?q?=E4=B8=8B=E9=9D=A2=E5=A2=9E=E5=8A=A0=E6=B1=87=E6=80=BB=E6=95=B0?= =?UTF-8?q?=E9=87=8F=EF=BC=8C=E5=88=86=E5=88=AB=E5=AE=83=E4=BB=AC=E5=90=84?= =?UTF-8?q?=E8=87=AA=E7=9A=84=E6=B1=87=E6=80=BB=E6=95=B0=E9=87=8F=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wms/matetowsn/index.vue | 35 ++++++++++++++++++++++++++++--- 1 file changed, 32 insertions(+), 3 deletions(-) diff --git a/src/views/wms/matetowsn/index.vue b/src/views/wms/matetowsn/index.vue index 9e37643..f6930d1 100644 --- a/src/views/wms/matetowsn/index.vue +++ b/src/views/wms/matetowsn/index.vue @@ -96,8 +96,12 @@ - - +
+ @@ -150,7 +154,7 @@ - +
sum + (row.amount || 0), 0); + // const totalOutNumber = data.reduce((sum, row) => sum + (row.outNumber || 0), 0); + // const totalRemaining = totalAmount - totalOutNumber; + // return [ + // { amount: totalAmount, outNumber: totalOutNumber, remaining: totalRemaining }, + // ]; + // }, + getSummary(param) { + const { columns, data } = param; + const totalAmount = data.reduce((sum, row) => sum + (row.amount || 0), 0); + const totalOutNumber = data.reduce((sum, row) => sum + (row.outNumber || 0), 0); + const totalRemaining = totalAmount - totalOutNumber; + const summary = columns.map((column, index) => { + if (index === 7) { // "计划数量"在第8列 + return totalAmount; + } else if (index === 8) { // "已入库数量"在第9列 + return totalOutNumber; + }else if (index === 9) { // "已入库数量"在第9列 + return totalRemaining; + } + return ''; // 其余列不汇总，返回空 + }); + return summary; + }, handlequeryform() { this.showMaterialDialog = true; // 显示领料单信息弹窗 this.fetchMaterials(); // 加载领料单数据 From 13a0f8df2b567a7ae10462c2fd1a101acdfc38f5 Mon Sep 17 00:00:00 2001 From: mengjiao <3338049200@qq,com> Date: Wed, 11 Dec 2024 15:19:49 +0800 Subject: [PATCH 04/11] =?UTF-8?q?wms=E2=80=9C=E6=88=90=E5=93=81=E7=94=9F?= =?UTF-8?q?=E4=BA=A7=E5=85=A5=E5=BA=93=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/wms/put.js | 7 +++++++ src/views/wms/put/index.vue | 13 ++++++++++++- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/src/api/wms/put.js b/src/api/wms/put.js index 2912fbf..407f645 100644 --- a/src/api/wms/put.js +++ b/src/api/wms/put.js @@ -9,6 +9,13 @@ export function listPut(query) { }); } +export function handleUpdateSAP102(data) { + return request({ + url: '/wms/odsRawOrderIn/handleUpdateSAP102', + method: 'post', + data: data + }); +} // 查询成品生产入库详细 export function getPut(id) { return request({ diff --git a/src/views/wms/put/index.vue b/src/views/wms/put/index.vue index cf35a88..bc0b998 100644 --- a/src/views/wms/put/index.vue +++ b/src/views/wms/put/index.vue @@ -257,6 +257,17 @@ v-hasPermi="['wms:put:edit']" >过账 + + 102冲销 + From 27382b2de1759c2443251e446cdc197c52178f3b Mon Sep 17 00:00:00 2001 From: mengjiao <3338049200@qq,com> Date: Fri, 13 Dec 2024 17:06:03 +0800 Subject: [PATCH 07/11] =?UTF-8?q?wms=E2=80=9C=E5=86=B2=E9=94=80bug?= =?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/wms/put/index.vue | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/src/views/wms/put/index.vue b/src/views/wms/put/index.vue index bc0b998..e039feb 100644 --- a/src/views/wms/put/index.vue +++ b/src/views/wms/put/index.vue @@ -675,6 +675,32 @@ export default { // 打开对话框 this.dialogVisible = true; }, + // handleUpdateSAP102(row) { + // // 确保 ids 是数组 + // const ids = row.id || this.ids; + // + // // 检查是否有可过账的记录 + // if (!this.ids || this.ids.length === 0) { + // this.$message.error("没有可过账的记录"); + // return; + // } + // + // // 打开对话框 + // this.dialogVisible = true; + // }, + handleUpdateSAP102(row) { + this.reset(); + //qualityStatus + const id = this.ids[0] + let postData = this.ids.map(id => ({ id: id })); + + this.$modal.confirm('是否进行过账').then(function() { + return handleUpdateSAP102(JSON.stringify(postData)); + }).then(() => { + this.getList(); + this.$modal.msgSuccess("过账完成"); + }).catch(() => {}); + }, confirmSelection() { if (!this.selectedType) { this.$message.error("请选择库存类型"); From 36d4505d270adc5cdebd0fe319e942d2a0f6f69b Mon Sep 17 00:00:00 2001 From: mengjiao <3338049200@qq,com> Date: Mon, 16 Dec 2024 13:48:32 +0800 Subject: [PATCH 08/11] =?UTF-8?q?wms=E9=A1=B5=E9=9D=A2=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E5=AD=97=E6=AE=B5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wms/outorderTS/index.vue | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/views/wms/outorderTS/index.vue b/src/views/wms/outorderTS/index.vue index e3a48bf..de2940e 100644 --- a/src/views/wms/outorderTS/index.vue +++ b/src/views/wms/outorderTS/index.vue @@ -72,8 +72,8 @@ 完成 - - + +