From 1918282cf5ec507f7b2c972952da75bfa973bf71 Mon Sep 17 00:00:00 2001 From: zds <2388969634@qq.com> Date: Fri, 18 Nov 2022 19:39:18 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/service/impl/GenCodeServiceImpl.java | 4 ++-- .../ql/service/impl/InspectionsheetmstServiceImpl.java | 3 --- .../nl/wms/ql/service/impl/PhysicalMstServiceImpl.java | 4 ++-- .../src/main/java/org/nl/wms/ql/wql/QL_ERP.wql | 2 +- mes/qd/src/views/wms/pf/formula/DivDialog.vue | 10 ++++++++-- mes/qd/src/views/wms/ql/physicalMstConfirm/index.vue | 4 ++-- 6 files changed, 15 insertions(+), 12 deletions(-) diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/modules/system/service/impl/GenCodeServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/modules/system/service/impl/GenCodeServiceImpl.java index 2cc3a18c..7085fbab 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/modules/system/service/impl/GenCodeServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/modules/system/service/impl/GenCodeServiceImpl.java @@ -99,7 +99,7 @@ public class GenCodeServiceImpl implements GenCodeService { //如果flag=1就执行更新数据库的操作 String flag = (String) form.get("flag"); WQLObject wo = WQLObject.getWQLObject("sys_code_rule_detail"); - JSONArray ja = wo.query("code_rule_id = '" + id + "' FOR UPDATE").getResultJSONArray(0); + JSONArray ja = wo.query("code_rule_id = '" + id + "'", " sort_num,type FOR UPDATE").getResultJSONArray(0); String demo = ""; boolean is_same = true; for (int i = 0; i < ja.size(); i++) { @@ -174,7 +174,7 @@ public class GenCodeServiceImpl implements GenCodeService { //如果flag=1就执行更新数据库的操作 String flag = (String) form.get("flag"); WQLObject wo = WQLObject.getWQLObject("sys_code_rule_detail"); - JSONArray ja = wo.query("code_rule_id = '" + id + "' FOR UPDATE").getResultJSONArray(0); + JSONArray ja = wo.query("code_rule_id = '" + id + "'", " sort_num,type FOR UPDATE").getResultJSONArray(0); String demo = ""; boolean is_same = true; for (int i = 0; i < ja.size(); i++) { diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/service/impl/InspectionsheetmstServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/service/impl/InspectionsheetmstServiceImpl.java index 1a4a9aeb..ddb7212e 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/service/impl/InspectionsheetmstServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/service/impl/InspectionsheetmstServiceImpl.java @@ -547,9 +547,6 @@ public class InspectionsheetmstServiceImpl implements InspectionsheetmstService if (jsonIvt.getDoubleValue("canuse_qty") != jsonIvt.getDoubleValue("ivt_qty")) { throw new BadRequestException("此批次物料有未完成的单据"); } - if (jsonDtl.getString("result").equals(jsonIvt.getString("quality_scode"))) { - continue; - } JSONObject prarm = new JSONObject(); String change_type_scode = ""; prarm.put("struct_id", jsonIvt.getString("struct_id")); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/service/impl/PhysicalMstServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/service/impl/PhysicalMstServiceImpl.java index f76f33d3..450ab81a 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/service/impl/PhysicalMstServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/service/impl/PhysicalMstServiceImpl.java @@ -986,8 +986,8 @@ public class PhysicalMstServiceImpl implements PhysicalMstService { for (int i = 0; i < dataArr.size(); i++) { JSONObject json = dataArr.getJSONObject(i); JSONObject jsonPhyMst = phyMstTab.query("inspection_id = '"+json.getString("inspection_id")+"'").uniqueResult(0); - if (StrUtil.equals(jsonPhyMst.getString("bill_status"), "99") && StrUtil.equals(jsonPhyMst.getString("is_effective"), "`99`")) { - throw new BadRequestException("此理化报告：" + jsonPhyMst.getString("inspection_code") + "已完成且有效"); + if (StrUtil.equals(jsonPhyMst.getString("bill_status"), "99")) { + throw new BadRequestException("此理化报告：" + jsonPhyMst.getString("inspection_code") + "已完成"); } // 1.将wms物料id转换成本erp物料id diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/wql/QL_ERP.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/wql/QL_ERP.wql index 516b41e6..e00438c5 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/wql/QL_ERP.wql +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/wql/QL_ERP.wql @@ -77,7 +77,7 @@ OPTION 输入.pcsn <> "" pcsn = 输入.pcsn ENDOPTION - order by confirm_time desc + order by BIZ_DATE desc ENDSELECT ENDQUERY ENDIF diff --git a/mes/qd/src/views/wms/pf/formula/DivDialog.vue b/mes/qd/src/views/wms/pf/formula/DivDialog.vue index 91715072..494c013b 100644 --- a/mes/qd/src/views/wms/pf/formula/DivDialog.vue +++ b/mes/qd/src/views/wms/pf/formula/DivDialog.vue @@ -331,6 +331,7 @@ type="primary" class="filter-item" size="mini" icon="el-icon-top" + :disabled="scope.row.status!='10'" @click="moveUp(scope.$index, scope.row)" > @@ -338,6 +339,7 @@ type="primary" class="filter-item" size="mini" icon="el-icon-bottom" + :disabled="scope.row.status!='10'" @click="moveDown(scope.$index, scope.row)" > @@ -488,8 +490,12 @@ export default { moveUp(index, item) { if (index > 0) { const upDate = this.tableDtl[index - 1] - this.tableDtl.splice(index - 1, 1) - this.tableDtl.splice(index, 0, upDate) + if(upDate.status != '10'){ + this.$message.error('上一个明细是生产中、完成状态，不可上移') + }else{ + this.tableDtl.splice(index - 1, 1) + this.tableDtl.splice(index, 0, upDate) + } } else { this.$message.error('已经是第一条，不可上移') } diff --git a/mes/qd/src/views/wms/ql/physicalMstConfirm/index.vue b/mes/qd/src/views/wms/ql/physicalMstConfirm/index.vue index f221318f..43262f4b 100644 --- a/mes/qd/src/views/wms/ql/physicalMstConfirm/index.vue +++ b/mes/qd/src/views/wms/ql/physicalMstConfirm/index.vue @@ -133,7 +133,7 @@ > 确认 - 设置有效 - + -->