Merge remote-tracking branch 'origin/dev' into dev

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmRoute.java

@@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 import java.io.Serializable;
 
 /**
@@ -46,4 +47,12 @@ public class AndonAlarmRoute extends BaseBean implements Serializable {
     @ApiParam("流程类型")
     private Integer routeType;
 
+    @Transient
+    @ApiParam("安灯类型名称")
+    private String alarmName;
+
+    @Transient
+    @ApiParam("流程名称")
+    private String routeName;
+
 }

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonRiteRoute.java

@@ -0,0 +1,58 @@
+package cn.estsh.i3plus.pojo.andon.bean;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.AndonEnumUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import java.io.Serializable;
+
+/**
+ * @Description : ANDON_上升流程配置
+ * @Reference :
+ * @Author : wangjie
+ * @CreateDate : 2019-05-13 9:53
+ * @Modify:
+ **/
+@Data
+@Entity
+@Table(name="ANDON_RITE_ROUTE")
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Api("ANDON_上升流程配置")
+public class AndonRiteRoute extends BaseBean  implements Serializable {
+
+    private static final long serialVersionUID = 5542314911937418047L;
+
+    @AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description")
+    @Column(name = "ALARM_CODE")
+    @ApiParam(value = "安灯类型")
+    private String alarmCode;
+
+    @AnnoOutputColumn(refClass = AndonEnumUtil.ANDON_ACTION_TAG.class,refForeignKey = "code",value = "description")
+    @Column(name = "ANDON_STATUS")
+    @ApiParam(value = "安灯状态")
+    private String andonStatus;
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam(value = "工作中心")
+    private String workCenterCode;
+
+    @Column(name = "MEMO")
+    @ApiParam(value = "备注")
+    private String memo;
+
+    @AnnoOutputColumn(hidden = true)
+    @Column(name = "WORK_CENTER_NAME_RDD")
+    @ApiParam(value = "工作中心名称")
+    private String workCenterNameRdd;
+}

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonRiteRouteDetail.java

@@ -0,0 +1,58 @@
+package cn.estsh.i3plus.pojo.andon.bean;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.AndonEnumUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import java.io.Serializable;
+
+/**
+ * @Description : ANDON_上升配置明细
+ * @Reference :
+ * @Author : wangjie
+ * @CreateDate : 2019-05-13 9:53
+ * @Modify:
+ **/
+@Data
+@Entity
+@Table(name="ANDON_RITE_ROUTE_DETAIL")
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Api("ANDON_上升配置明细")
+public class AndonRiteRouteDetail extends BaseBean  implements Serializable {
+
+    private static final long serialVersionUID = 8382210828244626428L;
+
+    @Column(name = "RITE_ROUTE_ID")
+    @ApiParam(value = "上升流程配置ID")
+    private Long riteRouteId;
+
+    @Column(name = "RP_WHERE")
+    @ApiParam(value = "通知时间")
+    private String rpWhere;
+
+    @AnnoOutputColumn(refClass = AndonEnumUtil.NOTICE_MESSAGE_SEND_TYPE.class,refForeignKey = "value",value = "description")
+    @Column(name = "RP_CODE")
+    @ApiParam(value = "通知方式代码")
+    private String rpCode;
+
+    @Column(name = "RP_OBJECT_CODE")
+    @ApiParam(value = "通知对象")
+    private String rpObjectCode;
+
+    @AnnoOutputColumn(refClass = AndonEnumUtil.NOTICE_MESSAGE_SEND_LEVEL.class,refForeignKey = "value",value = "description")
+    @Column(name = "RP_LEVEL")
+    @ApiParam(value = "通知级别")
+    private String rpLevel;
+
+}

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonActionModuleGroupModel.java

@@ -0,0 +1,36 @@
+package cn.estsh.i3plus.pojo.andon.model;
+
+import cn.estsh.i3plus.pojo.andon.bean.AndonAlarmRouteModuleParam;
+import cn.estsh.i3plus.pojo.andon.bean.AndonRouteModuleParam;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Description : 流程明细Model
+ * @Reference :
+ * @Author : wangjie
+ * @CreateDate : 2020-04-10 13:27
+ * @Modify:
+ **/
+@Data
+@Api("流程明细Model")
+public class AndonActionModuleGroupModel implements Serializable {
+
+    private static final long serialVersionUID = 2483914575357867288L;
+
+    @ApiParam("组件代码")
+    private String amCode;
+
+    @ApiParam("执行顺序")
+    private Integer seq;
+
+    @ApiParam("流程组件参数集合")
+    private List<AndonRouteModuleParam> routeModuleParamList;
+
+    @ApiParam("区域流程组件参数集合")
+    private List<AndonAlarmRouteModuleParam> alarmRouteModuleParamList;
+}

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonBussinessProcessModel.java

@@ -0,0 +1,35 @@
+package cn.estsh.i3plus.pojo.andon.model;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Description : 作业流程Model
+ * @Reference :
+ * @Author : wangjie
+ * @CreateDate : 2020-04-10 13:27
+ * @Modify:
+ **/
+@Data
+@Api("作业流程Model")
+public class AndonBussinessProcessModel implements Serializable {
+
+    private static final long serialVersionUID = 801986911134685985L;
+
+    @ApiParam("流程代码")
+    private String routeCode;
+
+    @ApiParam("GOJS位置")
+    private String position;
+
+    @ApiParam("流程明细Model集合")
+    private List<AndonProcessDetailModel> processDetailModelList;
+
+    @ApiParam("安灯流程ID")
+    private Long alarmRouteId;
+
+}

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonProcessDetailModel.java

@@ -0,0 +1,54 @@
+package cn.estsh.i3plus.pojo.andon.model;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Description : 流程明细Model
+ * @Reference :
+ * @Author : wangjie
+ * @CreateDate : 2020-04-10 13:27
+ * @Modify:
+ **/
+@Data
+@Api("流程明细Model")
+public class AndonProcessDetailModel implements Serializable {
+
+    private static final long serialVersionUID = 5240991498276455147L;
+
+    @ApiParam("状态代码")
+    private String statusCode;
+
+    @ApiParam("状态名称")
+    private String statusName;
+
+    @ApiParam("触发类型")
+    private Integer triggerType;
+
+    @ApiParam("触发条件（MVEL）")
+    private String triggerWhere;
+
+    @ApiParam("组件集MAP")
+    private Map<String, List<AndonActionModuleGroupModel>> actionModuleGroupMap;
+
+    @ApiParam("下个状态点MAP")
+    private Map<String, String> nextStatusMap;
+
+    @ApiParam("触发调用")
+    private Long actionAmgId;
+
+    @ApiParam("进入状态调用")
+    private Long inAmgId;
+
+    @ApiParam("离开状态调用")
+    private Long outAmgId;
+
+    @ApiParam("界面编号")
+    private String interfaceNo;
+
+}

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonRiteRouteDetailModel.java

