Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java

@@ -419,6 +419,48 @@ public class ImppEnumUtil {
     }
 
     /**
+     * 用户消息发送状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum MESSAGE_SEND_STATUS {
+
+        SENDING(1, "发送中"),
+        SEND_SUCCESS(2, "发送成功"),
+        SEND_FAIL(3, "发送失败");
+
+        private int value;
+        private String description;
+
+        MESSAGE_SEND_STATUS() {
+        }
+
+        MESSAGE_SEND_STATUS(int value,  String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+    }
+
+    /**
      * 用户消息类型
      * 1.NOTICE：通知
      * 2.STATION_LETTER：站内信

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java

@@ -5837,7 +5837,18 @@ public class MesEnumUtil {
         STRING("10", "String", "字符串"),
         BOOLEAN("20","Boolean",  "布尔"),
         WORD("30", "Word", "整形-Word"),
-        DWORD("40","Dword",  "整形-DWord");
+        DWORD("40","Dword",  "整形-DWord"),
+        LONG("50", "Long", "长整形-Long"),
+        SHORT("60", "Short", "UShort"),
+        DOUBLE("70", "Double", "双精度-Double"),
+        FLOAT("80", "Float", "单精度-Float"),
+        LLONG("90", "LLong", "LLONG"),
+        QWORD("100", "QWord", "QWORD"),
+        BCD("110", "BCD", "BCD"),
+        LBCD("120", "LBCD", "LBCD"),
+        BYTE("130", "Byte", "Byte"),
+        CHAR("140", "Char", "Char"),
+        Date("150", "DateTime", "日期");
 
         private String value;
         private String code;

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java

@@ -4016,7 +4016,8 @@ public class MesPcnEnumUtil {
     public enum PRODUCE_ERROR_RECORD {
         JUMP_PROCESS(10, "跳过工序"),
         JUMP_STEP(20, "跳过工步"),
-        JUMP_STATE(30, "跳过状态点");
+        JUMP_STATE(30, "跳过状态点"),
+        ABNORMAL_DEDUCTION(40, "扣减异常");
 
         private int value;
         private String description;
@@ -4423,4 +4424,50 @@ public class MesPcnEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     * 关键件校验并转过程条码工步 取值模式
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum VALUE_RANGE {
+
+        SCAN(10, "扫描"),
+        READ_CACHE(20, "读取缓存");
+
+        private int value;
+        private String description;
+
+        VALUE_RANGE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public static Integer descriptionOfValue(String description) {
+            Integer tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(description)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+    }
 }

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlEnumUtil.java

@@ -625,9 +625,9 @@ public class PtlEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum PTL_TASK_STATUS {
         CREATE(10, "创建"),
-        EXECUTION(20, "执行中"),
+        COMPLETE(20, "完成"),
-        COMPLETE(30, "完成"),
+        CLOSE(30, "关闭"),
-        CANCEL(40, "取消");
+        EXECUTION(40, "执行中");
 
         private int value;
         private String description;

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java

@@ -830,7 +830,8 @@ public class PtlPcnEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum AREA_SECTION_TASK_DETAIL_STATUS {
         CREATE(10, "CREATE", "创建"),
-        COMPLETE(20, "COMPLETE", "完成");
+        COMPLETE(20, "COMPLETE", "完成"),
+        CLOSE(30, "CLOSE", "关闭");
 
         private int value;
         private String code;
@@ -860,8 +861,9 @@ public class PtlPcnEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum AREA_SECTION_TASK_STATUS {
-        CREATE(10, "CREATE", "新建"),
+        CREATE(10, "CREATE", "创建"),
-        RECEIPT_FINISH(30, "RECEIPT_FINISH", "已完成");
+        COMPLETE(20, "COMPLETE", "完成"),
+        CLOSE(30, "CLOSE", "关闭");
 
         private int value;
         private String code;
@@ -915,10 +917,10 @@ public class PtlPcnEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum PTL_MAIN_TASK_STATUS {
-        CREATE(10, "CREATE", "新建"),
+        CREATE(10, "CREATE", "创建"),
-        RECEIPT(20, "RECEIPT", "执行中"),
+        COMPLETE(20, "COMPLETE", "完成"),
-        RECEIPT_FINISH(30, "RECEIPT_FINISH", "已完成"),
+        CLOSE(30, "CLOSE", "关闭"),
-        CANCELLED(40, "CANCELLED", "已取消");
+        EXECUTION(40, "EXECUTION", "执行中");
 
         private int value;
         private String code;
@@ -1413,7 +1415,8 @@ public class PtlPcnEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum AREA_TASK_STATUS {
         CREATE(10, "CREATE", "创建"),
-        RECEIPT_FINISH(30, "COMPLETED", "完成");
+        COMPLETE(20, "COMPLETE", "完成"),
+        CLOSE(30, "CLOSE", "关闭");
 
         private int value;
         private String code;

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java

@@ -792,7 +792,14 @@ public class WmsEnumUtil {
         CONTAINER_INSTORE(570, "CONTAINER_INSTORE", "AGV料车入库"),
         AGV_PART_NO_OUT(580, "AGV_PART_NO_OUT", "AGV物料出库"),
         FORKLIFT_PART_NO_OUT(590, "FORKLIFT_PART_NO_OUT", "PAD物料出库"),
-        INTERNAL_SHIPPING(600, "INTERNAL_SHIPPING", "内部发运");
+        INTERNAL_SHIPPING(600, "INTERNAL_SHIPPING", "内部发运"),
+        ASSEMBLY_DISASSEMBLY_STORAGE(610, "ASSEMBLY_DISASSEMBLY_STORAGE\n", "总成拆解入库"),
+        INTERNAL_WORK_ORDER_MATERIAL_STORAGE(620, "INTERNAL_WORK_ORDER_MATERIAL_STORAGE", "内部工单物料入库"),
+        PART_NUMBER_CONVERSION_MATERIAL_STORAGE(630, "PART_NUMBER_CONVERSION_MATERIAL_STORAGE", "零件号转化物料入库"),
+        PART_NUMBER_CONVERSION_MATERIAL_OUT_STOCK(640, "PART_NUMBER_CONVERSION_MATERIAL_OUT_STOCK", "零件号转化物料出库"),
+        INTERNAL_WORK_ORDER_MATERIAL_OUT_STOCK(650, "INTERNAL_SHIPPING", "内部工单物料出库"),
+        CUSTOMER_RETURN_SCRAP(660, "CUSTOMER_RETURN_SCRAP", "客户退货报废"),
+        MATERIAL_SCRAP(670, "MATERIAL_SCRAP", "物料报废");
         private int value;
         private String code;
         private String description;

modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethodDetailProperty.java

@@ -57,29 +57,11 @@ public class BfMethodDetailProperty extends BaseBean {
     @ApiParam(value ="主对象元素名称")
     private String priElementNameRdd;
 
-    @Column(name="PRI_ELEMENT_PROPERTY_ID")
-    @ApiParam(value ="主对象元素属性id")
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long priElementPropertyId;
-
-    @Column(name="PRI_ELEMENT_PROPERTY_NAME_RDD")
-    @ApiParam(value ="主对象元素属性名称")
-    private String priElementPropertyNameRdd;
-
-    @Column(name="PRI_ELEMENT_PROPERTY_CODE_RDD")
-    @ApiParam(value ="主对象元素属性code")
-    private String priElementPropertyCodeRdd;
-
     // 枚举:BlockFormEnumUtil.TRIGGER_EVENT
     @Column(name="PRI_ELEMENT_EVENT")
     @ApiParam(value ="主对象元素事件")
     private Integer priElementEvent;
 
-    // 枚举:BlockFormEnumUtil.SQL_REF_TYPE
-    @Column(name="ASSOCIATE_TYPE")
-    @ApiParam(value ="关联类型")
-    private Integer associateType;
-
     @Column(name="SEC_METHOD_DETAIL_ID")
     @ApiParam(value ="关联功能明细id")
     @JsonSerialize(using = ToStringSerializer.class)
@@ -98,19 +80,6 @@ public class BfMethodDetailProperty extends BaseBean {
     @ApiParam(value ="关联对象元素名称")
     private String secElementNameRdd;
 
-    @Column(name="SEC_ELEMENT_PROPERTY_ID")
-    @ApiParam(value ="关联对象元素属性id")
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long secElementPropertyId;
-
-    @Column(name="SEC_ELEMENT_PROPERTY_NAME_RDD")
-    @ApiParam(value ="关联对象元素属性名称")
-    private String secElementPropertyNameRdd;
-
-    @Column(name="SEC_ELEMENT_PROPERTY_CODE_RDD")
-    @ApiParam(value ="关联对象元素属性Code")
-    private String secElementPropertyCodeRdd;
-
     @Transient
     @ApiParam(value ="表单功能明细关联属性")
     private List<BfMethodDetailPropertyRef> refList;

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCellFeedRecord.java

@@ -9,9 +9,7 @@ import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
-import javax.persistence.Column;
+import javax.persistence.*;
-import javax.persistence.Entity;
-import javax.persistence.Table;
 import java.io.Serializable;
 
 /**
@@ -26,7 +24,9 @@ import java.io.Serializable;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "MES_CELL_FEED_RECORD")
+@Table(name = "MES_CELL_FEED_RECORD", indexes = {
+        @Index(columnList = "ORDER_NO")
+})
 @Api("工位投料履历信息")
 public class MesCellFeedRecord extends BaseBean implements Serializable {
     private static final long serialVersionUID = 1947971369489107783L;

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdBindRecord.java

@@ -28,6 +28,7 @@ import java.io.Serializable;
         @Index(columnList = "SERIAL_NUMBER"),
         @Index(columnList = "KP_SN"),
         @Index(columnList = "CREATE_DATE_TIME"),
+        @Index(columnList = "MODIFY_DATE_TIME"),
         @Index(columnList = "ITEM_PART_NO")
 })
 @Api("产品绑定记录表")

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceErrorRecord.java

@@ -28,7 +28,7 @@ public class MesProduceErrorRecord extends BaseBean {
     private static final long serialVersionUID = 209753108845613052L;
 
     @Column(name = "ERROR_TYPE")
-    @ApiParam("异常类型 10:工序跳过 20:工步跳过")
+    @ApiParam("异常类型 10:工序跳过 20:工步跳过 40:扣料异常")
     private Integer errorType;
 
     @Column(name = "SERIAL_NUMBER")
@@ -63,5 +63,8 @@ public class MesProduceErrorRecord extends BaseBean {
     @ApiParam("状态点代码")
     private String statusCode;
 
+    @Column(name = "ERROR_MESSAGE")
+    @ApiParam("异常内容")
+    private String errorMessage;
 
 }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckStandard.java

@@ -92,6 +92,14 @@ public class MesQcCheckStandard extends BaseBean implements Serializable {
     @ApiParam("数量标识")
     private String numberFlag;
 
+    @Column(name = "MAXIMUM")
+    @ApiParam("最大数")
+    private Double maximum = 0d;
+
+    @Column(name = "MINIMUM")
+    @ApiParam("最小数")
+    private Double minimum = 0d;
+
     @Transient
     @ApiParam("检测类型名称")
     private String checkTypeName;

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java

@@ -87,4 +87,12 @@ public class MesQcOrderDetail extends BaseBean  implements Serializable {
     @ApiParam(value = "检测项类型名称")
     @Transient
     private String businessTypeName;
+
+    @Column(name = "MAXIMUM")
+    @ApiParam("最大数")
+    private Double maximum = 0d;
+
+    @Column(name = "MINIMUM")
+    @ApiParam("最小数")
+    private Double minimum = 0d;
 }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellMonitorLog.java

@@ -23,7 +23,8 @@ import java.io.Serializable;
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
 @Table(name = "MES_WORK_CELL_MONITOR_LOG", indexes = {
-        @Index(columnList = "CREATE_DATE_TIME")
+        @Index(columnList = "CREATE_DATE_TIME"),
+        @Index(columnList = "WORK_CENTER_CODE")
 })
 @Api("工位监控异常信息")
 public class MesWorkCellMonitorLog extends BaseBean implements Serializable {

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPlcModel.java

@@ -102,6 +102,9 @@ public class MesPlcModel implements Serializable {
     @ApiParam("默认赋值属性")
     private String defaultRule;
 
+    @ApiParam("工装代码")
+    private String toolingCode;
+
     public MesPlcModel() {
 
     }
@@ -109,7 +112,8 @@ public class MesPlcModel implements Serializable {
     public MesPlcModel(Long id, String equipmentCode, String equipmentName, Integer isValid, Integer isDeleted, String createUser, String createDatetime,
                        String modifyUser, String modifyDatetime, String organizeCode, String plcCode, String plcName, String plcModel,
                        String plcIp, String channel, String tagName, String tagAddress, String dataType, String groupName,
-                       String workCenterCode, String workCellCode, String plcCfg, String analysisRule, String isAnalysis, String device, String objectCode, String opcUrl, Integer plcType, String defaultRule) {
+                       String workCenterCode, String workCellCode, String plcCfg, String analysisRule, String isAnalysis, String device,
+                       String objectCode, String opcUrl, Integer plcType, String defaultRule, String toolingCode) {
         this.id = id;
         this.equipmentCode = equipmentCode;
         this.equipmentName = equipmentName;
@@ -139,5 +143,6 @@ public class MesPlcModel implements Serializable {
         this.opcUrl = opcUrl;
         this.plcType = plcType;
         this.defaultRule = defaultRule;
+        this.toolingCode = toolingCode;
     }
 }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/RefreshInitModuleModel.java

@@ -0,0 +1,35 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+@Data
+public class RefreshInitModuleModel<T> implements Serializable {
+
+    @ApiParam("工作中心")
+    private String workCenterCode;
+
+    @ApiParam("工作单元")
+    private String workCellCode;
+
+    @ApiParam("组织代码")
+    private String organizeCode;
+
+    @ApiParam("用户信息")
+    private String userInfo;
+
+    @ApiParam("队列展示类型（有序/无序）")
+    private Object resultObj;
+
+    @ApiParam("展示组件定时刷新频率")
+    private Integer timer;
+
+    @ApiParam("List字段集")
+    private List<AttrBean> DataAttrList;
+
+    @ApiParam("List结果集")
+    private List<T> resultList;
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java

@@ -15,6 +15,7 @@ import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
 
 import java.util.List;
+
 /**
  * @Description:
  * @Reference: Mes 条件封装
@@ -1344,7 +1345,7 @@ public class MesHqlPack {
             DdlPreparedPack.getStringLikerPack(mesPlc.getChannel(), "channel", packBean);
         }
         if (!StringUtils.isEmpty(mesPlc.getTagAddress())) {
-            DdlPreparedPack.getStringLikerPack(mesPlc.getTagAddress(), "tagAddress", packBean);
+            DdlPreparedPack.getStringEqualPack(mesPlc.getTagAddress(), "tagAddress", packBean);
         }
         if (!StringUtils.isEmpty(mesPlc.getWorkCenterCode())) {
             DdlPreparedPack.getStringEqualPack(mesPlc.getWorkCenterCode(), "workCenterCode", packBean);
@@ -1352,6 +1353,12 @@ public class MesHqlPack {
         if (!StringUtils.isEmpty(mesPlc.getPlcCode())) {
             DdlPreparedPack.getStringEqualPack(mesPlc.getWorkCellCode(), "workCellCode", packBean);
         }
+        if (!StringUtils.isEmpty(mesPlc.getEquipmentCode())) {
+            DdlPreparedPack.getStringEqualPack(mesPlc.getEquipmentCode(), "equipmentCode", packBean);
+        }
+        if (!StringUtils.isEmpty(mesPlc.getObjectCode())) {
+            DdlPreparedPack.getStringEqualPack(mesPlc.getObjectCode(), "objectCode", packBean);
+        }
         return packBean;
     }
 
@@ -2043,7 +2050,7 @@ public class MesHqlPack {
         if (!StringUtils.isEmpty(mesProdBindRecord.getSupplierCode())) {
             DdlPreparedPack.getStringLikerPack(mesProdBindRecord.getSupplierCode(), "supplierCode", packBean);
         }
-        if(!StringUtils.isEmpty(mesProdBindRecord.getCreateDateTimeStart()) || !StringUtils.isEmpty(mesProdBindRecord.getCreateDateTimeEnd())) {
+        if (!StringUtils.isEmpty(mesProdBindRecord.getCreateDateTimeStart()) || !StringUtils.isEmpty(mesProdBindRecord.getCreateDateTimeEnd())) {
             DdlPreparedPack.timeBuilder(
                     mesProdBindRecord.getCreateDateTimeStart(),
                     mesProdBindRecord.getCreateDateTimeEnd(),
@@ -2382,19 +2389,20 @@ public class MesHqlPack {
 
     /**
      * 界面组件配置
+     *
      * @param windowModule
      * @param organizeCode
      * @return
      */
     public static DdlPackBean getMesWindowModule(MesWindowModule windowModule, String organizeCode) {
         DdlPackBean packBean = getAllBaseDataByNormalPro(windowModule, organizeCode);
-        if(!StringUtils.isEmpty(windowModule.getWindowNo())){
+        if (!StringUtils.isEmpty(windowModule.getWindowNo())) {
             DdlPreparedPack.getStringLikerPack(windowModule.getWindowNo(), "windowNo", packBean);
         }
-        if(!StringUtils.isEmpty(windowModule.getModuleCode())){
+        if (!StringUtils.isEmpty(windowModule.getModuleCode())) {
             DdlPreparedPack.getStringLikerPack(windowModule.getModuleCode(), "moduleCode", packBean);
         }
-        if(!StringUtils.isEmpty(windowModule.getWindowModuleBack())){
+        if (!StringUtils.isEmpty(windowModule.getWindowModuleBack())) {
             DdlPreparedPack.getStringLikerPack(windowModule.getWindowModuleBack(), "windowModuleBack", packBean);
         }
         return packBean;
@@ -2402,22 +2410,23 @@ public class MesHqlPack {
 
     /**
      * 界面组件参数配置
+     *
      * @param windowModuleParam
      * @param organizeCode
      * @return
      */
     public static DdlPackBean getMesWindowModuleParam(MesWindowModuleParam windowModuleParam, String organizeCode) {
         DdlPackBean packBean = getAllBaseDataByNormalPro(windowModuleParam, organizeCode);
-        if(!StringUtils.isEmpty(windowModuleParam.getWindowNo())){
+        if (!StringUtils.isEmpty(windowModuleParam.getWindowNo())) {
             DdlPreparedPack.getStringLikerPack(windowModuleParam.getWindowNo(), "windowNo", packBean);
         }
-        if(!StringUtils.isEmpty(windowModuleParam.getModuleCode())){
+        if (!StringUtils.isEmpty(windowModuleParam.getModuleCode())) {
             DdlPreparedPack.getStringLikerPack(windowModuleParam.getModuleCode(), "moduleCode", packBean);
         }
-        if(!StringUtils.isEmpty(windowModuleParam.getParamCode())){
+        if (!StringUtils.isEmpty(windowModuleParam.getParamCode())) {
             DdlPreparedPack.getStringLikerPack(windowModuleParam.getParamCode(), "paramCode", packBean);
         }
-        if(!StringUtils.isEmpty(windowModuleParam.getParamValue())){
+        if (!StringUtils.isEmpty(windowModuleParam.getParamValue())) {
             DdlPreparedPack.getStringLikerPack(windowModuleParam.getParamValue(), "paramValue", packBean);
         }
         return packBean;
@@ -2425,22 +2434,23 @@ public class MesHqlPack {
 
     /**
      * 数据预警配置
+     *
      * @param dataWarning
      * @param organizeCode
      * @return
      */
     public static DdlPackBean getMesDataWarning(MesDataWarning dataWarning, String organizeCode) {
         DdlPackBean packBean = getAllBaseDataByNormalPro(dataWarning, organizeCode);
-        if(!StringUtils.isEmpty(dataWarning.getObjectCode())){
+        if (!StringUtils.isEmpty(dataWarning.getObjectCode())) {
             DdlPreparedPack.getStringLikerPack(dataWarning.getObjectCode(), "objectCode", packBean);
         }
-        if(!StringUtils.isEmpty(dataWarning.getWarningRule())){
+        if (!StringUtils.isEmpty(dataWarning.getWarningRule())) {
             DdlPreparedPack.getStringLikerPack(dataWarning.getWarningRule(), "warningRule", packBean);
         }
-        if(!StringUtils.isEmpty(dataWarning.getWarningItem())){
+        if (!StringUtils.isEmpty(dataWarning.getWarningItem())) {
             DdlPreparedPack.getStringLikerPack(dataWarning.getWarningItem(), "warningItem", packBean);
         }
-        if(!StringUtils.isEmpty(dataWarning.getInformMode())){
+        if (!StringUtils.isEmpty(dataWarning.getInformMode())) {
             DdlPreparedPack.getNumEqualPack(dataWarning.getInformMode(), "informMode", packBean);
         }
         return packBean;
@@ -2464,6 +2474,7 @@ public class MesHqlPack {
 
         return result;
     }
+
     /**
      * 封装公用查询参数
      *
@@ -2491,9 +2502,9 @@ public class MesHqlPack {
     }
 
 
-
     /**
      * 按条件分页查询产品条码补打印数据
+     *
      * @param mesProduceSn
      * @return
      */
@@ -2720,7 +2731,7 @@ public class MesHqlPack {
 
     public static DdlPackBean getDataAuthCondition(MesDataAuth dataAuth, String organizeCode) {
         DdlPackBean packBean;
-        if(dataAuth.getIsValidVal() == 0) {
+        if (dataAuth.getIsValidVal() == 0) {
             packBean = DdlPackBean.getDdlPackBean(organizeCode);
         } else {
             packBean = DdlPackBean.getDdlPackBean(organizeCode, dataAuth.getIsValidVal());
@@ -2875,6 +2886,7 @@ public class MesHqlPack {
 
     /**
      * 导入模板信息分页查询条件
+     *
      * @param template
      * @return
      */
@@ -2889,6 +2901,7 @@ public class MesHqlPack {
 
     /**
      * 导入模板明细信息分页查询条件
+     *
      * @param details
      * @return
      */
@@ -2951,6 +2964,7 @@ public class MesHqlPack {
 
     /**
      * 物料校验项
+     *
      * @param partCheck
      * @param organizeCode
      * @return
@@ -2996,6 +3010,7 @@ public class MesHqlPack {
 
     /**
      * MES AGV停机记录信息条件查询
+     *
      * @param stopRecord
      * @return
      */
@@ -3099,6 +3114,7 @@ public class MesHqlPack {
 
     /**
      * 扩展对象配置
+     *
      * @param extendObjectCfg
      * @param organizeCode
      * @return
@@ -3122,6 +3138,7 @@ public class MesHqlPack {
 
     /**
      * 产品工作中心配置
+     *
      * @param prodWorkCenter
      * @param organizeCode
      * @return
@@ -3139,6 +3156,7 @@ public class MesHqlPack {
 
     /**
      * 客户JIT预装队列
+     *
      * @param queueJitPlan
      * @param organizeCode
      * @return
@@ -3173,6 +3191,7 @@ public class MesHqlPack {
 
     /**
      * 客户JIT预装队列明细
+     *
      * @param queueJitPlanDetail
      * @param organizeCode
      * @return
@@ -3190,6 +3209,7 @@ public class MesHqlPack {
 
     /**
      * 客户JIT预装队列BOM
+     *
      * @param queueJitPlanBom
      * @param organizeCode
      * @return

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMessage.java

@@ -1,6 +1,8 @@
 package cn.estsh.i3plus.pojo.platform.bean;
 
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.Api;
@@ -93,13 +95,22 @@ public class SysMessage extends BaseBean {
     @ApiParam(value = "是否系统邮件")
     private Integer isSystem;
 
+    @Column(name = "SEND_STATUS")
+    @ApiParam(value = "发送状态")
+    @AnnoOutputColumn(refClass = ImppEnumUtil.MESSAGE_SEND_STATUS.class)
+    private Integer sendStatus;
+
+    @Column(name = "ERROR_MESSAGE")
+    @ApiParam(value = "错误信息")
+    private String errorMessage;
+
     @Transient
     @ApiParam(value = "阅读统计")
     @JsonSerialize(using = ToStringSerializer.class)
     private Long readCount;
 
-    public long getReadCountVal(){
+    public long getReadCountVal() {
-        if(readCount == null){
+        if (readCount == null) {
             return 0;
         } else {
             return readCount.longValue();

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefRoleMenu.java

@@ -33,6 +33,7 @@ import java.util.List;
 public class SysRefRoleMenu extends BaseBean {
 
     private static final long serialVersionUID = -2013469818246101184L;
+
     @Column(name="MENU_ID")
     @ApiParam(value ="菜单ID" ,example = "-1")
     @JsonSerialize(using = ToStringSerializer.class)

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java

@@ -508,17 +508,14 @@ public class CoreHqlPack {
      * @param sysTaskCycle
      * @return
      */
-    public static String packHqlSysTaskCycle(SysTaskCycle sysTaskCycle) {
+    public static DdlPackBean packHqlSysTaskCycle(SysTaskCycle sysTaskCycle) {
-        StringBuffer result = new StringBuffer();
+        DdlPackBean result = DdlPackBean.getDdlPackBean(sysTaskCycle);
 
         // hql拼接
-        HqlPack.getStringLikerPack(sysTaskCycle.getName(), "name", result);
+        DdlPreparedPack.getStringLikerPack(sysTaskCycle.getName(), "name", result);
-        HqlPack.getStringEqualPack(sysTaskCycle.getOrganizeCode(), "organizeCode", result);
+        DdlPreparedPack.getStringEqualPack(sysTaskCycle.getOrganizeCode(), "organizeCode", result);
-
-        // 添加默认排序
-        HqlPack.getOrderDefault(sysTaskCycle);
 
-        return result.toString();
+        return result;
     }
 
     /**
@@ -1144,4 +1141,14 @@ public class CoreHqlPack {
 
         return ddlPackBean;
     }
+
+    public static DdlPackBean packHqlSysTaskPlanOnly(SysTaskPlan sysTaskPlan){
+        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(sysTaskPlan);
+
+        DdlPreparedPack.getNumEqualPack(sysTaskPlan.getId(),"id",ddlPackBean);
+        DdlPreparedPack.getStringEqualPack(sysTaskPlan.getName(),"name",ddlPackBean);
+        DdlPreparedPack.getStringEqualPack(sysTaskPlan.getGroupName(),"groupName",ddlPackBean);
+
+        return ddlPackBean;
+    }
 }

modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitDataDetail.java

@@ -91,5 +91,8 @@ public class BsSuitDataDetail extends BaseBean {
     @ApiParam(value = "适配请求文件列表")
     private List<BsSuitFile> bsSuitFileList;
 
+    @Transient
+    @ApiParam(value = "id-查询条件")
+    private List<Long> searchIdList;
 }
 

modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java

@@ -149,5 +149,16 @@ public class BsSuitRecord extends BaseBean {
     @ApiParam(value = "适配请求文件列表")
     private List<BsSuitFile> bsSuitFileList;
 
+    @Transient
+    @ApiParam(value = "适配记录报文-查询条件")
+    private String searchMessage;
+
+    @Transient
+    @ApiParam(value = "适配入参-查询条件")
+    private String searchInputParam;
+
+    @Transient
+    @ApiParam(value = "id-查询条件")
+    private List<Long> searchIdList;
 }
 

modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java

@@ -318,6 +318,7 @@ public class SoftSwitchHqlPack {
     public static DdlPackBean packHqlBsSuitRecord(BsSuitRecord bsSuitRecord){
         DdlPackBean ddlPackBean = new DdlPackBean();
 
+        DdlPreparedPack.getInPackList(bsSuitRecord.getSearchIdList(),"id",ddlPackBean);
         DdlPreparedPack.getNumEqualPack(bsSuitRecord.getSuitCaseId(),"suitCaseId",ddlPackBean);
         DdlPreparedPack.getStringLikerPack(bsSuitRecord.getSuitCaseNameRdd(),"suitCaseNameRdd",ddlPackBean);
         DdlPreparedPack.getNumEqualPack(bsSuitRecord.getSuitTypeId(),"suitTypeId",ddlPackBean);
@@ -342,6 +343,7 @@ public class SoftSwitchHqlPack {
     public static DdlPackBean packHqlBsSuitDataDetail(BsSuitDataDetail bsSuitDataDetail){
         DdlPackBean ddlPackBean = new DdlPackBean();
 
+        DdlPreparedPack.getInPackList(bsSuitDataDetail.getSearchIdList(),"id",ddlPackBean);
         DdlPreparedPack.getNumEqualPack(bsSuitDataDetail.getSuitCaseId(),"suitCaseId",ddlPackBean);
         DdlPreparedPack.getStringLikerPack(bsSuitDataDetail.getSuitCaseCodeRdd(),"suitCaseCodeRdd",ddlPackBean);
         DdlPreparedPack.getStringLikerPack(bsSuitDataDetail.getSuitCaseNameRdd(),"suitCaseNameRdd",ddlPackBean);
@@ -409,4 +411,12 @@ public class SoftSwitchHqlPack {
 
         return ddlPackBean;
     }
+
+    public static DdlPackBean packHqlBsLongData(BsLongData bsLongData){
+        DdlPackBean ddlPackBean  = DdlPackBean.getDdlPackBean(bsLongData);
+        DdlPreparedPack.timeBuilder(bsLongData.getCreateDatetime(), "createDatetime", ddlPackBean, false, true);
+        DdlPreparedPack.getNumEqualPack(bsLongData.getRefDataType(),"refDataType",ddlPackBean);
+        DdlPreparedPack.getStringLikePack(bsLongData.getData(),"data",ddlPackBean);
+        return ddlPackBean;
+    }
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java

@@ -173,4 +173,8 @@ public class WmsDocFgDetail extends BaseBean {
     @ApiParam(value = "子位置号")
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
     private String itemSeqNo;
+
+    @Column(name = "QUEUE_GROUP_NO")
+    @ApiParam(value = "jis料架号")
+    private String queueGroupNo;
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java

@@ -223,6 +223,18 @@ public class WmsDocMovementMaster extends BaseBean {
     @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class)
     private Integer isGoodProduct;
 
+    @Column(name = "COST_CENTER")
+    @ApiParam(value = "成本中心")
+    private String costCenter;
+
+    @Column(name = "REMAKE")
+    @ApiParam(value = "备注1")
+    private String remake;
+
+    @Column(name = "SECONDARY_REMAKE")
+    @ApiParam(value = "备注2")
+    private String secondaryRemake;
+
     @Transient
     @ApiParam(value = "发运单号")
     private String shipOrderNo;

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java

@@ -256,6 +256,10 @@ dataSrc ="cn.estsh.i3plus.pojo.wms.bean.WmsLocate",
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRUE_OR_FALSE")
     private Integer consignation = 2;
 
+    @Column(name = "QUEUE_GROUP_NO")
+    @ApiParam(value = "jis料架号")
+    private String queueGroupNo;
+
     public Integer getIsSnapshot() {
         return isSnapshot == null ? 0 : isSnapshot.intValue();
     }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java

@@ -169,6 +169,10 @@ public class WmsMoveSn extends BaseBean {
     @ApiParam("供应商编号")
     private String vendorNo;
 
+    @Column(name = "srcSn")
+    @ApiParam("原条码")
+    private String srcSn;
+
     @Column(name = "SERIAl_SN")
     @ApiParam("产品条码")
     public String serialSn;

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java

@@ -216,6 +216,19 @@ public class WmsMoveToERP extends BaseBean {
     @ApiParam(value = "方向")
     private Integer podDir;
 
+
+    @Column(name = "COST_CENTER")
+    @ApiParam(value = "成本中心")
+    private String costCenter;
+
+    @Column(name = "SECONDARY_REMAKE")
+    @ApiParam(value = "备注2")
+    private String secondaryRemake;
+
+    @Column(name = "QUEUE_GROUP_NO")
+    @ApiParam(value = "jis料架号")
+    private String queueGroupNo;
+
     @Transient
     private Long shippingId;
 

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java

@@ -171,6 +171,10 @@ public class WmsPOMaster extends BaseBean {
     @Column(name = "ZDOC", columnDefinition = "varchar(50) default ''")
     public String zdoc;
 
+    @ApiParam("发运单号")
+    @Column(name = "SHIPMENT_NOTE_NUMBER")
+    public String shipmentNoteNumber;
+
     public WmsPOMaster() {
 
     }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java

@@ -280,6 +280,10 @@ public class WmsStockSn extends BaseBean {
     @ApiParam(value = "包装零件号")
     private String packagePartNo;
 
+    @Column(name = "QUEUE_GROUP_NO")
+    @ApiParam(value = "jis料架号")
+    private String queueGroupNo;
+
     @Transient
     @ApiParam(value = "工厂名称")
     public String organizeName;

sonar-project.properties

@@ -6,7 +6,7 @@ sonar.projectKey=i3plus.pojo:i3plus-pojo
 # defaults to project key
 sonar.projectName=i3plus-pojo
 # defaults to 'not provided'
-sonar.projectVersion=1.0-DEV-SNAPSHOT
+sonar.projectVersion=1.0-TEST-SNAPSHOT
  
 # Path is relative to the sonar-project.properties file. Defaults to .
 #sonar.sources=./