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

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

@@ -2558,4 +2558,54 @@ public class CommonEnumUtil {
     public enum DYNAMIC_DATA_SOURCE_TYPE {
         MASTER,NODE
     }
+
+
+
+    /**
+     * 业务表：库存条码状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum SESSION_MODE {
+        DEFAULT(10, "默认"),
+        OVERWRITE(20, "覆盖"),
+        SEIZE(30, "抢占");
+
+        private int value;
+        private String description;
+
+        SESSION_MODE(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;
+        }
+    }
+
 }

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/MesQueueOrderDetail.java

@@ -180,6 +180,10 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable {
     @ApiParam("产品条码")
     private String productSn;
 
+    @Transient
+    @ApiParam("队列类型")
+    private Integer queueType;
+
     public double getQueueSeqVal() {
         return this.queueSeq == null ? 0.0d : this.queueSeq;
     }
@@ -207,7 +211,8 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable {
 
     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) {
+                               String processLabelTemplate, String prodLabelTemplate,String optionCode,String produceColor,
+                               String gradeCode,String assyNo,Integer queueType) {
         this.orderNo = orderNo;
         this.vinCode = vinCode;
         this.partNo = partNo;
@@ -224,5 +229,6 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable {
         this.produceColor = produceColor;
         this.gradeCode = gradeCode;
         this.assyNo = assyNo;
+        this.queueType = queueType;
     }
 }

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/model/TorqueReviewModel.java

@@ -6,6 +6,12 @@ import lombok.Data;
 @Data
 public class TorqueReviewModel {
 
+    @ApiParam("过程条码")
+    private String serialNumber;
+
+    @ApiParam("工作中心代码")
+    private String workCenterCode;
+
     @ApiParam("工作单元代码")
     private String workCellCode;
 

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/mes/TorqueCollectionModel.java

@@ -170,7 +170,7 @@ public class TorqueCollectionModel implements Serializable {
     public TorqueCollectionModel(String vinCode, String prodCfgTypeCode, String gradeCode, String colorCode, String partNo,
                                  String partName, Integer torqueNo, Integer checkScanCount, Integer sendSeq,
                                  Integer yellowGunRule, Integer isEndSeq, String groupCode, Integer isPf, Double qualifiedCount,
-                                 String pokeYokeFix) {
+                                 String pokeYokeFix, String pokeYokeLength) {
         this.vinCode = vinCode;
         this.prodCfgTypeCode = prodCfgTypeCode;
         this.gradeCode = gradeCode;
@@ -186,6 +186,7 @@ public class TorqueCollectionModel implements Serializable {
         this.isPf = isPf;
         this.qualifiedCount = qualifiedCount;
         this.pokeYokeFix = pokeYokeFix;
+        this.pokeYokeLength = pokeYokeLength;
     }
 
     /**

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/WmsCSOrderDetails.java

@@ -80,7 +80,6 @@ public class WmsCSOrderDetails extends BaseBean {
     @ApiParam("条码")
     public String sn;
 
-
     /**
      * 质检状态:1=未质检,10=质检中,20=质检合格,
      * 30=质检不合格,40=已退货
@@ -117,6 +116,10 @@ public class WmsCSOrderDetails extends BaseBean {
     @ApiParam(value = "供应商编码")
     public String vendorNo;
 
+    @Column(name = "LOT_NO", nullable = false)
+    @ApiParam("收货批次")
+    public String lotNo = "";
+
     @Transient
     @ApiParam(value = "实盘数量", example = "1")
     @AnnoOutputColumn(hidden = true)

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

@@ -6,6 +6,7 @@ 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;
 
@@ -47,6 +48,10 @@ public class WmsCSRange extends BaseBean {
     @ApiParam("物料名称")
     public String partNameRdd;
 
+    @Column(name = "WH_NO")
+    @ApiParam("仓库代码")
+    public String whNo;
+
     @Column(name = "ZONE_NO")
     @ApiParam("存储区编号")
     public String zoneNo;
@@ -64,6 +69,15 @@ public class WmsCSRange extends BaseBean {
     @ApiParam("原单号")
     public String srcOrderNo;
 
+    @Column(name = "QTY", columnDefinition = "decimal(18,8)")
+    @ColumnDefault("0")
+    @ApiParam(value = "库存数量", example = "0")
+    public Double qty;
+
+    @Column(name = "LOT_NO", nullable = false)
+    @ApiParam("收货批次")
+    public String lotNo = "";
+
     @Transient
     @ApiParam("存储区编号组")
     @AnnoOutputColumn(hidden = true)

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;

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

@@ -229,6 +229,10 @@ public class WmsMoveToERP extends BaseBean {
     @ApiParam(value = "jis料架号")
     private String queueGroupNo;
 
+    @Column(name = "CUST_ORDER_NO")
+    @ApiParam(value = "客户单号")
+    private String custOrderNo;
+
     @Transient
     private Long shippingId;