@@ -0,0 +1,50 @@
+package cn.estsh.i3plus.pojo.andon.model;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description: 上升配置明细model
+ * @Reference:
+ * @Author: wangjie
+ * @CreateDate:2019-11-12-10:21
+ * @Modify:
+ **/
+@Data
+public class AndonRiteRouteDetailModel implements Serializable {
+
+    private static final long serialVersionUID = 1993963582174708808L;
+
+    @ApiParam(value = "安灯类型")
+    private String alarmCode;
+
+    @ApiParam(value = "安灯状态")
+    private String andonStatus;
+
+    @ApiParam(value = "工作中心")
+    private String workCenterCode;
+
+    @ApiParam(value = "备注")
+    private String memo;
+
+    @ApiParam(value = "工作中心名称")
+    private String workCenterNameRdd;
+
+    @ApiParam(value = "上升流程配置ID")
+    private Long riteRouteId;
+
+    @ApiParam(value = "通知时间")
+    private String rpWhere;
+
+    @ApiParam(value = "通知方式代码")
+    private String rpCode;
+
+    @ApiParam(value = "通知对象")
+    private String rpObjectCode;
+
+    @ApiParam(value = "通知级别")
+    private String rpLevel;
+
+}

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonActionModuleGroupRepository.java

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.andon.repository;
+
+import cn.estsh.i3plus.pojo.andon.bean.AndonActionModuleGroup;
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : wangjie
+ * @CreateDate : 2019-05-13 11:07
+ * @Modify:
+ **/
+@Repository
+public interface IAndonActionModuleGroupRepository extends BaseRepository<AndonActionModuleGroup, Long> {
+}

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonActionRouteRepository.java

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.andon.repository;
+
+import cn.estsh.i3plus.pojo.andon.bean.AndonActionRoute;
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : wangjie
+ * @CreateDate : 2019-05-13 11:07
+ * @Modify:
+ **/
+@Repository
+public interface IAndonActionRouteRepository extends BaseRepository<AndonActionRoute, Long> {
+}

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonAlarmRouteRepository.java

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.andon.repository;
+
+import cn.estsh.i3plus.pojo.andon.bean.AndonAlarmRoute;
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : wangjie
+ * @CreateDate : 2019-05-13 11:07
+ * @Modify:
+ **/
+@Repository
+public interface IAndonAlarmRouteRepository extends BaseRepository<AndonAlarmRoute, Long> {
+}

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonRiteRouteDetailRepository.java

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.andon.repository;
+
+import cn.estsh.i3plus.pojo.andon.bean.AndonRiteRouteDetail;
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : wangjie
+ * @CreateDate : 2019-04-02
+ * @Modify:
+ **/
+@Repository
+public interface IAndonRiteRouteDetailRepository extends BaseRepository<AndonRiteRouteDetail, Long> {
+}

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonRiteRouteRepository.java

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.andon.repository;
+
+import cn.estsh.i3plus.pojo.andon.bean.AndonRiteRoute;
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : wangjie
+ * @CreateDate : 2019-04-02
+ * @Modify:
+ **/
+@Repository
+public interface IAndonRiteRouteRepository extends BaseRepository<AndonRiteRoute, Long> {
+}

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonRouteModuleParamRepository.java

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.andon.repository;
+
+import cn.estsh.i3plus.pojo.andon.bean.AndonRouteModuleParam;
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : wangjie
+ * @CreateDate : 2019-05-13 11:07
+ * @Modify:
+ **/
+@Repository
+public interface IAndonRouteModuleParamRepository extends BaseRepository<AndonRouteModuleParam, Long> {
+}

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java

@@ -988,4 +988,66 @@ public class AndonHqlPack {
         }
         return packBean;
     }
