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

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

@@ -363,7 +363,7 @@ public class WmsEnumUtil {
     public enum REC_STATUS_KANBAN {
         TO_BE_RECEIVED(10, "TO_BE_RECEIVED", "待收货"),
         RECEIVING(20, "RECEIVING", "收货中"),
-        DELAYED_NON_RECEIPT(30, "DELAYED_NON_RECEIPT", "延迟未收货"),
+        DELAYED_NON_RECEIPT(30, "DELAYED_NON_RECEIPT", "延迟"),
         COMPLETED(40, "COMPLETED", "已完成");
 
         private int value;
@@ -1776,6 +1776,7 @@ public class WmsEnumUtil {
     public enum QC_STATUS {
         INSPECTION_FREE(10, "免检"),
         PENDING_QUALITY_INSPECTION(20, "待质检"),
+        DELAYED_NON_QC(40, "延迟"),
         QUALITY_INSPECTION_COMPLETED(30, "质检完成");
 
         private int value;

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

@@ -298,6 +298,42 @@ public class MesWorkOrder extends BaseBean implements Serializable {
     @ApiParam("客户物料号")
     private String customerPartNo;
 
+    @Transient
+    @ApiParam("客户物料名称")
+    private String customerPartName;
+
+    @Transient
+    @ApiParam("客户物料颜色")
+    private String customerPartColor;
+
+    @Transient
+    @ApiParam("项目名称")
+    private String prodCfgTypeName;
+
+    @Transient
+    @ApiParam("颜色代码")
+    private String colorCode;
+
+    @Transient
+    @ApiParam("挂架数")
+    private Integer shelvesAmount;
+
+    @Transient
+    @ApiParam("供漆罐代码")
+    private String paintTankCode;
+
+    @Transient
+    @ApiParam("计划报表标识")
+    private String reportFormCode;
+
+    @Transient
+    @ApiParam("一检数量")
+    private Integer firstInspectionQty;
+
+    @Transient
+    @ApiParam("二检数量")
+    private Integer secondInspectionQty;
+
     public double getQtyVal() {
         return this.qty == null ? 0.0d : this.qty;
     }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/dbinterface/MesInterfaceEnumUtil.java

@@ -10,7 +10,8 @@ public class MesInterfaceEnumUtil {
         WMS2SAP(20, "WMS2SAP", "WMS --> SAP"),
         MES2WMS(30, "MES2WMS", "MES --> WMS"),
         WMS2MES(40, "WMS2MES", "WMS --> MES"),
-        MES2SAP(50, "MES2SAP", "MES --> SAP");
+        MES2SAP(50, "MES2SAP", "MES --> SAP"),
+        SAP2MES(60, "SAP2MES", "SAP --> MES");
 
         private int value;
         private String name;

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

@@ -205,6 +205,7 @@ public class MesHqlPack {
                     mesWorkOrder.getCreateDateTimeEnd(),
                     "createDatetime", packBean, true);
         }
+        DdlPreparedPack.getStringLikerPack(mesWorkOrder.getAreaCode(), "areaCode", packBean);
         DdlPreparedPack.getOrderDefault(mesWorkOrder);
         return packBean;
     }

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsJobParamModel.java

@@ -21,6 +21,7 @@ public class WmsJobParamModel implements Serializable {
     private Integer snType;//条码类型（虚拟，实物）
     private String devOpsEmail;//运维人员邮箱
     private Integer minuteDiff;//处理周期(分钟)
+    private String whereHql;//业务查询条件HQL
 
     public int getMinuteDiffVal() {
         return this.minuteDiff == null ? 0 : this.minuteDiff.intValue();

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsTaskInfoModel.java

@@ -72,6 +72,12 @@ public class WmsTaskInfoModel implements Serializable {
     @ApiParam(value = "工厂代码")
     public String organizeCode;
 
+    @ApiParam(value = "是否展示删除按钮")
+    public Integer isShowDeleteButton;
+
+    @ApiParam(value = "跳转后端请求")
+    public String actionUrl;
+
     public WmsTaskInfoModel() {
     }
 

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

@@ -263,6 +263,30 @@ public class WmsMoveMaster extends BaseBean {
         this.refSrc = refSrc;
     }
 
+    public WmsMoveMaster(String orderNo, String organizeCode, String partNo, String partNameRdd, String transTypeCode, String transTypeName, Integer itemStatus,
+                         String unit, String srcWhNo, String srcZoneNo, String destWhNo, String destZoneNo, Double transQty, Double rejectQty, String fixId, Integer busiTypeCode,
+                         String createDatetime, String createUser, String modifyUser, String modifyDatetime) {
+        this.orderNo = orderNo;
+        this.organizeCode = organizeCode;
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.transTypeCode = transTypeCode;
+        this.transTypeName = transTypeName;
+        this.itemStatus = itemStatus;
+        this.unit = unit;
+        this.srcWhNo = srcWhNo;
+        this.srcZoneNo = srcZoneNo;
+        this.destWhNo = destWhNo;
+        this.destZoneNo = destZoneNo;
+        this.transQty = transQty;
+        this.rejectQty = rejectQty;
+        this.fixId = fixId;
+        this.busiTypeCode = busiTypeCode;
+        this.createDatetime = createDatetime;
+        this.createUser = createUser;
+        this.modifyUser = modifyUser;
+        this.modifyDatetime = modifyDatetime;
+    }
     public WmsMoveMaster(Long itemQty , String transTypeCode , Integer orderStatus){
         this.itemQty = itemQty;
         this.transTypeCode = transTypeCode;