From fc27855f674afe4d361f73055301951cb6e13677 Mon Sep 17 00:00:00 2001 From: FCD <2453864257@qq.com> Date: Thu, 5 Feb 2026 11:09:14 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E4=BA=A7=E7=BA=BF?= =?UTF-8?q?=E7=9C=8B=E6=9D=BF=E3=80=81=E7=99=BD=E5=9D=AF=E7=9C=8B=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/kanban/Packagingline.js | 8 + src/api/kanban/quality.js | 9 + src/router/index.js | 5 + src/views/kanban/productLine/index.vue | 420 +++++++++++++++++++++++++ src/views/kanban/quality/kanban1.vue | 2 +- 5 files changed, 443 insertions(+), 1 deletion(-) create mode 100644 src/views/kanban/productLine/index.vue diff --git a/src/api/kanban/Packagingline.js b/src/api/kanban/Packagingline.js index cff605f..e0d0eed 100644 --- a/src/api/kanban/Packagingline.js +++ b/src/api/kanban/Packagingline.js @@ -47,3 +47,11 @@ export function getProductionNumberPLC(data){ data: data }); } + +export function getProductionLineData(data){ + return request({ + url: '/mes/mesborad/getProductionLineData', + method: 'get', + data: data + }); +} diff --git a/src/api/kanban/quality.js b/src/api/kanban/quality.js index 31f1038..af251f0 100644 --- a/src/api/kanban/quality.js +++ b/src/api/kanban/quality.js @@ -111,3 +111,12 @@ export function getKBTest() { method: 'post' }); } + +// 白坯每月不合格数量 +export function getBpMonthNoOk(data) { + return request({ + url: '/quality/qcInterface/getBpMonthNoOk', + method: 'get', + data: data + }); +} diff --git a/src/router/index.js b/src/router/index.js index b6d75de..6888b1c 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -156,6 +156,11 @@ export const constantRoutes = [ component: () => import("@/views/kanban/Dryingprocess/index"), hidden: true, }, + { + path: "/kanban/productLine", + component: () => import("@/views/kanban/productLine/index"), + hidden: true, + }, // { // path: "/report/board/LeadershipViewCheart", // component: () => import("@/views/energy/LeadershipView/LeadershipViewChearts"), diff --git a/src/views/kanban/productLine/index.vue b/src/views/kanban/productLine/index.vue new file mode 100644 index 0000000..0b81a26 --- /dev/null +++ b/src/views/kanban/productLine/index.vue @@ -0,0 +1,420 @@ + + + + + diff --git a/src/views/kanban/quality/kanban1.vue b/src/views/kanban/quality/kanban1.vue index 31150d8..8e48d58 100644 --- a/src/views/kanban/quality/kanban1.vue +++ b/src/views/kanban/quality/kanban1.vue @@ -601,7 +601,7 @@ export default { }; myChart3.setOption(option3); // console.log(_this.selectxt) - getProMonthNoOk({ + getBpMonthNoOk({ typeCode: "produce", factoryCode: "ds_" + _this.selectxt, }).then((response) => { From 25aaa8b4f38d5a46f8b49a6f105ab9665689f654 Mon Sep 17 00:00:00 2001 From: FCD <2453864257@qq.com> Date: Thu, 5 Feb 2026 11:11:50 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E5=A4=87=E4=BB=B6=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/device/sparePartsLedger/index.vue | 244 +++++++++++--------- 1 file changed, 134 insertions(+), 110 deletions(-) diff --git a/src/views/device/sparePartsLedger/index.vue b/src/views/device/sparePartsLedger/index.vue index 154da55..bad40cf 100644 --- a/src/views/device/sparePartsLedger/index.vue +++ b/src/views/device/sparePartsLedger/index.vue @@ -207,6 +207,12 @@ prop="materialDesc" width="120" /> + + + + + + + - - + @@ -524,6 +448,39 @@ /> + + + + + + + + + + + + + + + + + + + { + this.initCategoryList(); + }); + }, methods: { + dict, + validateWlCodeBlur(rule, value, callback){ + if (typeof value !== 'string') { + callback(new Error('请输入正确的库位编码')); + }else { + const reg = /^[a-zA-Z0-9]+$/; + if (reg.test(value)){ + callback(); + }else { + callback(new Error('请输入正确的库位编码')); + } + } + }, // 生成表头序号 indexMethod(index) { return index + 1; @@ -1172,6 +1159,43 @@ export default { `sparePartsLedger_template_${new Date().getTime()}.xlsx` ); }, + initCategoryList(){ + // 同时监听两个字典，任意一个变化都会触发回调 + this.$watch( + () => [ + this.dict.type.power_transmission_parts, + this.dict.type.hydraulic_components, + this.dict.type.pneumatic_components, + this.dict.type.electric_control, + this.dict.type.process_consumables, + this.dict.type.general_pipeline_parts, + this.dict.type.fastening_sealing_parts + ], + ([val1, val2, val3, val4, val5, val6, val7,]) => { + // 确保两个字典都已加载完成（非undefined） + if (val1 && val2 && val3 && val4 && val5 && val6 && val7) { + this.categoryList = [ + ...val1, + ...val2, + ...val3, + ...val4, + ...val5, + ...val6, + ...val7 + ] + } + }, + { immediate: true, deep: true } + ); + }, + changeType(res){ + if (!res){ + this.initCategoryList() + this.form.spareCategory = '' + }else { + this.categoryList = this.dict.type[res] + } + }, }, }; From 01fce620fa4215b8f65ab97d2e59d90a95665551 Mon Sep 17 00:00:00 2001 From: FCD <2453864257@qq.com> Date: Thu, 5 Feb 2026 11:12:16 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E6=89=8B=E5=8A=A8=E5=90=8C=E6=AD=A5?= =?UTF-8?q?=E7=89=A9=E6=96=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/wms/product.js | 8 ++++ src/views/wms/product/index.vue | 72 ++++++++++++++++++++++++++++++++- 2 files changed, 79 insertions(+), 1 deletion(-) diff --git a/src/api/wms/product.js b/src/api/wms/product.js index fb3c99b..94d6582 100644 --- a/src/api/wms/product.js +++ b/src/api/wms/product.js @@ -73,3 +73,11 @@ export function addProductAttached(data) { data: data }); } +// 手动同步物料 +export function syncProduct(data) { + return request({ + url: '/wms/product/sync', + method: 'post', + data: data + }); +} diff --git a/src/views/wms/product/index.vue b/src/views/wms/product/index.vue index 4037478..568b31e 100644 --- a/src/views/wms/product/index.vue +++ b/src/views/wms/product/index.vue @@ -130,6 +130,28 @@ >同步物料工艺 + + 同步单个物料信息 + + + + 同步所有物料信息 + + { + let inputValue = result.value; + if (inputValue.length < 18){ + inputValue = "0000000"+inputValue + } + syncProduct({ + matnr:inputValue, + werks:localStorage.getItem('USER_POOL_NAME_CURRENT').replace("ds_","") + }).then(res=>{ + if (res.code === 200){ + this.$message.success(`操作成功！`); + }else { + this.$message.error(`操作失败！`+res.msg); + } + }) + + }).catch(() => { + + }); + }, + handleSyncMultipleProduct(){ + this.$modal + .confirm( + '是否同步所有物料？' + ) + .then((res) => { + console.log(res) + if (res === "confirm"){ + syncProduct({ + werks:localStorage.getItem('USER_POOL_NAME_CURRENT').replace("ds_","") + }).then(()=>{ + this.$message.success(`操作成功！`); + }) + } + }) + .catch(() => {}); + } }, }; From 9fd1fa382585d097a1ae5ef3e4e3914c4c409e19 Mon Sep 17 00:00:00 2001 From: FCD <2453864257@qq.com> Date: Thu, 5 Feb 2026 15:37:15 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E5=A4=87=E4=BB=B6=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=85=B6=E4=BB=96=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/device/sparePartsLedger/index.vue | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/views/device/sparePartsLedger/index.vue b/src/views/device/sparePartsLedger/index.vue index bad40cf..d8f97eb 100644 --- a/src/views/device/sparePartsLedger/index.vue +++ b/src/views/device/sparePartsLedger/index.vue @@ -743,7 +743,7 @@ import dict from "@/utils/dict"; export default { name: "SparePartsLedger", - dicts: ['safety_stock', 'spare_part_type', 'fastening_sealing_parts','general_pipeline_parts','process_consumables','electric_control','pneumatic_components','hydraulic_components','power_transmission_parts'], + dicts: ['safety_stock', 'spare_part_type', 'fastening_sealing_parts','general_pipeline_parts','process_consumables','electric_control','pneumatic_components','hydraulic_components','power_transmission_parts', 'spare_part_type_other'], data() { return { // 导入数据 @@ -1169,11 +1169,12 @@ export default { this.dict.type.electric_control, this.dict.type.process_consumables, this.dict.type.general_pipeline_parts, - this.dict.type.fastening_sealing_parts + this.dict.type.fastening_sealing_parts, + this.dict.type.spare_part_type_other ], - ([val1, val2, val3, val4, val5, val6, val7,]) => { + ([val1, val2, val3, val4, val5, val6, val7, val8]) => { // 确保两个字典都已加载完成（非undefined） - if (val1 && val2 && val3 && val4 && val5 && val6 && val7) { + if (val1 && val2 && val3 && val4 && val5 && val6 && val7 && val8) { this.categoryList = [ ...val1, ...val2, @@ -1181,7 +1182,8 @@ export default { ...val4, ...val5, ...val6, - ...val7 + ...val7, + ...val8 ] } }, From ccba4ea5bfa76ea4eff28d854aed4401696f3554 Mon Sep 17 00:00:00 2001 From: FCD <2453864257@qq.com> Date: Fri, 6 Feb 2026 10:28:46 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E7=99=BD=E5=9D=AF=E7=9C=8B=E6=9D=BF?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/kanban/quality/kanban1.vue | 4 ++-- src/views/quality/sampleCheck/index.vue | 7 +++++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/views/kanban/quality/kanban1.vue b/src/views/kanban/quality/kanban1.vue index 8e48d58..be3828b 100644 --- a/src/views/kanban/quality/kanban1.vue +++ b/src/views/kanban/quality/kanban1.vue @@ -211,7 +211,7 @@
-
本年各月产品不合格数量对比
+
本年各月白坯不合格数量对比
+ + + Date: Fri, 6 Feb 2026 14:08:31 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E6=97=A0=E6=B3=95=E4=BF=AE=E6=94=B9=E8=AE=BE=E5=A4=87=E7=BC=96?= =?UTF-8?q?=E5=8F=B7bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wms/equipment/index.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/views/wms/equipment/index.vue b/src/views/wms/equipment/index.vue index ac294e9..07d72de 100644 --- a/src/views/wms/equipment/index.vue +++ b/src/views/wms/equipment/index.vue @@ -1694,6 +1694,7 @@ export default { } }); this.open = true; + this.canEdit = true this.title = "添加设备管理"; },