+
+    /**
+     * 上升流程配置
+     * @param riteRoute
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean getAndonRiteRoute(AndonRiteRoute riteRoute, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(riteRoute, organizeCode);
+        if (!StringUtils.isEmpty(riteRoute.getAlarmCode())) {
+            DdlPreparedPack.getStringLikerPack(riteRoute.getAlarmCode(), "alarmCode", packBean);
+        }
+        if (!StringUtils.isEmpty(riteRoute.getAndonStatus())) {
+            DdlPreparedPack.getStringEqualPack(riteRoute.getAndonStatus(), "andonStatus", packBean);
+        }
+        if (!StringUtils.isEmpty(riteRoute.getWorkCenterCode())) {
+            DdlPreparedPack.getStringLikerPack(riteRoute.getWorkCenterCode(), "workCenterCode", packBean);
+        }
+        if (!StringUtils.isEmpty(riteRoute.getWorkCenterNameRdd())) {
+            DdlPreparedPack.getStringLikerPack(riteRoute.getWorkCenterNameRdd(), "workCenterNameRdd", packBean);
+        }
+        return packBean;
+    }
+
+    /**
+     * 上升配置明细
+     * @param riteRouteDetail
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean getAndonRiteRouteDetail(AndonRiteRouteDetail riteRouteDetail, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(riteRouteDetail, organizeCode);
+        if (!StringUtils.isEmpty(riteRouteDetail.getRiteRouteId())) {
+            DdlPreparedPack.getNumEqualPack(riteRouteDetail.getRiteRouteId(), "riteRouteId", packBean);
+        }
+        if (!StringUtils.isEmpty(riteRouteDetail.getRpCode())) {
+            DdlPreparedPack.getStringEqualPack(riteRouteDetail.getRpCode(), "rpCode", packBean);
+        }
+        if (!StringUtils.isEmpty(riteRouteDetail.getRpLevel())) {
+            DdlPreparedPack.getStringEqualPack(riteRouteDetail.getRpLevel(), "rpLevel", packBean);
+        }
+        if (!StringUtils.isEmpty(riteRouteDetail.getRpObjectCode())) {
+            DdlPreparedPack.getStringLikerPack(riteRouteDetail.getRpObjectCode(), "rpObjectCode", packBean);
+        }
+        return packBean;
+    }
+
+    public static DdlPackBean packHqlAndonActionRoute(AndonActionRoute actionRoute, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(actionRoute, organizeCode);
+        DdlPreparedPack.getStringLikerPack(actionRoute.getRouteCode(), "routeCode", packBean);
+        DdlPreparedPack.getStringLikerPack(actionRoute.getRouteName(), "routeName", packBean);
+        DdlPreparedPack.getNumEqualPack(actionRoute.getRouteType(), "routeType", packBean);
+        return packBean;
+    }
+
+    public static DdlPackBean packHqlAndonAlarmRoute(AndonAlarmRoute alarmRoute, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(alarmRoute, organizeCode);
+        DdlPreparedPack.getStringLikerPack(alarmRoute.getRouteCode(), "routeCode", packBean);
+        DdlPreparedPack.getStringLikerPack(alarmRoute.getAlarmCode(), "alarmCode", packBean);
+        DdlPreparedPack.getNumEqualPack(alarmRoute.getRouteType(), "routeType", packBean);
+        return packBean;
+    }
 }

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

@@ -13,6 +13,48 @@ import org.apache.commons.lang3.StringUtils;
 public class AndonEnumUtil {
 
     /**
+     * 状态机执行方法
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum ROUTE_STATUS_ACTION_TYPE {
+        TRIGGER("10", "trigger", "触发"),
+        ENTRY("20", "entry", "进入状态"),
+        EXIT("30", "exit", "离开状态");
+
+        private String value;
+        private String code;
+        private String description;
+
+        ROUTE_STATUS_ACTION_TYPE(String value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public static ROUTE_STATUS_ACTION_TYPE getByValue(String value) {
+            for (ROUTE_STATUS_ACTION_TYPE actionType : values()) {
+                if (actionType.getValue().equals(value)) {
+                    return actionType;
+                }
+            }
+            return null;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+    }
+
+
+    /**
      * 状态点界面编号
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
@@ -116,14 +158,14 @@ public class AndonEnumUtil {
      * 流程状态-触发类型
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum ROUTE_TRIGGER_TYPE {
+    public enum ROUTE_STATUS_TRIGGER_TYPE {
         INNER_TRIGGER(10, "内部触发"),
         OUTER_TRIGGER(20, "外部触发");
 
         private int value;
         private String description;
 
-        ROUTE_TRIGGER_TYPE(int value, String description) {
+        ROUTE_STATUS_TRIGGER_TYPE(int value, String description) {
             this.value = value;
             this.description = description;
         }
@@ -144,8 +186,7 @@ public class AndonEnumUtil {
     public enum ROUTE_STATUS_TYPE {
         START(10, "START", "开始状态"),
         EXECUTING(20, "EXECUTING", "执行中状态"),
-        TERMINATE(30, "TERMINATE", "中断状态"),
+        FINISH(30, "FINISH", "完成状态");
-        FINISH(40, "FINISH", "完成状态");
 
         private int value;
         private String code;

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

@@ -3117,7 +3117,9 @@ public class MesEnumUtil {
     public enum METHOD_TYPE {
 
         EXEC(10, "执行方法"),
-        COMPLETE(20, "完成方法");
+        COMPLETE(20, "完成方法"),
+        HNC_ISSUED(30,"队列自动下达"),
+        LABEL_PROPERTIES(40,"标签属性查询方法");
 
         private int value;
         private String description;

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

@@ -1812,7 +1812,8 @@ public class MesPcnEnumUtil {
         BH_ORDER(40, "B&H工单"),
         JIT_ORDER(50, "JIT工单"),
         STOCK_ORDER(60, "库存工单"),
-        REPAIR(70,"返修插单");
+        REPAIR(70,"返修插单"),
+        EMERGENCY_ORDER(80,"紧急插单");
 
         private int value;
         private String description;
@@ -3651,7 +3652,8 @@ public class MesPcnEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum QUEUE_ORDER_QUEUE_TYPE {
         PRODUCT_QUEUE(10, "生产队列"),
-        PRELOAD_QUEUE(20, "预装队列");
+        PRELOAD_QUEUE(20, "预装队列"),
+        FIRST_CELL_QUEUE(30, "首工位队列");
 
         private int value;
         private String description;
@@ -3680,4 +3682,40 @@ public class MesPcnEnumUtil {
         }
     }
 
+
+    /**
+     * 数据复核 校验模式
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum VERIFY_MODE {
+        PART_NO("10", "按物料号匹配"),
+        WORK_CENTER_CODE("20", "按产线匹配");
+
+        private String value;
+        private String description;
+
+        VERIFY_MODE(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(String val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value.equals(val)) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
 }

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

@@ -137,7 +137,7 @@ public class PtlEnumUtil {
      * 状态机执行方法
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum ROUTE_EVENT {
+    public enum ROUTE_STATUS_ACTION_TYPE {
         TRIGGER("10", "trigger", "触发"),
         ENTRY("20", "entry", "进入状态"),
         EXIT("30", "exit", "离开状态");
@@ -146,16 +146,16 @@ public class PtlEnumUtil {
         private String code;
         private String description;
 
-        ROUTE_EVENT(String value, String code, String description) {
+        ROUTE_STATUS_ACTION_TYPE(String value, String code, String description) {
             this.value = value;
             this.code = code;
             this.description = description;
         }
 
-        public static ROUTE_EVENT getByValue(String value) {
+        public static ROUTE_STATUS_ACTION_TYPE getByValue(String value) {
-            for (ROUTE_EVENT routeEvent : values()) {
+            for (ROUTE_STATUS_ACTION_TYPE actionType : values()) {
-                if (routeEvent.getValue().equals(value)) {
+                if (actionType.getValue().equals(value)) {
-                    return routeEvent;
+                    return actionType;
                 }
             }
             return null;

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

@@ -553,7 +553,7 @@ public class PtlPcnEnumUtil {
      * 状态机执行方法
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum ROUTE_EVENT {
+    public enum ROUTE_STATUS_ACTION_TYPE {
         TRIGGER("10", "trigger", "触发"),
         ENTRY("20", "entry", "进入状态"),
         EXIT("30", "exit", "离开状态");
@@ -562,7 +562,7 @@ public class PtlPcnEnumUtil {
         private String code;
         private String description;
 
-        ROUTE_EVENT(String value, String code, String description) {
+        ROUTE_STATUS_ACTION_TYPE(String value, String code, String description) {
             this.value = value;
             this.code = code;
             this.description = description;

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

@@ -6836,17 +6836,79 @@ public class WmsEnumUtil {
     }
 
 
+
+    /**
+     * 仓库健康指标等级
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum HEALTH_INDICATOR_LEVEL {
+        HEALTH(10, "HEALTH", "健康"),
+        SUB_HEALTH(20, "SUB_HEALTH", "亚健康"),
+        NO_HEALTH(30, "NO_HEALTH", "不健康");
+        private int value;
+        private String code;
+        private String description;
+
+        HEALTH_INDICATOR_LEVEL(int value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public static String valueOf(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 String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+
+        public static int descriptionOfValue(String desc) {
+            return descOf(desc);
+        }
+
+
+        public static int descOf(String desc) {
+            int tmp = 1;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(desc)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+    }
+
+
     /**
-     * BH检测结果
+     * 软适配数据类型
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum BH_TEST_RESULT_STATUS {
+    public enum SOFT_DATA_FORM {
-        NORMAL(10, "NORMAL", "合格"), ABNORMAL(20, "ABNORMAL", "不合格");
+        XML(10, "XML", "XML"), JSON(20, "JSON", "JSON");
         private int value;
         private String code;
         private String description;
 
-        BH_TEST_RESULT_STATUS(int value, String code, String description) {
+        SOFT_DATA_FORM(int value, String code, String description) {
             this.value = value;
             this.code = code;
             this.description = description;
@@ -6893,7 +6955,7 @@ public class WmsEnumUtil {
             return tmp;
         }
 
-        public static BH_TEST_RESULT_STATUS codeOf(Integer value) {
+        public static SOFT_DATA_FORM codeOf(Integer value) {
             if (value == null) {
                 return null;
             } else {
@@ -6908,18 +6970,22 @@ public class WmsEnumUtil {
     }
 
     /**
-     * 仓库健康指标等级
+     * 产品条码事务类型
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum HEALTH_INDICATOR_LEVEL {
+    public enum BACTH_TRANS_TYPE {
-        HEALTH(10, "HEALTH", "健康"),
+        REPORT(10, "REPORT", "报工"),
-        SUB_HEALTH(20, "SUB_HEALTH", "亚健康"),
+        UNTYING(20, "UNTYING", "解绑"),
-        NO_HEALTH(30, "NO_HEALTH", "不健康");
+        CHECK(30, "CHECK", "检测"),
+        PICK(40, "REPAIR", "挑选"),
+        REPAIR(50, "REPAIR", "返修"),
+        BIND(60, "BIND", "绑定"),
+        OUTSTOCK(70, "OUTSTOCK", "出库");
         private int value;
         private String code;
         private String description;
 
-        HEALTH_INDICATOR_LEVEL(int value, String code, String description) {
+        BACTH_TRANS_TYPE(int value, String code, String description) {
             this.value = value;
             this.code = code;
             this.description = description;
@@ -6965,5 +7031,139 @@ public class WmsEnumUtil {
             }
             return tmp;
         }
+
+        public static BACTH_TRANS_TYPE codeOf(Integer value) {
+            if (value == null) {
+                return null;
+            } else {
+                for (int i = 0; i < values().length; i++) {
+                    if (values()[i].value == value) {
+                        return values()[i];
+                    }
+                }
+            }
+            return null;
+        }
+    }
+
+    /**
+     * 业务表：BH类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum BH_TYPE {
+        HOLD_LOCATE(10, "hold库位"),
+        QUALITY_CONTROL(20, "质检中"),
+        PRE_INSTOCK(30, "待入库");
+
+        private int value;
+        private String description;
+
+        BH_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOf(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 desc) {
+            Integer tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(desc)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * BH库位类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum BH_LOCATE_TYPE {
+        HOLD(10, "HOLD", "HOLD库位"),
+        WAIT_CHECK(20, "WAIT_CHECK", "待检测库位"),
+        WAIT_OUT(30, "WAIT_OUT", "待出库库位");
+
+        private int value;
+        private String code;
+        private String description;
+
+        BH_LOCATE_TYPE(int value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public static String valueOf(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 String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+
+        public static int descriptionOfValue(String desc) {
+            return descOf(desc);
+        }
+
+
+        public static int descOf(String desc) {
+            int tmp = 1;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(desc)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+
+        public static BH_LOCATE_TYPE codeOf(Integer value) {
+            if (value == null) {
+                return null;
+            } else {
+                for (int i = 0; i < values().length; i++) {
+                    if (values()[i].value == value) {
+                        return values()[i];
+                    }
+                }
+            }
+            return null;
+        }
     }
 }

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java

@@ -569,7 +569,7 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
     @Override
     public int listCount() {
         try{
-            Long count = entityManager.createQuery("select count(distinct model) from " + persistentClass.getName() + " as model",Long.class)
+            Long count = entityManager.createQuery("select count(model) from " + persistentClass.getName() + " as model",Long.class)
                     .getSingleResult();
             return count == null ? 0 : count.intValue();
         }catch(NoResultException e){
@@ -580,7 +580,7 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
     @Override
     public int findByPropertyCount(String propertyName, Object value) {
         try{
-            String queryString = "select count(distinct model) from " + persistentClass.getName() + " as model where model." + propertyName + "= :" + propertyName;
+            String queryString = "select count(model) from " + persistentClass.getName() + " as model where model." + propertyName + "= :" + propertyName;
             Long count = entityManager.createQuery(queryString, Long.class)
                     .setParameter(propertyName, value)
                     .getSingleResult();
@@ -612,7 +612,7 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
             throw new IllegalArgumentException("参数名的数量和参数值不匹配!propertyNames:" + propertyNames.length + ",values:" + values.length);
         }
         StringBuffer queryString = new StringBuffer();
-        queryString.append("select count(distinct model) from " + persistentClass.getName() + " as model");
+        queryString.append("select count(model) from " + persistentClass.getName() + " as model");
 
         int size = propertyNames.length;
         if (size > 0) {
@@ -755,7 +755,7 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
             throw new IllegalArgumentException("参数名的数量和参数值不匹配!propertyNames:" + propertyNames.length + ",values:" + values.length);
         }
         StringBuffer queryString = new StringBuffer();
-        queryString.append("select count(distinct model) from " + persistentClass.getSimpleName() + " as model where 1=1 ");
+        queryString.append("select count(model) from " + persistentClass.getSimpleName() + " as model where 1=1 ");
 
         if (hqlWhere != null && hqlWhere.length() > 0) {
             queryString.append(hqlWhere);
@@ -859,7 +859,7 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
     @Override
     public int findByHqlWhereCount(String hqlWhere) {
         StringBuffer queryString = new StringBuffer();
-        queryString.append("select count(distinct model) from " + persistentClass.getSimpleName() + " as model where 1=1 ");
+        queryString.append("select count(model) from " + persistentClass.getSimpleName() + " as model where 1=1 ");
 
         if (hqlWhere != null && hqlWhere.length() > 0) {
             queryString.append(hqlWhere);
@@ -875,7 +875,7 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
     @Override
     public int findByHqlWhereCount(DdlPackBean packBean) {
         StringBuffer queryString = new StringBuffer();
-        queryString.append("select count(distinct model) from " + persistentClass.getSimpleName()
+        queryString.append("select count(model) from " + persistentClass.getSimpleName()
                 + " as model where 1=1 " + packBean.getWhereAppend());
 
         Query query = entityManager.createQuery(queryString.toString(), Long.class);

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java

@@ -300,6 +300,16 @@ public class DdlPreparedPack {
     }
 
     /**
+     * 判断字段为空
+     *
+     * @param columnName 列名
+     * @param packBean
+     */
+    public static void getStringNullPack(String columnName, DdlPackBean packBean) {
+        packBean.addColumnQuery(null, " and ( model." + columnName +
+                " is  null or  model." + columnName + " ='')", null);
+    }
+    /**
      * 封装String对象成equal语句
      *
      * @param columnName 列名
@@ -668,6 +678,28 @@ public class DdlPreparedPack {
     }
 
     /**
+     * 为空查询
+     *
+     * @param columnName
+     * @param packBean
+     */
+    public static void getIsNull(String columnName, DdlPackBean packBean) {
+        packBean.addColumnQuery(columnName, " and (model." + columnName + " is null or model." + columnName + " = '')", null);
+
+    }
+
+    /**
+     * 不为空查询
+     *
+     * @param columnName
+     * @param packBean
+     */
+    public static void getIsNotNull(String columnName, DdlPackBean packBean) {
+        packBean.addColumnQuery(columnName, " and (model." + columnName + " is not null and model." + columnName + " != '')", null);
+
+    }
+
+    /**
      * 转换排序列
      *
      * @param columnName 列名

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

@@ -46,4 +46,8 @@ public class MesCachaQueue extends BaseBean implements Serializable {
     @ApiParam("物料号")
     private String partNo;
 
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("生产线")
+    private String workCenterCode;
+
 }

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

@@ -42,6 +42,10 @@ public class MesLabelTemplate extends BaseBean implements Serializable {
     @ApiParam(value = "模板内容")
     private String templateContent;
 
+    @Column(name = "METHOD_CODE")
+    @ApiParam("方法代码")
+    private String methodCode;
+
     @ApiParam(value = "第二个模板内容")
     private String otherTemplateContent;
 

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

@@ -132,6 +132,14 @@ public class MesProduceSn extends BaseBean implements Serializable {
     @ApiParam("操作类型")
     private Integer operateType;
 
+    @Column(name = "PROCESS_LABEL_TEMPLATE")
+    @ApiParam("过程标签模板")
+    private String processLabelTemplate;
+
+    @Column(name = "PROD_LABEL_TEMPLATE")
+    @ApiParam("产品标签模板")
+    private String prodLabelTemplate;
+
 //    @Version
 //    @Column(name = "LOCK_VERSION")
 //    @ApiParam(value = "乐观锁", example = "1")

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

@@ -42,4 +42,8 @@ public class MesQcOrderAccessory extends BaseBean  implements Serializable {
     @Column(name = "ACCESSORY_URL")
     @ApiParam("附件路径")
     private String accessoryUrl;
+
+    @Column(name = "FASTDFS_URL")
+    @ApiParam("fastDfs地址")
+    private String fastdfsUrl;
 }

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

@@ -4,8 +4,7 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import cn.estsh.i3plus.pojo.mes.model.MesButtonFlagModel;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
-import lombok.Data;
+import lombok.*;
-import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
@@ -28,12 +27,13 @@ import java.io.Serializable;
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
 @Table(name = "MES_QUEUE_JIT_ACTUAL")
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
 @Api("MES_客户JIT生产队列")
 public class MesQueueJitActual extends BaseBean implements Serializable {
-
     private static final long serialVersionUID = 655875369308810110L;
 
-
     @Column(name = "JIS_ACTUAL_NO")
     @ApiParam("队列编号")
     private String jisActualNo;
@@ -71,7 +71,7 @@ public class MesQueueJitActual extends BaseBean implements Serializable {
     private String custCode;
 
     @Column(name = "CUST_PLANT_CODE")
-    @ApiParam("客户产线代码")
+    @ApiParam("客户工厂代码")
     private String custPlantCode;
 
     @Column(name = "MEMO")
@@ -86,6 +86,38 @@ public class MesQueueJitActual extends BaseBean implements Serializable {
     @ApiParam("JIT排序号")
     private String jitSeq;
 
+    @Column(name = "SUPPLIER_CODE")
+    @ApiParam("供应商代码")
+    private String supplierCode;
+
+    @Column(name = "SUPPLIER_NAME")
+    @ApiParam("供应商名称")
+    private String supplierName;
+
+    @Column(name = "VEHICLE_CODE")
+    @ApiParam("车型代码")
+    private String vehicleCode;
+
+    @Column(name = "VEHICLE_NAME")
+    @ApiParam("车型名称")
+    private String vehicleName;
+
+    @Column(name = "MODEL_YEAR")
+    @ApiParam("年度型")
+    private String modelYear;
+
+    @Column(name = "CAR_MODEL_CODE")
+    @ApiParam("车系编号")
+    private String carModelCode;
+
+    @Column(name = "CAR_SERIES")
+    @ApiParam("车系名称")
+    private String carSeries;
+
+    @Column(name = "CUST_PROD_LINE_CODE")
+    @ApiParam("客户产线代码")
+    private String custProdLineCode;
+
     @Transient
     @ApiParam("客户需求开始时间")
     private String custPointStartDate;

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

@@ -0,0 +1,62 @@
+package cn.estsh.i3plus.pojo.mes.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.*;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import java.io.Serializable;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : joke
+ * @CreateDate : 2020-03-06 10:01 上午
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_QUEUE_JIT_ACTUAL_BOM")
+@Api("客户JIT生产队列散件清单")
+public class MesQueueJitActualBom extends BaseBean implements Serializable {
+    private static final long serialVersionUID = 1604529847020812472L;
+
+    @Column(name = "JIS_ACTUAL_NO")
+    @ApiParam("队列编号")
+    private String jisActualNo;
+
+    @Column(name = "ASSY_NO")
+    @ApiParam("组件编号")
+    private String assyNo;
+
+    @Column(name = "PRODUCE_CTGY_CODE")
+    @ApiParam("产品位置代码")
+    private String produceCtgyCode;
+
+    @Column(name = "CUST_PART_NO")
+    @ApiParam("客户物料号")
+    private String custPartNo;
+
+    @Column(name = "PART_NO")
+    @ApiParam("物料号")
+    private String partNo;
+
+    @Column(name = "QTY")
+    @ApiParam("用量")
+    private Double qty = 0d;
+
+    @Column(name = "PART_COLOR_VALUE")
+    @ApiParam("零件色值")
+    private String partColorValue;
+}

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

@@ -3,8 +3,7 @@ package cn.estsh.i3plus.pojo.mes.bean;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
-import lombok.Data;
+import lombok.*;
-import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
@@ -26,6 +25,9 @@ import java.io.Serializable;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
 @Table(name = "MES_QUEUE_JIT_ACTUAL_DETAIL")
 @Api("MES_客户JIT生产队列明细")
 public class MesQueueJitActualDetail extends BaseBean implements Serializable {
@@ -47,6 +49,10 @@ public class MesQueueJitActualDetail extends BaseBean implements Serializable {
     @ApiParam("产品位置代码")
     private String produceCtgyCode;
 
+    @Column(name = "PRODUCE_CTGY_Name")
+    @ApiParam("产品位置名称")
+    private String produceCtgyName;
+
     @Transient
     @ApiParam("产品位置")
     private String prodCfgName;
@@ -67,11 +73,23 @@ public class MesQueueJitActualDetail extends BaseBean implements Serializable {
     @ApiParam("分组序号")
     private String groupSeq;
 
-    @Column(name = "status")
+    @Column(name = "STATUS")
     @ApiParam("状态")
     private Integer status;
 
-    @Column(name = "seq")
+    @Column(name = "SEQ")
     @ApiParam("主序编号")
     private String seq;
+
+    @Column(name = "PRODUCE_COLOR")
+    @ApiParam("产品颜色")
+    private String produceColor;
+
+    @Column(name = "OPTION_CODE")
+    @ApiParam("选项代码")
+    private String optionCode;
+
+    @Column(name = "ASSY_NO")
+    @ApiParam("组件编号")
+    private String assyNo;
 }

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

@@ -100,6 +100,18 @@ public class MesQueueOrder extends BaseBean implements Serializable {
     @ApiParam("客户JIT队列编号")
     private String jitActualNo;
 
+    @Column(name = "PROD_CFG_TYPE_CODE")
+    @ApiParam("项目代码")
+    private String prodCfgTypeCode;
+
+    @Column(name = "MODEL_YEAR")
+    @ApiParam("年度型")
+    private String modelYear;
+
+    @Column(name = "GRADE_CODE")
+    @ApiParam("等级代码")
+    private String gradeCode;
+
     @Transient
     @ApiParam("起始车号")
     private String custFlagNoStart;

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

@@ -0,0 +1,60 @@
+package cn.estsh.i3plus.pojo.mes.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import java.io.Serializable;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: jessica.chen
+ * @CreateDate: 2019\11\15 10:01
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_QUEUE_ORDER_BOM")
+@Api("MES_生产队列散件清单")
+public class MesQueueOrderBom extends BaseBean  implements Serializable {
+
+    private static final long serialVersionUID = -5412635747424111476L;
+    @Column(name = "ORDER_NO")
+    @ApiParam("主队列编号")
+    private String orderNo;
+
+    @Column(name = "VIN_CODE")
+    @ApiParam("Vin")
+    private String vinCode;
+
+    @Column(name = "ASSY_NO")
+    @ApiParam("组件编号")
+    private String assyNo;
+
+    @Column(name = "PRODUCE_CTGY_CODE")
+    @ApiParam("产品位置代码")
+    private String produceCtgyCode;
+
+    @Column(name = "PART_NO")
+    @ApiParam("物料号")
+    private String partNo;
+
+    @Column(name = "QTY")
+    @ApiParam("用量")
+    private Double qty = 0d;
+
+    @Column(name = "COLOR_CODE")
+    @ApiParam("颜色代码")
+    private String colorCode;
+}

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

@@ -86,7 +86,7 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable {
 
     @Column(name = "IS_GROUP_PRINTED")
     @ApiParam("料架是否已打印")
-    private Integer isGroupPrinted;
+    private Integer isGroupPrinted = 2;
 
     @Transient
     @ApiParam("队列序号")
@@ -96,6 +96,70 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable {
     @ApiParam("已生产数量")
     private Double finsihQty;
 
+    @Column(name = "PRODUCE_COLOR")
+    @ApiParam("产品颜色")
+    private String produceColor;
+
+    @Column(name = "OPTION_CODE")
+    @ApiParam("选项代码")
+    private String optionCode;
+
+    @Column(name = "ASSY_NO")
+    @ApiParam("组件编号")
+    private String assyNo;
+
+    @Transient
+    @ApiParam("Vin")
+    private String vinCode;
+
+    @Transient
+    @ApiParam("条码状态")
+    private Integer snStatus;
+
+    @Transient
+    @ApiParam("开始时间")
+    private String startTime;
+
+    @Transient
+    @ApiParam("结束时间")
+    private String endTime;
+
+    @Transient
+    @ApiParam("过程标签模板")
+    private String processLabelTemplate;
+
+    @Transient
+    @ApiParam("产品标签模板")
+    private String prodLabelTemplate;
+
+    @Transient
+    @ApiParam("等级代码")
+    private String gradeCode;
+
+    @Transient
+    @ApiParam("标志值集合")
+    private String flagValueList;
+
+    @Transient
+    @ApiParam("质量标志值")
+    private String qcFlagValue;
+
+    @Transient
+    @ApiParam("3C认证编码")
+    private String cccCode;
+
+    @Transient
+    @ApiParam("条码标签描述")
+    private String labelDesc;
+
+    @Transient
+    @ApiParam("打印时间")
+    private String printTime;
+
+    @Transient
+    @ApiParam("年度型")
+    private String modelYear;
+
     public double getQueueSeqVal() {
         return this.queueSeq == null ? 0.0d : this.queueSeq;
     }
@@ -120,4 +184,25 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable {
         this.seq = seq;
         this.serialNumber = serialNumber;
     }
+
+    public MesQueueOrderDetail(String orderNo, String vinCode, String partNo, String partNameRdd, String produceCategoryCode,
+                            Integer status, String serialNumber, Double seq, Integer isGroupPrinted, String createDatetime,
+                            String processLabelTemplate, String prodLabelTemplate,String optionCode,String produceColor,String gradeCode,String assyNo) {
+        this.orderNo = orderNo;
+        this.vinCode = vinCode;
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.produceCategoryCode = produceCategoryCode;
+        this.status = status;
+        this.serialNumber = serialNumber;
+        this.seq = seq;
+        this.isGroupPrinted = isGroupPrinted;
+        this.createDatetime = createDatetime;
+        this.processLabelTemplate = processLabelTemplate;
+        this.prodLabelTemplate = prodLabelTemplate;
+        this.optionCode = optionCode;
+        this.produceColor = produceColor;
+        this.gradeCode = gradeCode;
+        this.assyNo = assyNo;
+    }
 }

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

@@ -75,4 +75,15 @@ public class MesQueueShipping extends BaseBean implements Serializable {
     @ApiParam("客户JIT队列编号")
     private String jitActualNo;
 
+    @Column(name = "PROD_CFG_TYPE_CODE")
+    @ApiParam("项目代码")
+    private String prodCfgTypeCode;
+
+    @Column(name = "MODEL_YEAR")
+    @ApiParam("年度型")
+    private String modelYear;
+
+    @Column(name = "GRADE_CODE")
+    @ApiParam("等级代码")
+    private String gradeCode;
 }

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

@@ -126,6 +126,10 @@ public class MesStationBom extends BaseBean implements Serializable {
     @ApiParam("半成品条码")
     private String halfProductSn;
 
+    @Transient
+    @ApiParam("主任务编号")
+    private String orderNo;
+
     public double getQtyVal() {
         return this.qty == null ? 0.0d : this.qty;
     }

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

@@ -99,6 +99,9 @@ public class MesPlcModel implements Serializable {
     @ApiParam("PLC类型")
     private Integer plcType;
 
+    @ApiParam("默认赋值属性")
+    private String defaultRule;
+
     public MesPlcModel() {
 
     }
@@ -106,7 +109,7 @@ 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 workCenterCode, String workCellCode, String plcCfg, String analysisRule, String isAnalysis, String device, String objectCode, String opcUrl, Integer plcType, String defaultRule) {
         this.id = id;
         this.equipmentCode = equipmentCode;
         this.equipmentName = equipmentName;
@@ -135,5 +138,6 @@ public class MesPlcModel implements Serializable {
         this.objectCode = objectCode;
         this.opcUrl = opcUrl;
         this.plcType = plcType;
+        this.defaultRule = defaultRule;
     }
 }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueJitActualBomRepository.java

@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesQueueJitActualBom;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @author Wynne.Lu
+ * @date 2020/5/21 20:17
+ * @desc
+ */
+@Repository
+public interface MesQueueJitActualBomRepository extends BaseRepository<MesQueueJitActualBom, Long> {
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueOrderBomRepository.java

@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesQueueOrderBom;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: joke.wang
+ * @CreateDate: 2019\11\18 10:34
+ * @Modify:
+ **/
+public interface MesQueueOrderBomRepository extends BaseRepository<MesQueueOrderBom, Long> {
+}

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

@@ -456,4 +456,28 @@ public class MesPcnHqlPack {
         }
         return packBean;
     }
