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

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

@@ -7901,4 +7901,42 @@ public class MesEnumUtil {
         }
     }
 
+    /**
+     * 查询周期
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum QUERY_GAP_TYPE {
+        MINUTE("MINUTE", "分钟"),
+        HOUR("HOUR", "小时"),
+        DAY("DAY", " 日"),
+        WEEK("WEEK", " 周"),
+        MONTH("MONTH", " 月");
+
+        private String value;
+        private String description;
+
+        QUERY_GAP_TYPE(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 value) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value.equals(value)) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
 }

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

@@ -14,6 +14,7 @@ import javax.persistence.Entity;
 import javax.persistence.Table;
 import javax.persistence.Transient;
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * @Description :
@@ -145,6 +146,10 @@ public class MesQueueJitActual extends BaseBean implements Serializable {
     private Integer noticeSign = 10;
 
     @Transient
+    @ApiParam("创建时间")
+    private String cdtTruncated;
+
+    @Transient
     @ApiParam("客户需求开始时间")
     private String custPointStartDate;
 

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

@@ -116,6 +116,9 @@ public class QueueOrderModel implements Serializable {
     @ApiParam("特殊标识")
     private Integer specialFlag;
 
+    @ApiParam("箱条码")
+    private String packageNo;
+
     public QueueOrderModel() {
     }
 

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

@@ -0,0 +1,19 @@
+package cn.estsh.i3plus.pojo.mes.model.mgnbj;
+
+import lombok.Data;
+
+import java.util.Map;
+
+/**
+ * @author Wynne.Lu
+ * @date 2020/10/19 15:02
+ * @desc
+ */
+@Data
+public class JisaJphReportModel {
+
+    private Double jphVal;
+
+    private Map<String, Long> detailsMap;
+
+}

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

@@ -3443,6 +3443,9 @@ public class MesHqlPack {
         if (!StringUtils.isEmpty(paintPolishingReportModel.getPartNo())) {
             DdlPreparedPack.getStringEqualPack(paintPolishingReportModel.getPartNo(), "partNo", packBean);
         }
+        if (!StringUtils.isEmpty(paintPolishingReportModel.getWorkOrderNo())) {
+            DdlPreparedPack.getStringEqualPack(paintPolishingReportModel.getWorkOrderNo(), "workOrderNo", packBean);
+        }
         if (!StringUtils.isEmpty(paintPolishingReportModel.getModifyStartDate()) || !StringUtils.isEmpty(paintPolishingReportModel.getModifyEndDate())) {
             DdlPreparedPack.timeBuilder(paintPolishingReportModel.getModifyStartDate(), paintPolishingReportModel.getModifyEndDate(),
                     "modifyDatetime", packBean, true);

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

@@ -98,4 +98,8 @@ public class WmsDocSoDetails extends BaseBean {
     @ApiParam("业务类型")
     @AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_BUSI_TYPE.class, refForeignKey = "value", value = "description")
     public Integer busiType;
+
+    @Transient
+    @ApiParam(value = "客户发往地代码")
+    private String custDeliveryCode;
 }