From 0c792e785694e029966292a9d8beb7c5db659831 Mon Sep 17 00:00:00 2001 From: wws <18630710203@163.com> Date: Thu, 10 Aug 2023 15:54:31 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E5=8D=95=E5=AD=97=E6=AE=B5=E6=9B=B4?= =?UTF-8?q?=E6=94=B9(isEnd->endFlag)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/op/mes/domain/ProOrderWorkorder.java | 20 +++++++++---------- .../mapper/mes/ProEmbryoScrapMapper.xml | 4 ++-- .../com/op/plan/domain/ProOrderWorkorder.java | 20 +++++++++---------- .../service/impl/ProOrderServiceImpl.java | 4 ++-- .../mapper/plan/ProOrderWorkorderMapper.xml | 14 ++++++------- 5 files changed, 31 insertions(+), 31 deletions(-) diff --git a/op-modules/op-mes/src/main/java/com/op/mes/domain/ProOrderWorkorder.java b/op-modules/op-mes/src/main/java/com/op/mes/domain/ProOrderWorkorder.java index 1bac1e27..2b6da617 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/domain/ProOrderWorkorder.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/domain/ProOrderWorkorder.java @@ -121,7 +121,15 @@ public class ProOrderWorkorder extends TreeEntity { /** 是否为底层节点 1是 0不是 */ @Excel(name = "是否为底层节点") - private Integer isEnd; + private Integer endFlag; + + public Integer getEndFlag() { + return endFlag; + } + + public void setEndFlag(Integer endFlag) { + this.endFlag = endFlag; + } /** 班次名称（数据库无该字段，需自行查询） */ private String shiftDesc; @@ -211,14 +219,6 @@ public class ProOrderWorkorder extends TreeEntity { this.shiftDesc = shiftDesc; } - public Integer getIsEnd() { - return isEnd; - } - - public void setIsEnd(Integer isEnd) { - this.isEnd = isEnd; - } - /** 批次号 */ private List batchCodeList; @@ -460,7 +460,7 @@ public class ProOrderWorkorder extends TreeEntity { .append("prodType", getProdType()) .append("factoryCode", getFactoryCode()) .append("batchCodeList",getBatchCodeList()) - .append("isEnd",getIsEnd()) + .append("endFlag",getEndFlag()) .append("shiftDesc",getShiftDesc()) .append("bucketId",getBucketId()) .append("bucketCode",getBucketCode()) diff --git a/op-modules/op-mes/src/main/resources/mapper/mes/ProEmbryoScrapMapper.xml b/op-modules/op-mes/src/main/resources/mapper/mes/ProEmbryoScrapMapper.xml index 9fd8096d..5cd57255 100644 --- a/op-modules/op-mes/src/main/resources/mapper/mes/ProEmbryoScrapMapper.xml +++ b/op-modules/op-mes/src/main/resources/mapper/mes/ProEmbryoScrapMapper.xml @@ -34,7 +34,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + @@ -113,7 +113,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" quantity_produced, quantity_split, route_code, prod_line_code, product_date, shift_id, parent_order, ancestors, status, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time, - prod_type, factory_code , is_end from pro_order_workorder + prod_type, factory_code , eng_flag from pro_order_workorder diff --git a/op-modules/op-plan/src/main/java/com/op/plan/domain/ProOrderWorkorder.java b/op-modules/op-plan/src/main/java/com/op/plan/domain/ProOrderWorkorder.java index be2db424..def65600 100644 --- a/op-modules/op-plan/src/main/java/com/op/plan/domain/ProOrderWorkorder.java +++ b/op-modules/op-plan/src/main/java/com/op/plan/domain/ProOrderWorkorder.java @@ -111,7 +111,15 @@ public class ProOrderWorkorder extends TreeEntity { private String prodType; /** 是否为底层节点 1是 0不是 */ - private Integer isEnd; + private Integer endFlag; + + public Integer getEndFlag() { + return endFlag; + } + + public void setEndFlag(Integer endFlag) { + this.endFlag = endFlag; + } /** 班次名称（数据库无该字段，需自行查询） */ private String shiftDesc; @@ -211,14 +219,6 @@ public class ProOrderWorkorder extends TreeEntity { this.shiftDesc = shiftDesc; } - public Integer getIsEnd() { - return isEnd; - } - - public void setIsEnd(Integer isEnd) { - this.isEnd = isEnd; - } - /** 批次号 */ private List batchCodeList; @@ -459,7 +459,7 @@ public class ProOrderWorkorder extends TreeEntity { .append("prodType", getProdType()) .append("factoryCode", getFactoryCode()) .append("batchCodeList",getBatchCodeList()) - .append("isEnd",getIsEnd()) + .append("endFlag",getEndFlag()) .append("shiftDesc",getShiftDesc()) .append("bucketId",getBucketId()) .append("bucketCode",getBucketCode()) diff --git a/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderServiceImpl.java b/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderServiceImpl.java index f4b3b04e..35091e43 100644 --- a/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderServiceImpl.java +++ b/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderServiceImpl.java @@ -134,8 +134,8 @@ public class ProOrderServiceImpl implements IProOrderService { // code自增 endCode++; } else { - // 设置子节点is_end字段信息 - workOrder.setIsEnd(1); + // 设置子节点end_flag字段信息 + workOrder.setEndFlag(1); // 更新数据库记录信息 proOrderWorkorderMapper.updateProOrderWorkorder(workOrder); // 结束循环 diff --git a/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml b/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml index 4c94464a..cd17ff6d 100644 --- a/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml +++ b/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml @@ -35,14 +35,14 @@ - + select workorder_id, workorder_code, workorder_name, order_id, order_code, product_id, product_code, product_name, product_spc, unit, quantity_produced, quantity_split, route_code, prod_line_code, product_date, shift_id, parent_order, ancestors, status, remark, attr1, attr2, attr3, attr4, create_by, create_time, - update_by, update_time, prod_type, factory_code , is_end + update_by, update_time, prod_type, factory_code , end_flag from pro_order_workorder @@ -73,7 +73,7 @@ and attr4 = #{attr4} and prod_type = #{prodType} and factory_code = #{factoryCode} - and is_end = #{isEnd} + and end_flag = #{endFlag} and CONVERT(varchar(10),product_date, 120) >= '${productDateStart}' and '${productDateEnd}%' >= CONVERT(varchar(10),product_date, 120) @@ -133,7 +133,7 @@ select workorder_id, workorder_code, workorder_name, order_id, order_code, product_id, product_code, product_name, product_spc, unit, quantity_produced, quantity_split, route_code, prod_line_code, product_date, shift_id, parent_order, ancestors, status, remark, attr1, attr2, attr3, attr4, create_by, create_time, - update_by, update_time, prod_type, factory_code , is_end + update_by, update_time, prod_type, factory_code , end_flag from pro_order_workorder where workorder_id in #{ids} @@ -184,7 +184,7 @@ update_time, prod_type, factory_code, - is_end, + end_flag, #{workorderId}, @@ -217,7 +217,7 @@ #{updateTime}, #{prodType}, #{factoryCode}, - #{isEnd}, + #{endFlag}, @@ -363,7 +363,7 @@ update_time = #{updateTime}, prod_type = #{prodType}, factory_code = #{factoryCode}, - is_end = #{isEnd}, + end_flag = #{endFlag}, where workorder_id = #{workorderId}