+
+    /**
+     * 数据对象
+     *
+     * @param mesDataObject
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean getMesDataObject(MesDataObject mesDataObject, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(mesDataObject, organizeCode);
+        if (!StringUtils.isEmpty(mesDataObject.getObjectCode())) {
+            DdlPreparedPack.getStringLikerPack(mesDataObject.getObjectCode(), "objectCode", packBean);
+        }
+        if (!StringUtils.isEmpty(mesDataObject.getObjectName())) {
+            DdlPreparedPack.getStringLikerPack(mesDataObject.getObjectName(), "objectName", packBean);
+        }
+        if (mesDataObject.getOperateType() != null) {
+            DdlPreparedPack.getNumEqualPack(mesDataObject.getOperateType(), "operateType", packBean);
+        }
+        if (!StringUtils.isEmpty(mesDataObject.getFieldPk())) {
+            DdlPreparedPack.getStringLikerPack(mesDataObject.getFieldPk(), "fieldPk", packBean);
+        }
+        return packBean;
+    }
 }

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

@@ -0,0 +1,49 @@
+package cn.estsh.i3plus.pojo.wms.bean;
+
+import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Description : BH检测大类表
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2020-05-23
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "QMS_CHECK_TYPE")
+@Api("物料子检测项")
+public class QmsCheckType extends BaseBean {
+
+    private static final long serialVersionUID = -4867744538301370899L;
+
+    @Column(name = "CHECK_TYPE_CODE")
+    @ApiParam("检测大类代码")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
+    private String checkTypeCode;
+
+    @Column(name = "CHECK_TYPE_NAME")
+    @ApiParam("检测大类名称")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
+    private String checkTypeName;
+
+    @Column(name = "REMARK")
+    @ApiParam("备注")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
+    private String remark;
+}

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

@@ -0,0 +1,46 @@
+package cn.estsh.i3plus.pojo.wms.bean;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Description : BH库存条码扩展表
+ * @Reference :
+ * @Author : jimmy.zeng
+ * @CreateDate : 2020-05-22 13:22
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="QMS_STOCK_SN_EXT_BH")
+@Api("BH检测大类表")
+public class QmsStockSnExtBh extends BaseBean {
+
+    @Column(name="sn")
+    @ApiParam("条码")
+    private String sn;
+
+    @Column(name="BATCH_NO")
+    @ApiParam("BATCH号")
+    private String batchNo;
+
+    @Column(name="BH_TYPE")
+    @ApiParam("BH类型")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.FG_INSTOCK_SN_TYPE.class)
+    private Integer bhType;
+
+}

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

@@ -31,10 +31,6 @@ import javax.persistence.Table;
 public class WmsBhChildDetectionItem extends BaseBean {
 
     private static final long serialVersionUID = -8005468634643773682L;
-    @Column(name = "CHECK_TYPE")
-    @ApiParam("检测大类")
-    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "BH_CHECK_TYPE")
-    private Integer checkType;
 
     @Column(name = "ITEM_CHECK_CODE")
     @ApiParam("子检测项代码")

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

@@ -156,6 +156,15 @@ dataSrc ="cn.estsh.i3plus.pojo.wms.bean.WmsZones",
     @ApiParam(value = "三维位置")
     private String position;
 
+    /**
+     * BH库位类型:10:HOLD库位；20：待检测库位；30:待出库库位
+     */
+    @Column(name = "BH_LOCATE_TYPE")
+    @ApiParam(value = "BH库位类型")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "BH_LOCATE_TYPE")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.BH_LOCATE_TYPE.class, refForeignKey = "value", value = "description")
+    private Integer bhLocateType;
+
     // 导入用
     @ApiParam(value = "工厂")
     @Transient

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

