From 31fb7a7d0f91d03dbe14490278a3b481ebb27a0a Mon Sep 17 00:00:00 2001 From: zds <2388969634@qq.com> Date: Fri, 21 Oct 2022 11:13:18 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nl/pda/st/out/service/impl/HandPFOutIvtServiceImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/out/service/impl/HandPFOutIvtServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/out/service/impl/HandPFOutIvtServiceImpl.java index 5b7b35b4..49f6e69a 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/out/service/impl/HandPFOutIvtServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/out/service/impl/HandPFOutIvtServiceImpl.java @@ -465,7 +465,8 @@ public class HandPFOutIvtServiceImpl implements HandPFOutIvtService { } String area_type = pointObj.getString("area_type"); String bucketunique = jsonObject.get("bucketunique"); - String out_qty = NumberUtil.round(MapUtil.getStr(jsonObject,"out_qty"), 2).toString(); + //需出重量 + String out_qty = jsonObject.get("out_qty"); //根据桶查询物料批次信息 JSONObject bucketObj = WQLObject.getWQLObject("md_pb_bucketrecord").query("bucketunique='" + bucketunique + "'").uniqueResult(0); String material_id = bucketObj.getString("material_id"); From 5f4e1f6cc2a3e53ab41fc51ed9623f65198f1e25 Mon Sep 17 00:00:00 2001 From: liuxy Date: Fri, 21 Oct 2022 11:25:21 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/nl/wms/pf/service/impl/FormulaServiceImpl.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/FormulaServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/FormulaServiceImpl.java index 3ffcee91..bc040c54 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/FormulaServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/FormulaServiceImpl.java @@ -725,6 +725,7 @@ public class FormulaServiceImpl implements FormulaService { WQLObject paraTab = WQLObject.getWQLObject("PDM_BI_WorkProcedureParaProduct"); // 工艺参数表 WQLObject workTaskTab = WQLObject.getWQLObject("PDM_BI_WorkTask"); // 工令工序任务表 WQLObject classTab = WQLObject.getWQLObject("md_pb_classstandard"); // 分类表 + WQLObject deviceTab = WQLObject.getWQLObject("em_bi_deviceinfo"); // 设备表 JSONObject jsonMst = formMstTab.query("formula_id ='" + formula_id + "'").uniqueResult(0); String material_id = jsonMst.getString("material_id"); @@ -859,8 +860,9 @@ public class FormulaServiceImpl implements FormulaService { map2.put("flag", "5"); map2.put("product_series_id", jsonMst.getString("product_series_id")); map2.put("workprocedure_id", "1472449923327856640"); - JSONObject jsonDevice3= WQL.getWO("QPF_POINTCARD01").addParamMap(map2).process().uniqueResult(0); - if (ObjectUtil.isNotEmpty(jsonDevice3)) oneMap.put("device2",jsonDevice3.getString("device_name")); +// JSONObject jsonDevice3= WQL.getWO("QPF_POINTCARD01").addParamMap(map2).process().uniqueResult(0); + JSONObject jsonDevice = deviceTab.query("device_id = '" + jsonWork.getString("device_id") + "'").uniqueResult(0); + if (ObjectUtil.isNotEmpty(jsonDevice)) oneMap.put("device2",jsonDevice.getString("device_name")); // 球磨 From c418d0267b2c70e875e922e5cdbdb5a79f53c402 Mon Sep 17 00:00:00 2001 From: zds <2388969634@qq.com> Date: Fri, 21 Oct 2022 13:58:22 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/DailyplanServiceImpl.java | 60 +++++++++------ .../impl/ProducetaskprocServiceImpl.java | 77 ++++++++++++------- 2 files changed, 88 insertions(+), 49 deletions(-) diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/DailyplanServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/DailyplanServiceImpl.java index c6aba6f6..7f9488a8 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/DailyplanServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/DailyplanServiceImpl.java @@ -447,7 +447,7 @@ public class DailyplanServiceImpl implements DailyplanService { JSONObject jo_new = MPS_BD_ProductDailyPlan.query("dailyplan_id='"+jo.getString("dailyplan_id")+"' and status='01'").uniqueResult(0); if (jo_new!=null) { ja_new.add(jo); - MPS_BD_ProductDailyPlan.delete(jo); + MPS_BD_ProductDailyPlan.delete("dailyplan_id='"+jo.getString("dailyplan_id")+"' and status='01'"); } } @@ -523,7 +523,8 @@ public class DailyplanServiceImpl implements DailyplanService { Date planend_date = DateUtil.offsetDay(date,days-1); jo.put("planend_date",DateUtil.formatDate(planend_date)); - ja_new2.add(this.createDay(jo)); + JSONObject jo_now = this.createDay(jo); + ja_new2.add(jo_now); date = DateUtil.offsetDay(date,1); pcsn_num = pcsn_num - pcsn_num_day; @@ -537,7 +538,8 @@ public class DailyplanServiceImpl implements DailyplanService { Date planend_date = DateUtil.offsetDay(date,days-1); jo.put("planend_date",DateUtil.formatDate(planend_date)); - ja_new2.add(this.createDay(jo)); + JSONObject jo_now = this.createDay(jo); + ja_new2.add(jo_now); pcsn_num_day = pcsn_num_day - pcsn_num; if(pcsn_num_day <= 0){ @@ -559,7 +561,8 @@ public class DailyplanServiceImpl implements DailyplanService { Date planend_date = DateUtil.offsetDay(date,days-1); jo.put("planend_date",DateUtil.formatDate(planend_date)); - ja_new2.add(this.createDay(jo)); + JSONObject jo_now = this.createDay(jo); + ja_new2.add(jo_now); date = DateUtil.offsetDay(date,1); pcsn_num =pcsn_num - totalproducecapacity_qty; fact_weight = fact_weight - totalproducecapacity_qty*standard_weight; @@ -572,7 +575,8 @@ public class DailyplanServiceImpl implements DailyplanService { Date planend_date = DateUtil.offsetDay(date,days-1); jo.put("planend_date",DateUtil.formatDate(planend_date)); - ja_new2.add(this.createDay(jo)); + JSONObject jo_now = this.createDay(jo); + ja_new2.add(jo_now); pcsn_num_day = totalproducecapacity_qty - pcsn_num; if(pcsn_num_day <= 0){ date = DateUtil.offsetDay(date,1); @@ -584,17 +588,17 @@ public class DailyplanServiceImpl implements DailyplanService { } } - - //根据工作日和结束日期相同的天数进行更新开始日期 + //根据工作日和结束日期相同的天数进行更新开始日期dailyplan_id -> 1583321344530059264 ja_new = new JSONArray(); for (int i = 0; i < ja_new2.size(); i++) { JSONObject jo = ja_new2.getJSONObject(i); JSONObject jo_new = MPS_BD_ProductDailyPlan.query("dailyplan_id='"+jo.getString("dailyplan_id")+"' and status='01'").uniqueResult(0); if (jo_new!=null) { ja_new.add(jo); - MPS_BD_ProductDailyPlan.delete(jo); + MPS_BD_ProductDailyPlan.delete("dailyplan_id='"+jo.getString("dailyplan_id")+"' and status='01'"); } } + HashMap map = new HashMap(); for(int i=0;i Date: Fri, 21 Oct 2022 14:39:35 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/wms/pdm/produce/dailyplan/index.vue | 90 ++++++++++++++----- 1 file changed, 66 insertions(+), 24 deletions(-) diff --git a/mes/qd/src/views/wms/pdm/produce/dailyplan/index.vue b/mes/qd/src/views/wms/pdm/produce/dailyplan/index.vue index e92802e8..f3cd4cb0 100644 --- a/mes/qd/src/views/wms/pdm/produce/dailyplan/index.vue +++ b/mes/qd/src/views/wms/pdm/produce/dailyplan/index.vue @@ -145,33 +145,30 @@ > 生成工令 + + 上移 + + + 下移 + - - - - + + @@ -272,6 +270,7 @@ export default { XLList: [], fileList: [], checkrows: [], + now_row: null, form: {}, rules: { }} @@ -299,6 +298,7 @@ export default { }, methods: { [CRUD.HOOK.beforeRefresh]() { + this.now_row = null return true }, checkboxT(row) { @@ -399,6 +399,48 @@ export default { this.crud.loading = false }) }, + handleDtlCurrentChange(current) { + if (current !== null) { + this.now_row = current + } else { + this.now_row = null + } + }, + moveUp2() { + if (this.now_row === null) { + return this.crud.notify('请选中一条数据！') + } + const data = this.crud.data + for (let i = 0; i < data.length; i++) { + if (data[i].plan_code === this.now_row.plan_code) { + if (i > 0) { + const upDate = this.crud.data[i - 1] + this.crud.data.splice(i - 1, 1) + this.crud.data.splice(i, 0, upDate) + } else { + this.$message.error('已经是第一条，不可上移') + } + } + } + }, + moveDown2() { + if (this.now_row === null) { + return this.crud.notify('请选中一条数据！') + } + const data = this.crud.data + for (let i = 0; i < data.length; i++) { + if (data[i].plan_code === this.now_row.plan_code) { + if ((i + 1) === this.crud.data.length) { + this.$message.error('已经是最后一条，不可下移') + } else { + const downDate = this.crud.data[i + 1] + this.crud.data.splice(i + 1, 1) + this.crud.data.splice(i, 0, downDate) + break + } + } + } + }, querytable() { this.crud.toQuery() }