Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java

@@ -48,7 +48,7 @@ public class Work extends BaseAPS {
 
     @Column(name="WORK_TYPE")
     @ApiParam(value ="工作类型")
-    @FieldAnnotation(property = false)
+    @FieldAnnotation(display = false)
     private ApsEnumUtil.WORK_TYPE workType;
 
     @Column(name="count", columnDefinition = "decimal(18,8)")
@@ -165,7 +165,7 @@ public class Work extends BaseAPS {
 //    private Long dynSplitWorkId;
 
     @Column(name="ORIGIN_WORK_ID")
-    @ApiParam(value ="动态拆分前工作ID")
+    @ApiParam(value ="动态拆分工作ID")
     private Long originWorkId;
 
     private transient boolean hasOptimized = false;

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

@@ -669,13 +669,14 @@ public class ApsEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum WORK_SORT_RULE {
-        ORDER_LET("ORDER_LET", "订单交货期"),
+        ORDER_LET("ORDER_LET", "订单最晚结束时刻计算值"),
         ORDER_PRIORITY("ORDER_PRIORITY", "订单优先级"),
         ORDER_EST("ORDER_EST", "订单最早开始时刻"),
         ORDER_COUNT("ORDER_COUNT", "订单数量"),
         ORDER_RECEIVE_DATE("ORDER_RECEIVE_DATE", "订单接单日期"),
         ORDER_LET_SUB_EST("ORDER_LET_SUB_EST", "订单交货期与订单最早开始时刻之差"),
         ORDER_SURPLUS("ORDER_SURPLUS", "订单余裕度"),
+        ORDER_CODE("ORDER_CODE", "订单编码"),
         NOPLAN_OPERATION_SIZE("NOPLAN_OPERATION_SIZE", "残留工序数"),
         REMAIN_PRODUCE_TIME("REMAIN_PRODUCE_TIME", "残留生产时间"),
         MIN_OPERATION_REMAIN_TIME("MIN_OPERATION_REMAIN_TIME", "最小工序宽裕时间"),
@@ -685,7 +686,7 @@ public class ApsEnumUtil {
         HAVE_HIGH_WORK("HAVE_HIGH_WORK", "订单中含有高级别工作"),
         WORK_RESOURCE_SIZE("WORK_RESOURCE_SIZE", "工作的可用资源数"),
         TOP_ORDER_LET("TOP_ORDER_LET", "顶层订单的交货期"),
-        TOP_ORDER_CODE("TOP_ORDER_CODE", "顶层订单代码"),
+        TOP_ORDER_CODE("TOP_ORDER_CODE", "顶层订单编码"),
         TOP_ORDER_PRIORITY("TOP_ORDER_PRIORITY", "顶层订单优先级"),
         CUST_EXPRESSION("CUST_EXPRESSION", "自定义表达式");
 

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

@@ -2100,7 +2100,8 @@ public class MesEnumUtil {
         MES_SCATTER_PART_CFG_BOM(620, "scatterPartCfgBomExcelService", "车型散件配置清单导入"),
         MES_SPARE_PARTS(630, "sparePartsExcelService", "备件计划导入"),
         MES_JISA(640, "jisaExcelService", "JISA导入"),
-        MES_CONTROL_PLAN(650, "controlPlanExcelService", "控制计划导入");
+        MES_CONTROL_PLAN(650, "controlPlanExcelService", "控制计划导入"),
+        MES_HOLIDAY_VACATION(660, "holidayVacationExcelService", "节假日导入");
 
         private int value;
         private String service;

modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/repository/MdmHqlPack.java

@@ -22,6 +22,7 @@ public class MdmHqlPack {
         DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(mdmBean);
 
         DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), "isMdmPublished", ddlPackBean);
+        DdlPreparedPack.getNumEqualPack(mdmBean.isValid, "isValid", ddlPackBean);
         return ddlPackBean;
     }
 

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

@@ -0,0 +1,42 @@
+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.*;
+import java.io.Serializable;
+
+/**
+ * @Author: Wynne.Lu
+ * @CreateDate: 2019/10/18 2:55 下午
+ * @Description:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
+@Table(name = "MES_HOLIDAY_VACTION")
+@Api("节假日")
+public class MesHolidayVacation extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = -1620451254243818560L;
+    @Column(name = "YEAR")
+    @ApiParam("年")
+    private String year;
+
+    @Column(name = "MONTH")
+    @ApiParam("月")
+    private String month;
+
+    @Column(name = "DAY")
+    @ApiParam("日")
+    private String day;
+}

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

@@ -123,6 +123,10 @@ public class MesQcOrder extends BaseBean implements Serializable {
     @ApiParam("任务单类型")
     private String checkOrderType;
 
+    @Column(name = "ON_SITE_FREQUENCY")
+    @ApiParam("巡检次数")
+    private Integer onSiteFrequency = 0;
+
     @Deprecated
     @ApiParam(value = "检测结果")
     @Transient

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

@@ -8,6 +8,7 @@ import java.io.Serializable;
 
 /**
  * 产品履历报表-缺陷信息
+ *
  * @author yumingxing
  * @version 1.0
  * @date 2020/12/18 15:16
@@ -51,8 +52,11 @@ public class DefectRecordModel implements Serializable {
     @ApiParam(value = "扫描时间")
     public String createDatetime;
 
+    @ApiParam(value = "图片路径")
+    private String pictureUrl;
 
-    public DefectRecordModel(String workCenterName, String processName, Integer qcStatus, String defectName, String defectLocation, String customerPartNo, String serialNumber, String createUser, String createDatetime) {
+
+    public DefectRecordModel(String workCenterName, String processName, Integer qcStatus, String defectName, String defectLocation, String customerPartNo, String serialNumber, String createUser, String createDatetime, String pictureUrl) {
         this.workCenterName = workCenterName;
         this.processName = processName;
         this.qcStatus = qcStatus;
@@ -62,5 +66,6 @@ public class DefectRecordModel implements Serializable {
         this.serialNumber = serialNumber;
         this.createUser = createUser;
         this.createDatetime = createDatetime;
+        this.pictureUrl = pictureUrl;
     }
 }

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

@@ -0,0 +1,13 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesHolidayVacation;
+
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2021/5/7 4:44 PM
+ * @Modify:
+ */
+public interface MesHolidayVacationRepository extends BaseRepository<MesHolidayVacation, Long> {
+}

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

@@ -6,14 +6,18 @@ import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
-import javax.persistence.Inheritance;
-import javax.persistence.InheritanceType;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.ColumnDefault;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
-import javax.persistence.*;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Index;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
+import javax.persistence.Table;
+import javax.persistence.Transient;
 
 /**
  * @Description : 移库单条码表
@@ -96,6 +100,9 @@ public class WmsDocMovementSn extends BaseBean {
     @ApiParam(value = "目标库位代码")
     public String destLocateNo;
 
+    @Column(name = "PACKAGE_NO")
+    @ApiParam(value = "包装编号")
+    private String packageNo;
 
     @Transient
     @ApiParam("前端表格编辑使用")

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

@@ -237,10 +237,10 @@ public class WmsStockSn extends BaseBean {
 //    @ApiParam(value = "乐观锁", example = "1")
 //    public Integer lockVersion;
 
-    @ApiParam("托盘(容器)类型编号")
-    @Column(name = "CT_CODE")
+    @ApiParam("容器编号")
+    @Column(name = "CT_NO")
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
-    private String ctCode;
+    private String ctNo;
 
     @ApiParam(value = "仓库名称")
     @Transient