@@ -272,7 +272,6 @@ public class WmsPart extends BaseBean {
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
     private Double curingTime = 0d;
 
-
     @Column(name = "IS_RECYCLE", columnDefinition = "int default 2", nullable = false)
     @ApiParam(value = "是否回收", example = "2")
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "TRUE_OR_FALSE")

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

@@ -46,10 +46,10 @@ public class WmsPartCheckType extends BaseBean {
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
     private String partName;
 
-    @Column(name = "CHECK_TYPE")
+    @Column(name = "CHECK_TYPE_CODE")
     @ApiParam("检测大类")
-    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "BH_CHECK_TYPE")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
-    private Integer checkType;
+    public String checkTypeCode;
 
     @Column(name = "SAMPLE_SIZE")
     @ApiParam("样本数")

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

@@ -41,10 +41,10 @@ public class WmsPartItemCheck extends BaseBean {
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
     private String partNo;
 
-    @Column(name = "CHECK_TYPE")
+    @Column(name = "CHECK_TYPE_CODE")
     @ApiParam("检测大类")
-    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "BH_CHECK_TYPE")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
-    private Integer checkType;
+    public String checkTypeCode;
 
     @Column(name = "CHECK_ITEM_CODE")
     @ApiParam("子检测项代码")

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

@@ -0,0 +1,91 @@
+package cn.estsh.i3plus.pojo.wms.bean;
+
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
+import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.ColumnDefault;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Index;
+import javax.persistence.Table;
+
+/**
+ * @Description : 产品条码信息
+ * @Reference :
+ * @Author : puxiao.liao
+ * @CreateDate : 2020-05-23 11:00
+ * @Modify:
+ **/
+@Data
+@Entity
+@Table(name = "WMS_SERIAL_SN", indexes = {
+        @Index(columnList = "BATCH_NO"),
+        @Index(columnList = "STOCK_SN"),
+        @Index(columnList = "PART_NO"),
+        @Index(columnList = "SERIAL_SN")
+})
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Api(value = "产品条码信息", description = "产品条码信息")
+public class WmsSerialSn extends BaseBean {
+
+    private static final long serialVersionUID = -2540413299274882785L;
+
+    @Column(name = "BATCH_NO")
+    @ApiParam(value = "BATCH号")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String batchNo;
+
+    @Column(name = "STOCK_SN")
+    @ApiParam(value = "库存条码")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String stockSn;
+
+    @Column(name = "SERIAL_SN")
+    @ApiParam(value = "产品条码")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String serialSn;
+
+    @Column(name = "SRC_STOCK_SN")
+    @ApiParam(value = "源库存条码")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String srcStockSn;
+
+    @Column(name = "BH_TYPE")
+    @ApiParam(value = "BH类型")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.FG_INSTOCK_SN_TYPE.class)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "FG_INSTOCK_SN_TYPE")
+    private Integer bhType;
+
+    @Column(name = "PART_NO")
+    @ApiParam(value = "物料编号")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
+            dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsPart",
+            searchColumnName = "partNo,partName", listColumnName = "partNo,partName", explicitColumnName = "partNo")
+    private String partNo;
+
+    @Column(name = "PART_NAME_RDD")
+    @ApiParam(value = "物料名称")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
+            dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsPart",
+            searchColumnName = "partNo,partName", listColumnName = "partNo,partName", explicitColumnName = "partName")
+    private String partNameRdd;
+
+
+    @Column(name = "QTY", columnDefinition = "decimal(18,8)", nullable = false)
+    @ColumnDefault("0")
+    @ApiParam(value = "数量", example = "0")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
+    private Double qty;
+}

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

