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

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

@@ -3326,7 +3326,8 @@ public class MesEnumUtil {
         REPRODUCTION_RMS(110, "重新生产-报工"),
         REPRODUCTION_NOT_RMS(120, "重新生产-不报工"),
         REVERSE_SPRAY_ORDER(130, "反喷工单"),
-        SPARE_RETURN_REPAIR(140, "客退备件返修");
+        SPARE_RETURN_REPAIR(140, "客退备件返修"),
+        HOP_SEQ_ORDER(150, "跳序工单");
 
         private int value;
         private String description;
@@ -6658,7 +6659,8 @@ public class MesEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum GROUP_SIDE {
         POSITIVE(10, "A", "正面"),
-        REVERSE_SIDE(20, "B", "背面");
+        REVERSE_SIDE(20, "B", "背面"),
+        SPECIAL_SIDE(30, "C", "特殊件");
 
         private Integer value;
         private String code;

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

@@ -13,6 +13,32 @@ import org.apache.commons.lang3.StringUtils;
 public class MesPcnEnumUtil {
 
     /**
+     * 物料校验项数据查询类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PART_CHECK_DATA_TYPE {
+        ALL_DATA(1, "所有数据"),
+        LAST_DATA(2, "最后一条数据");
+
+        private int value;
+        private String description;
+
+        PART_CHECK_DATA_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+
+        public String getDescription() {
+            return description;
+        }
+    }
+
+    /**
      * 注塑生产操作模式
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
@@ -1889,7 +1915,8 @@ public class MesPcnEnumUtil {
         REPRODUCTION_RMS(110, "重新生产-报工"),
         REPRODUCTION_NOT_RMS(120, "重新生产-不报工"),
         REVERSE_SPRAY_ORDER(130, "反喷工单"),
-        SPARE_RETURN_REPAIR(140, "客退备件返修");
+        SPARE_RETURN_REPAIR(140, "客退备件返修"),
+        HOP_SEQ_ORDER(150, "跳序工单");
 
         private int value;
         private String description;
@@ -5348,4 +5375,56 @@ public class MesPcnEnumUtil {
         }
     }
 
+    /**
+     * 队列 料架摆放位置
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum GROUP_SIDE {
+        POSITIVE(10, "A", "正面"),
+        REVERSE_SIDE(20, "B", "背面"),
+        SPECIAL_SIDE(30, "C", "特殊件");
+
+        private Integer value;
+        private String code;
+        private String description;
+
+        GROUP_SIDE(Integer value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public Integer getValue() {
+            return value;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String codeOfDescription(String code) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].code.equals(code)) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public static String valueOfDescription(Integer value) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == value) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
 }

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

@@ -624,6 +624,25 @@ public class DdlPreparedPack {
         }
     }
 
+
+    /**
+     * 封装not in List查询语句
+     *
+     * @param data
+     * @param columnName
+     * @param sufColumnName
+     * @param packBean
+     */
+    public static void getNotInPackList(List<?> data, String columnName, String sufColumnName, DdlPackBean packBean) {
+        if (data != null && data.size() > 0) {
+            String destColumnName = columnName;
+            if (!StringUtil.isEmpty(sufColumnName)) {
+                destColumnName = destColumnName + "_" + System.currentTimeMillis();
+            }
+            packBean.addColumnQuery(destColumnName, " and model." + columnName + " not in (:m_" + destColumnName + ")", data);
+        }
+    }
+
     /**
      * 封装in String查询语句
      *

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

@@ -156,6 +156,10 @@ public class MesPackage extends BaseBean implements Serializable {
     @ApiParam("明细总数")
     private Integer detailTotal = 0;
 
+    @Transient
+    @ApiParam("托包规数量")
+    private Double qty2;
+
     public MesPackage() {
     }
 

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

@@ -104,6 +104,10 @@ public class MesPart extends BaseBean implements Serializable {
     @ApiParam("颜色代码")
     private String colorCode;
 
+    @Column(name = "COLOR_NAME")
+    @ApiParam("颜色名称")
+    private String colorName;
+
     @Column(name = "SHELVES_AMOUNT")
     @ApiParam("挂架数")
     private Integer shelvesAmount;

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

@@ -53,6 +53,14 @@ public class MesPartCheck extends BaseBean implements Serializable {
     @ApiParam("记录数量表达式")
     private String recordNumSpelExpress;
 
+    @Column(name = "DATA_TYPE")
+    @ApiParam("数据查询类型")
+    private Integer dataType = 1;
+
+    @Column(name = "LIMIT_TIMES")
+    @ApiParam("限定检测次数")
+    private Integer limitTimes;
+
     @Column(name = "RECORD_NUM_DESC")
     @ApiParam("校验表达式描述")
     private String recordNumDesc;

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

@@ -206,6 +206,10 @@ public class MesProduceSn extends BaseBean implements Serializable {
     @ApiParam("电检结果")
     private String electricResult;
 
+    @Transient
+    @ApiParam("包规数量")
+    private Double packageQty;
+
     @Version
     @Column(name = "LOCK_VERSION")
     @ApiParam(value = "乐观锁", example = "1")

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

@@ -110,7 +110,7 @@ public class MesQueueJitActualDetail extends BaseBean implements Serializable {
 
     @Column(name = "IS_EMPTY")
     @ApiParam("是否放空")
-    private Integer isEmpty;
+    private Integer isEmpty = 2;
 
     @Transient
     @ApiParam("工单类型")

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

@@ -200,6 +200,10 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable {
     @ApiParam("等级名称")
     private String gradeName;
 
+    @Transient
+    @ApiParam("客户产线代码")
+    private String custProdLineCode;
+
     public double getQueueSeqVal() {
         return this.queueSeq == null ? 0.0d : this.queueSeq;
     }

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

@@ -98,9 +98,9 @@ public class MesStateMachineStatus extends BaseBean implements Serializable {
     @ApiParam("前端显示颜色")
     private String color;
 
-    @Transient
-    @ApiParam("状态执行情况")
-    private StepResult stepResult;
+//    @Transient
+//    @ApiParam("状态执行情况")
+//    private StepResult stepResult;
 
     @Transient
     @ApiParam("是否执行下个扫描信息")

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

@@ -75,6 +75,10 @@ public class MesWorkCellPointGroup extends BaseBean implements Serializable {
     @ApiParam("过程条码")
     private String serialNumber;
 
+    @Column(name = "GROUP_SIDE")
+    @ApiParam("料架摆放位置")
+    private String groupSide;
+
     @Transient
     @ApiParam("显示颜色")
     private String color;

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

@@ -183,6 +183,10 @@ public class MesWorkOrder extends BaseBean implements Serializable {
     @ApiParam("父阶物料号")
     private String parentPartNo;
 
+    @Column(name = "PRINT_STATUS")
+    @ApiParam("打印状态")
+    private Integer printStatus = 10;
+
     @Version
     @Column(name = "LOCK_VERSION")
     @ApiParam(value = "乐观锁", example = "1")

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

@@ -22,6 +22,12 @@ public class DataReviewModel {
     @ApiParam("实际数量")
     private String realNum;
 
+    @ApiParam("限定次数")
+    private String limitTimes;
+
+    @ApiParam("检测次数")
+    private String checkTimes;
+
     @ApiParam("对象代码")
     private String objectCode;
 
@@ -31,6 +37,9 @@ public class DataReviewModel {
     @ApiParam("是否合格")
     private String reviewResult;
 
+    @ApiParam("显示标识")
+    private String showFlag;
+
     @ApiParam("关键件颜色")
     private String keyPartColor;
 

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

@@ -21,4 +21,7 @@ public class ProductDataCacheModel {
     @ApiParam("字段名称")
     private List<ProductDataModel> productDataModelList;
 
+    @ApiParam("创建时间")
+    private String createDatetime;
+
 }

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

@@ -336,7 +336,8 @@ public class QueueOrderModel implements Serializable {
     }
 
     // getQueueOrderBySerialNumber
-    public QueueOrderModel(Long id, String queueGroupNo, String jitLotNo, String vinCode, String organizeCode, String produceCategoryCode, String workType) {
+    public QueueOrderModel(Long id, String queueGroupNo, String jitLotNo, String vinCode, String organizeCode, String produceCategoryCode, String workType,
+                           String partNo, String prodCfgTypeCode) {
         this.id = id;
         this.queueGroupNo = queueGroupNo;
         this.jitLotNo = jitLotNo;
@@ -344,6 +345,8 @@ public class QueueOrderModel implements Serializable {
         this.organizeCode = organizeCode;
         this.produceCategoryCode = produceCategoryCode;
         this.workType = workType;
+        this.partNo = partNo;
+        this.prodCfgTypeCode = prodCfgTypeCode;
     }
 
     // getQueueJitActualJitSeq

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

@@ -107,6 +107,8 @@ public class MesPcnHqlPack {
         DdlPackBean packBean = getAllBaseData(org);
         DdlPreparedPack.getStringEqualPack(mesCellFeed.getWorkCenterCode(), "workCenterCode", packBean);
         DdlPreparedPack.getNumberBiggerPack(0, "rawQty", packBean);
+        DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", packBean);
+        DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", packBean);
         return packBean;
     }
 
@@ -167,6 +169,12 @@ public class MesPcnHqlPack {
         if (!StringUtils.isEmpty(mesWorkOrder.getPartNo())) {
             DdlPreparedPack.getStringLikerPack(mesWorkOrder.getPartNo(), "partNo", packBean);
         }
+        if (!StringUtils.isEmpty(mesWorkOrder.getPrintStatus()) && mesWorkOrder.getPrintStatus() != 0) {
+            DdlPreparedPack.getNumEqualPack(mesWorkOrder.getPrintStatus(), "printStatus", packBean);
+        }
+        if (!StringUtils.isEmpty(mesWorkOrder.getPartNameRdd())) {
+            DdlPreparedPack.getStringLikerPack(mesWorkOrder.getPartNameRdd(), "partNameRdd", packBean);
+        }
         if (!StringUtils.isEmpty(mesWorkOrder.getWorkOrderStatus()) && mesWorkOrder.getWorkOrderStatusVal() != 0) {
             DdlPreparedPack.getNumEqualPack(mesWorkOrder.getWorkOrderStatus(), "workOrderStatus", packBean);
         } else {
@@ -394,6 +402,10 @@ public class MesPcnHqlPack {
             DdlPreparedPack.getNumEqualPack(mesPackage.getPackLevel(), "packLevel", packBean);
         }
 
+        if (!StringUtils.isEmpty(mesPackage.getWorkOrderNo())) {
+            DdlPreparedPack.getStringLikerPack(mesPackage.getWorkOrderNo(), "workOrderNo", packBean);
+        }
+
         if (!StringUtils.isEmpty(mesPackage.getPackageNo())) {
             DdlPreparedPack.getStringLikerPack(mesPackage.getPackageNo(), "packageNo", packBean);
         }

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

@@ -204,4 +204,10 @@ public class WmsDocFgDetail extends BaseBean {
 
     public WmsDocFgDetail() {
     }
+
+    public WmsDocFgDetail(String sn, String mfgLocNo, String partNo) {
+        this.sn = sn;
+        this.mfgLocNo = mfgLocNo;
+        this.partNo = partNo;
+    }
 }

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

@@ -334,6 +334,10 @@ public class WmsDocMovementMaster extends BaseBean {
     @ApiParam(value = "电话号码")
     private String custTel;
 
+    @Transient
+    @ApiParam(value = "过滤业务类型")
+    private String filterBusiType;
+
     public int getOrderStatusVal() {
         return this.orderStatus == null ? 0 : this.orderStatus;
     }

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

@@ -0,0 +1,71 @@
+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.Lob;
+import javax.persistence.Table;
+
+/**
+ * @Description : 用户需要查询的服务调用详细日志
+ * @Reference :
+ * @Author : rock.yu
+ * @CreateDate : 2020-09-19 15:54
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "WMS_SERVICE_LOG")
+@Api("服务调用详细日志")
+public class WmsServiceLog extends BaseBean {
+
+    private static final long serialVersionUID = 1285495680337747968L;
+
+    @Column(name = "CALL_TIME")
+    @ApiParam("调用时间")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    public String callTIme;
+
+    @Column(name = "SERVICE_CODE")
+    @ApiParam("服务代码")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    public String serviceCode;
+
+    @Column(name = "SERVICE_NAME")
+    @ApiParam("服务名称")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    public String serviceName;
+
+    @Column(name = "JOB_CODE")
+    @ApiParam(value = "JOB代码")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String jobCode;
+
+    @Column(name = "JOB_NAME")
+    @ApiParam(value = "JOB名称")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String jobName;
+
+    @Lob
+    @Column(name = "OUTPUT_MESSAGE")
+    @ApiParam(value = "输出信息")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String outPutMessage;
+
+    @Column(name = "LEVEL")
+    @ApiParam(value = "日志级别")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String level;
+}

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

@@ -74,16 +74,16 @@ public class WmsWorkCenter extends BaseBean {
 
     @Column(name = "PRE_READY_MINUTE", columnDefinition = "int default 180")
     @ApiParam(value = "提前拉动时间")
-    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
     private Integer preReadyMinute;
 
     @Column(name = "PULL_RANGE_MINUTE", columnDefinition = "int default 180")
     @ApiParam(value = "拉动区间时间")
-    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
     private Integer pullRangeMinute;
 
     @Column(name = "NEXT_PULL_TIME", columnDefinition = "varchar(50) default '' ")
     @ApiParam(value = "下次拉动时间")
-    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
     private String nextPullTime;
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsServiceLogRepository.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.WmsServiceLog;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description : 服务调用详细日志表
+ * @Reference :
+ * @Author : rock.yu
+ * @CreateDate : 2020-09-19 16:04
+ * @Modify:
+ **/
+@Repository
+public interface WmsServiceLogRepository extends BaseRepository<WmsServiceLog, Long> {
+}

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

@@ -218,14 +218,27 @@ public class WmsHqlPack {
     public static DdlPackBean packWmsDocMovementMaster(WmsDocMovementMaster wmsDocMovementMaster) {
         DdlPackBean packBean = new DdlPackBean();
 
-        //查询参数封装
-        DdlPreparedPack.getStringRightLikerPack(wmsDocMovementMaster.getOrderNo(), "orderNo", packBean);
+        //查询参数封装PROD_SCRAP
+        DdlPreparedPack.getStringLikerPack(wmsDocMovementMaster.getOrderNo(), "orderNo", packBean);
         DdlPreparedPack.getNumEqualPack(wmsDocMovementMaster.getMoveType(), "moveType", packBean);
         DdlPreparedPack.getNumEqualPack(wmsDocMovementMaster.getBusiType(), "busiType", packBean);
+        //滤掉业务类型
+        if (!StringUtil.isEmpty(wmsDocMovementMaster.getFilterBusiType())) {
+            List<Integer> filterBusiType = new ArrayList<>();
+            for (String busiType : wmsDocMovementMaster.getFilterBusiType().split(",")) {
+                filterBusiType.add(Integer.parseInt(busiType));
+            }
+            DdlPreparedPack.getNotInPackList(filterBusiType, "busiType", System.currentTimeMillis() + "", packBean);
+        }
         DdlPreparedPack.getNumEqualPack(wmsDocMovementMaster.getOrderStatus(), "orderStatus", packBean);
         DdlPreparedPack.getStringEqualPack(wmsDocMovementMaster.getCustNo(), "custNo", packBean);
         DdlPreparedPack.getStringEqualPack(wmsDocMovementMaster.getErpSrcNo(), "erpSrcNo", packBean);
         DdlPreparedPack.getInPackList(wmsDocMovementMaster.getOrganizeCodeList(), "organizeCode", packBean);
+        DdlPreparedPack.getStringLikerPack(wmsDocMovementMaster.getOrderNo(), "orderNo", packBean);
+        DdlPreparedPack.getStringLikerPack(wmsDocMovementMaster.getCostCenter(), "costCenter", packBean);
+        DdlPreparedPack.getStringLikerPack(wmsDocMovementMaster.getThirdRemake(), "thirdRemake", packBean);
+
+
         getStringBuilderPack(wmsDocMovementMaster, packBean);
 
         return packBean;