diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/AcceptMarkServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/AcceptMarkServiceImpl.java index 7fddf619..46ca3051 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/AcceptMarkServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/AcceptMarkServiceImpl.java @@ -93,7 +93,6 @@ public class AcceptMarkServiceImpl implements AcceptMarkService { String nickName = SecurityUtils.getNickName(); String now = DateUtil.now(); JwtUserDto currentUser = (JwtUserDto) SecurityUtils.getCurrentUser(); - Long deptId = currentUser.getDeptId(); WQLObject mstTab = WQLObject.getWQLObject("QL_TEST_AcceptMark"); WQLObject dtlTab = WQLObject.getWQLObject("QL_TEST_AcceptMarkBOM"); @@ -106,9 +105,9 @@ public class AcceptMarkServiceImpl implements AcceptMarkService { jsonMst.put("mark_id", IdUtil.getSnowflake(1, 1).nextId()); jsonMst.put("is_delete", "0"); jsonMst.put("remark", (String) whereJson.get("remark")); - JSONObject jonow = mstTab.query("is_delete='0' and mark_code='" + jsonMst.getString("mark_code") + "'").uniqueResult(0); + JSONObject jonow = mstTab.query("is_delete='0' and material_id='" + jsonMst.getString("material_id") + "'").uniqueResult(0); if (jonow != null) { - throw new BadRequestException("该牌号已存在！"); + throw new BadRequestException("该碳化钨已存在！"); } jsonMst.put("create_id", currentUserId); jsonMst.put("create_name", nickName); @@ -149,12 +148,12 @@ public class AcceptMarkServiceImpl implements AcceptMarkService { JSONObject jsonMst = new JSONObject(); whereJson.remove("tableData"); jsonMst = (JSONObject) JSON.toJSON(whereJson); - String mark_code = jsonMst.getString("mark_code"); + String material_id = jsonMst.getString("material_id"); String mark_id = jsonMst.getString("mark_id"); - JSONObject oldJO = mstTab.query("mark_id <> '" + mark_id + "' and mark_code='"+mark_code+"'").uniqueResult(0); + JSONObject oldJO = mstTab.query("mark_id <> '" + mark_id + "' and material_id='"+material_id+"'").uniqueResult(0); if(oldJO !=null){ - throw new BadRequestException("已存在相同牌号！"); + throw new BadRequestException("已存在相同碳化钨！"); } JSONObject now = mstTab.query("mark_id = '" + mark_id + "'").uniqueResult(0); //主表 diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/service/impl/StatisticalReportServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/service/impl/StatisticalReportServiceImpl.java index dad51080..b14ed506 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/service/impl/StatisticalReportServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/service/impl/StatisticalReportServiceImpl.java @@ -138,7 +138,7 @@ public class StatisticalReportServiceImpl implements StatisticalReportService { for (int i = 0; i < mater_rows.size(); i++) { JSONObject mater = mater_rows.getJSONObject(i); String material_id = mater.getString("material_id"); - //1、库存现存量：现有库存 - 开单领料重量 + //1、库存现存量：现有库存 JSONObject mater_ivt = WQL.getWO("statistical_report_query_01").addParam("flag", "4").addParam("material_id", material_id).process().uniqueResult(0); double now_ivt = 0; @@ -152,10 +152,10 @@ public class StatisticalReportServiceImpl implements StatisticalReportService { jo1.put(material_id, String.format("%.3f", now_ivt)); - double canuse_num = NumberUtil.sub(now_ivt - need_qty).doubleValue(); + double canuse_num = now_ivt; //已开单重量 jo22.put(material_id, String.format("%.3f", need_qty)); - //2、排产需求量(未开单的工令重量+排产未生成工令日计划重量)根据bom计算需要多少原料库存重量： + //2、排产需求量(未开工的工令重量+排产未生成工令日计划重量)根据bom计算需要多少原料库存重量： JSONObject nedd_mater = WQL.getWO("statistical_report_query_01").addParam("flag", "6").addParam("material_id", material_id).addParam("begin_time", begin_time).addParam("end_time", end_time).addParam("org_id", org_id).process().uniqueResult(0); double bom_qty = 0; if (ObjectUtil.isNotEmpty(nedd_mater)) { diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/wql/statistical_report_query_01.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/wql/statistical_report_query_01.wql index 56a7453c..da933e7d 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/wql/statistical_report_query_01.wql +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/wql/statistical_report_query_01.wql @@ -457,7 +457,7 @@ FROM pdm_bi_workorder wo WHERE - wo.`status` < 40 + wo.`status` < 50 AND is_delete = '0' OPTION 输入.begin_time <> "" wo.planstart_time >= 输入.begin_time @@ -611,7 +611,7 @@ FROM pdm_bi_workorder wo WHERE - wo.`status` < 40 + wo.`status` < 50 AND is_delete = '0' OPTION 输入.begin_time <> "" wo.planstart_time like 输入.begin_time @@ -682,7 +682,7 @@ LEFT JOIN md_me_materialbase mb ON mb.material_id = wo.material_id LEFT JOIN md_me_producmaterialext ext ON ext.material_id = wo.material_id WHERE - wo.`status` < 40 + wo.`status` < 50 AND wo.is_delete = '0' OPTION 输入.begin_time <> "" diff --git a/mes/qd/src/views/wms/basedata/em/devicebom/AddDialog.vue b/mes/qd/src/views/wms/basedata/em/devicebom/AddDialog.vue index 72500166..0606f356 100644 --- a/mes/qd/src/views/wms/basedata/em/devicebom/AddDialog.vue +++ b/mes/qd/src/views/wms/basedata/em/devicebom/AddDialog.vue @@ -215,13 +215,21 @@ export default { this.form.tableData = res }) }, - [CRUD.HOOK.afterToView]() { + [CRUD.HOOK.afterToView](crud, form) { const data = { 'device_bom_id': this.form.device_bom_id } crudDevicebom.getDtl(data).then(res => { this.form.tableData = res }) + if (!form.device_bom_code) { + this.queryClassId() + } else { + const data = {} + data.id = form.material_type_id + data.goal_id = this.classBj_id + this.getSubTypes(data) + } }, [CRUD.HOOK.afterToCU](crud, form) { if (!form.device_bom_code) { diff --git a/mes/qd/src/views/wms/pdm/produce/mouthtask/index.vue b/mes/qd/src/views/wms/pdm/produce/mouthtask/index.vue index ffb6c494..53ca6c73 100644 --- a/mes/qd/src/views/wms/pdm/produce/mouthtask/index.vue +++ b/mes/qd/src/views/wms/pdm/produce/mouthtask/index.vue @@ -165,8 +165,8 @@ - - + + @@ -268,9 +268,6 @@ export default { pcsn_num_format(row) { return Math.ceil(row.fact_weight / row.standard_weight) }, - pcsn_num_format2(row) { - return parseFloat(row.fact_weight / 1000.0).toFixed(3) - }, onInput() { this.$forceUpdate() }, diff --git a/mes/qd/src/views/wms/pdm/produce/producetask/index.vue b/mes/qd/src/views/wms/pdm/produce/producetask/index.vue index aa48dbae..3db7f047 100644 --- a/mes/qd/src/views/wms/pdm/produce/producetask/index.vue +++ b/mes/qd/src/views/wms/pdm/produce/producetask/index.vue @@ -176,14 +176,14 @@ - - + + - + diff --git a/mes/qd/src/views/wms/pf/acceptmark/index.vue b/mes/qd/src/views/wms/pf/acceptmark/index.vue index c3405ba2..1ac2bc7a 100644 --- a/mes/qd/src/views/wms/pf/acceptmark/index.vue +++ b/mes/qd/src/views/wms/pf/acceptmark/index.vue @@ -46,19 +46,19 @@ /> - + + + - - diff --git a/mes/qd/src/views/wms/sb/upkeep/devicemaintenancepa/StartDialog.vue b/mes/qd/src/views/wms/sb/upkeep/devicemaintenancepa/StartDialog.vue index 1fa6aaf9..03e92d58 100644 --- a/mes/qd/src/views/wms/sb/upkeep/devicemaintenancepa/StartDialog.vue +++ b/mes/qd/src/views/wms/sb/upkeep/devicemaintenancepa/StartDialog.vue @@ -1,6 +1,6 @@