@@ -0,0 +1,103 @@
+package cn.estsh.i3plus.pojo.wms.bean;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
+import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import javax.persistence.Transient;
+import java.util.List;
+
+/**
+ * @Description :  产品条码事务表
+ * @Reference :
+ * @Author : jimmy.zeng
+ * @CreateDate : 2020-05-22 9:42
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="WMS_SERIAL_SN_TRANS")
+@Api("产品条码事务表")
+public class WmsSerialSnTrans extends BaseBean {
+
+    @Column(name = "BATCH_NO")
+    @ApiParam(value = "BATCH号")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String batchNo;
+
+    @Column(name="SERIAL_SN")
+    @ApiParam("产品条码")
+    private String serialSn;
+
+    @Column(name="BH_TYPE")
+    @ApiParam("BH类型")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "FG_INSTOCK_SN_TYPE")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.FG_INSTOCK_SN_TYPE.class, refForeignKey = "value", value = "description")
+    private Integer bhType;
+
+    @Column(name = "PART_NO")
+    @ApiParam(value = "物料编号")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
+            dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsPart",
+            searchColumnName = "partNo,partName", listColumnName = "partNo,partName", explicitColumnName = "partNo")
+    private String partNo;
+
+    @Column(name = "PART_NAME_RDD")
+    @ApiParam(value = "物料名称")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
+            dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsPart",
+            searchColumnName = "partNo,partName", listColumnName = "partNo,partName", explicitColumnName = "partName")
+    private String partNameRdd;
+
+    @Column(name="SRC_STOCK_SN")
+    @ApiParam("源库存条码")
+    private String srcStockSn;
+
+    @Column(name="DEST_STOCK_SN")
+    @ApiParam("目标库存条码")
+    private String destStockSn;
+
+    @Column(name="TRANS_TYPE")
+    @ApiParam("操作类型")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "BACTH_TRANS_TYPE")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.BACTH_TRANS_TYPE.class, refForeignKey = "value", value = "description")
+    private Integer transType;
+
+    @Column(name = "IS_OK")
+    @ApiParam(value = "是否合格")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRUE_OR_FALSE")
+    private Integer isOk;
+
+    @Transient
+    @ApiParam("操作类型")
+    private List<Integer> transTypeLst;
+
+    public WmsSerialSnTrans(WmsSerialSn wmsSerialSn, Integer transType) {
+        this.organizeCode = wmsSerialSn.getOrganizeCode();
+        this.batchNo = wmsSerialSn.getBatchNo();
+        this.serialSn = wmsSerialSn.getSerialSn();
+        this.bhType = wmsSerialSn.getBhType();
+        this.partNo = wmsSerialSn.getPartNo();
+        this.partNameRdd = wmsSerialSn.getPartNameRdd();
+        this.destStockSn = wmsSerialSn.getStockSn();
+        this.transType = transType;
+    }
+
+    public WmsSerialSnTrans() {
+    }
+}

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

@@ -410,7 +410,7 @@ public class WmsStockSn extends BaseBean {
 
     @Transient
     @ApiParam("大检测项类型")
-    public Integer checkType;
+    public String checkTypeCode;
 
     @Transient
     @ApiParam("样本数")
@@ -592,4 +592,28 @@ public class WmsStockSn extends BaseBean {
         this.modifyDatetime = modifyDatetime;
     }
 
+
+    public WmsStockSn(WmsStockSn stockSn, String batchCode) {
+        this.organizeCode = stockSn.getOrganizeCode();
+        this.refSrc = stockSn.getRefSrc();
+        this.partNo = stockSn.getPartNo();
+        this.partNameRdd = stockSn.getPartNameRdd();
+        this.snType = stockSn.getSnType();
+        this.locateNo = stockSn.getLocateNo();
+        this.workCenterCode = stockSn.getWorkCenterCode();
+        this.packageNo = stockSn.getPackageNo();
+        this.shippingFlag = stockSn.getShippingFlag();
+        this.lotNo = stockSn.getLotNo();
+        this.dateCode = stockSn.getDateCode();
+        this.fixLotNo = stockSn.getFixLotNo();
+        this.leftCode = stockSn.getLeftCode();
+        this.qty = stockSn.getQty();
+        this.sn = stockSn.getSn();
+        this.createUser = stockSn.getCreateUser();
+        this.createDatetime = stockSn.getCreateDatetime();
+        this.modifyUser = stockSn.getModifyUser();
+        this.modifyDatetime = stockSn.getModifyDatetime();
+        this.refSrc = batchCode;
+    }
+
 }

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

@@ -48,21 +48,25 @@ public class WmsTestResultDetails extends BaseBean {
     @ApiParam("物料名称")
     public String partName;
 
-    @Column(name = "CHECK_TYPE")
+    @Column(name = "CHECK_TYPE_CODE")
-    @ApiParam("大检测项类型")
+    @ApiParam("检测大类")
-    @AnnoOutputColumn(refClass = WmsEnumUtil.BH_CHECK_TYPE.class, refForeignKey = "value", value = "description")
+    public String checkTypeCode;
-    public Integer checkType;
 
-    @Column(name = "qr_code")
+    @Column(name = "QR_CODE")
     @ApiParam("二维码")
     public String qrCode;
 
-    @Column(name = "is_qualified")
+    @Column(name = "IS_QUALIFIED")
     @ApiParam("是否合格")
     @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description")
     public Integer isQualified;
 
-    @Column(name = "check_value")
+    @Column(name = "IS_FINISH")
+    @ApiParam("是否完成")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description")
+    public Integer isFinish;
+
+    @Column(name = "CHECK_VALUE")
     @ApiParam("检测值")
     public String checkValue;
 
@@ -73,9 +77,9 @@ public class WmsTestResultDetails extends BaseBean {
     public WmsTestResultDetails() {
     }
 
-    public WmsTestResultDetails(String partNo, Integer checkType, String bhCode, Long checkSize) {
+    public WmsTestResultDetails(String partNo, String checkTypeCode, String bhCode, Long checkSize) {
         this.partNo = partNo;
-        this.checkType = checkType;
+        this.checkTypeCode = checkTypeCode;
         this.bhCode = bhCode;
         this.checkSize = checkSize;
     }

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

@@ -13,6 +13,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 
 /**
  * @Description :检测结果汇总表
@@ -65,7 +66,7 @@ public class WmsTestResultSummary extends BaseBean {
 
     @Column(name = "REWORK_RESULT")
     @ApiParam("返修结果")
-    @AnnoOutputColumn(refClass = WmsEnumUtil.BH_TEST_RESULT_STATUS.class, refForeignKey = "value", value = "description")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description")
     public Integer reworkResult;
 
     @Column(name = "PICK_STATUS")
@@ -75,7 +76,35 @@ public class WmsTestResultSummary extends BaseBean {
 
     @Column(name = "PICK_RESULT")
     @ApiParam("挑选结果")
-    @AnnoOutputColumn(refClass = WmsEnumUtil.BH_TEST_RESULT_STATUS.class, refForeignKey = "value", value = "description")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description")
     public Integer pickResult;
 
+
+    @Transient
+    @ApiParam("BH类型")
+    private Integer bhType;
+
+    public WmsTestResultSummary(String organizeCode, String bhCode,
+                                String workCenterCode, String partNo,
+                                String partName, String flagNo, Integer isQualified,
+                                Integer reworkStatus, Integer reworkResult, Integer pickStatus, Integer pickResult, Integer bhType) {
+        this.organizeCode = organizeCode;
+        this.bhCode = bhCode;
+        this.workCenterCode = workCenterCode;
+        this.partNo = partNo;
+        this.partName = partName;
+        this.flagNo = flagNo;
+        this.isQualified = isQualified;
+        this.reworkStatus = reworkStatus;
+        this.reworkResult = reworkResult;
+        this.pickStatus = pickStatus;
+        this.pickResult = pickResult;
+        this.bhType = bhType;
+
+    }
+
+    public WmsTestResultSummary() {
+
+    }
+
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java

@@ -1,10 +1,14 @@
 package cn.estsh.i3plus.pojo.wms.dbinterface;
 
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
+import org.hibernate.annotations.ColumnDefault;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
@@ -159,4 +163,14 @@ public class WmsInterfaceDataMapper extends BaseBean {
      */
     @Column(name = "USE_SCRIPT_FILTER")
     public Integer useScriptFilter;
+
+
+    /**
+     * 数据格式类型
+     */
+    @Column(name = "SOFT_DATA_TYPE")
+    @ApiParam(value = "数据格式类型")
+    @ColumnDefault("10")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.SOFT_DATA_FORM.class, refForeignKey = "value", value = "description", required = false)
+    public Integer softDataType;
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/AssignmentDto.java

@@ -6,7 +6,6 @@ import io.swagger.annotations.ApiParam;
 import lombok.Data;
 import org.hibernate.annotations.GenericGenerator;
 
-import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
 
@@ -18,7 +17,6 @@ import javax.persistence.Id;
  * @Modify:
  **/
 @Data
-@Entity
 public class AssignmentDto {
 
     @Id
@@ -69,4 +67,5 @@ public class AssignmentDto {
 
     public AssignmentDto() {
     }
+
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsCustWindowDto.java

@@ -6,7 +6,6 @@ import lombok.Data;
 import org.hibernate.annotations.GenericGenerator;
 
 import javax.persistence.Column;
-import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
 
@@ -17,7 +16,6 @@ import javax.persistence.Id;
  * @CreateDate : 2020-04-21 2:37 下午
  * @Modify:
  **/
-@Entity
 @Data
 @Api("窗口输出类")
 public class WmsCustWindowDto {

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsMoveMovementEffectivenessDto.java

@@ -6,7 +6,6 @@ import lombok.Data;
 import org.hibernate.annotations.GenericGenerator;
 
 import javax.persistence.Column;
-import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
 
@@ -18,7 +17,6 @@ import javax.persistence.Id;
  * @Modify:
  **/
 @Data
-@Entity
 @Api("移动单效率(出参)")
 public class WmsMoveMovementEffectivenessDto {
 

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsStockSnDto.java

@@ -6,7 +6,6 @@ import lombok.Data;
 import org.hibernate.annotations.GenericGenerator;
 
 import javax.persistence.Column;
-import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
 
@@ -18,7 +17,6 @@ import javax.persistence.Id;
  * @Modify:
  **/
 @Data
-@Entity
 @Api("静态盘点查询输出实体类")
 public class WmsStockSnDto {
 

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsStaticCsModel.java

@@ -5,8 +5,6 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
-import javax.persistence.Entity;
-
 /**
  * @Description : 静态盘点输出model
  * @Reference :
@@ -15,7 +13,6 @@ import javax.persistence.Entity;
  * @Modify:
  **/
 @Data
-@Entity
 @Api("静态盘点查询输出model")
 public class WmsStaticCsModel extends BaseBean {
     private static final long serialVersionUID = 9039981061448266666L;

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/QmsCheckTypeRepository.java

@@ -0,0 +1,9 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.QmsCheckType;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface QmsCheckTypeRepository extends BaseRepository<QmsCheckType, Long> {
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/QmsStockSnExtBhRepository.java

@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.QmsStockSnExtBh;
+
+/**
+ * @Description : BH库存条码扩展表
+ * @Reference :
+ * @Author : jimmy.zeng
+ * @CreateDate : 2020-05-22 13:24
+ * @Modify:
+ **/
+public interface QmsStockSnExtBhRepository extends BaseRepository<QmsStockSnExtBh,Long> {
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsSerialSnRepository.java

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.WmsSerialSn;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description : 产品条码信息dao层
+ * @Reference :
+ * @Author : puxiao.liao
+ * @CreateDate : 2020-05-23 11:00
+ * @Modify:
+ **/
+@Repository
+public interface WmsSerialSnRepository extends BaseRepository<WmsSerialSn, Long> {
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsSerialSnTransRepository.java

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.WmsSerialSnTrans;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description : 产品条码事务表
+ * @Reference :
+ * @Author : jimmy.zeng
+ * @CreateDate : 2020-05-22 9:43
+ * @Modify:
+ **/
+@Repository
+public interface WmsSerialSnTransRepository  extends BaseRepository<WmsSerialSnTrans,Long> {
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java

@@ -3174,11 +3174,15 @@ public class WmsHqlPack {
         DdlPackBean result = new DdlPackBean();
 
         //查询参数封装
-        DdlPreparedPack.getStringLikerPack(wmsTestResultSummary.getBhCode(), "bhCode", result);
         DdlPreparedPack.getStringEqualPack(wmsTestResultSummary.getWorkCenterCode(), "workCenterCode", result);
         DdlPreparedPack.getStringEqualPack(wmsTestResultSummary.getPartNo(), "partNo", result);
         DdlPreparedPack.getStringEqualPack(wmsTestResultSummary.getFlagNo(), "flagNo", result);
         DdlPreparedPack.getNumEqualPack(wmsTestResultSummary.getReworkStatus(), "reworkStatus", result);
+        if (wmsTestResultSummary.getIsQualified() != null) {
+            DdlPreparedPack.getNumEqualPack(wmsTestResultSummary.getIsQualified(), "isQualified", result);
+        }
+
+        DdlPreparedPack.getStringEqualPack(wmsTestResultSummary.getBhCode(), "bhCode", result);
         DdlPreparedPack.getNumEqualPack(wmsTestResultSummary.getPickStatus(), "pickStatus", result);
         if (StringUtils.isNotBlank(wmsTestResultSummary.getCreateDateTimeStart())) {
             DdlPreparedPack.timeBuilder(wmsTestResultSummary.getCreateDateTimeStart(),
@@ -3206,7 +3210,7 @@ public class WmsHqlPack {
         //查询参数封装
         DdlPreparedPack.getStringLikerPack(wmsTestResultDetails.getBhCode(), "bhCode", result);
         DdlPreparedPack.getStringEqualPack(wmsTestResultDetails.getWorkCenterCode(), "workCenterCode", result);
-        DdlPreparedPack.getNumEqualPack(wmsTestResultDetails.getCheckType(), "checkType", result);
+        DdlPreparedPack.getNumEqualPack(wmsTestResultDetails.getCheckTypeCode(), "checkTypeCode", result);
         DdlPreparedPack.getStringEqualPack(wmsTestResultDetails.getPartNo(), "partNo", result);
         DdlPreparedPack.getStringEqualPack(wmsTestResultDetails.getQrCode(), "qrCode", result);
         if (StringUtils.isNotBlank(wmsTestResultDetails.getCreateDateTimeStart())) {
@@ -3235,7 +3239,7 @@ public class WmsHqlPack {
         DdlPackBean result = new DdlPackBean();
         DdlPreparedPack.getStringEqualPack(checkType.getWorkCenterCode(), "workCenterCode", result);
         DdlPreparedPack.getStringEqualPack(checkType.getPartNo(), "partNo", result);
-        DdlPreparedPack.getNumEqualPack(checkType.getCheckType(), "checkType", result);
+        DdlPreparedPack.getStringEqualPack(checkType.getCheckTypeCode(), "checkTypeCode", result);
         getStringBuilderPack(checkType, result);
         return result;
     }
@@ -3316,4 +3320,36 @@ public class WmsHqlPack {
         getStringBuilderPack(healthVariableResult, result);
         return result;
     }
+
+
+    /**
+     * 产品条码事务查询条件
+     *
+     * @param wmsSerialSnTrans
+     * @return
+     */
+    public static DdlPackBean packHqlWmsSerialSnTrans(WmsSerialSnTrans wmsSerialSnTrans) {
+
+        DdlPackBean packBean = new DdlPackBean();
+        DdlPreparedPack.getStringEqualPack(wmsSerialSnTrans.getBatchNo(), "batchNo", packBean);
+        DdlPreparedPack.getInPackList(wmsSerialSnTrans.getTransTypeLst(), "transType", packBean);
+        getStringBuilderPack(wmsSerialSnTrans, packBean);
+        return packBean;
+    }
+
+
+    /**
+     * BH检测大类表查询条件
+     *
+     * @param qmsStockSnExtBh
+     * @return
+     */
+    public static DdlPackBean packHqlQmsStockSnExtBh(QmsStockSnExtBh qmsStockSnExtBh) {
+
+        DdlPackBean packBean = new DdlPackBean();
+/*        DdlPreparedPack.getStringEqualPack(qmsStockSnExtBh.getBatchNo(), "batchNo", packBean);
+        DdlPreparedPack.getInPackList(wmsSerialSnTrans.getTransTypeLst(),"transType",packBean);
+        getStringBuilderPack(wmsSerialSnTrans, packBean);*/
+        return packBean;
+    }
 }

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=./