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

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

@@ -1888,7 +1888,7 @@ public class WmsEnumUtil {
         STEP_SEQ("STEP_SEQ", "步骤调用序号"),
         MOVE_ORDER_NO("MOVE_ORDER_NO", "移库单单号"),
         QC_ORDER_NO("QC_ORDER_NO", "质检单单号"),
-        ORDER_NO("ORDER_NO", "盘点主表序号");
+        CHECK_ORDER_NO("CHECK_ORDER_NO", "盘点主表序号");
 
         private String code;
         private String description;
@@ -2034,7 +2034,7 @@ public class WmsEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum TRANS_QUAN_GENERAL_TAG {
-        MINUS(-1, "MINUS", "一条：负"), ZERO(0, "ZERO", "一条：0"), PLUS(1, "PLUS", "一条：正"), TWO(2, "TWO", "两条：一正一负");
+        SRC(-1, "SRC", "一条：负"), ZERO(0, "ZERO", "一条：0"), DEST(1, "DEST", "一条：正"), TWO(2, "TWO", "两条：一正一负");
 
         private String code;
         private String description;
@@ -2074,9 +2074,8 @@ public class WmsEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum DATA_STATUS {
-        ENABLE(1, "启用", "fa fa-success cell-fa fa-check"),
+        YES(1, "是", "fa fa-success cell-fa fa-check"),
-        DISABLE(2, "禁用", "fa fa-disabled cell-fa fa-times-circle"),
+        NO(2, "否", "fa fa-disabled cell-fa fa-times-circle");
-        LOCKING(3, "全部", "fa cell-fa fa-lock");
 
         private int value;
         private String description;
@@ -2110,4 +2109,86 @@ public class WmsEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     * 打印模板
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PRINT_TEMPLATE {
+        SN_PRINT_TEMPLATE(10, "SN_PRINT_TEMPLATE", "条码打印模板"),
+        ORDER_PRINT_TEMPLATE(20, "ORDER_PRINT_TEMPLATE", "订单打印模板"),
+        RC_BACK_PRINT_TEMPLATE(30, "RC_BACK_PRINT_TEMPLATE", "收货回执打印模板");
+
+        private int value;
+        private String code;
+        private String description;
+
+        PRINT_TEMPLATE(int value, String code, String description){
+            this.value = value;
+            this.description = description;
+            this.code = code;
+        }
+
+        public int getValue () {
+            return value;
+        }
+
+        public String getDescription () {
+            return description;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        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].getDescription();
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * 版本号
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum VERSION {
+        PO_VERSION(10, "VERSION", "PO版本号");
+
+        private int value;
+        private String code;
+        private String description;
+
+        VERSION(int value, String code, String description){
+            this.value = value;
+            this.description = description;
+            this.code = code;
+        }
+
+        public int getValue () {
+            return value;
+        }
+
+        public String getDescription () {
+            return description;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        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].getDescription();
+                }
+            }
+            return tmp;
+        }
+    }
 }

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserRolePagerModel.java

@@ -0,0 +1,20 @@
+package cn.estsh.i3plus.pojo.model.platform;
+
+import cn.estsh.i3plus.pojo.base.common.Pager;
+import cn.estsh.i3plus.pojo.platform.bean.SysRole;
+import lombok.Data;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : siliter
+ * @CreateDate : 2019-03-19 13:52
+ * @Modify:
+ **/
+@Data
+public class UserRolePagerModel {
+
+    private SysRole sysRole;
+
+    private Pager pager;
+}

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

@@ -86,8 +86,7 @@ public class WmsCSOrderDetails extends BaseBean {
     public Integer snStatus;
 
     /**
-     * 处理状态:1=已创建,5=已盘,10=已冻结
+     * 处理状态:10=已创建,20=已盘,30=已冻结,40=已解冻,50=取消冻结
-     * ,20=已解冻,30=取消冻结
      */
     @Column(name = "TRANS_STATUS")
     @ApiParam(value = "处理状态", example = "1")

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

@@ -65,4 +65,16 @@ public class WmsCSOrderMaster extends BaseBean {
     @Column(name = "IS_TASK")
     @ApiParam(value = "是否生产任务", example = "1")
     public Integer isTask;
+
+    @Transient
+    @ApiParam(value = "盘点物料清单")
+    public String[] wmsCSParts;
+
+    @Transient
+    @ApiParam(value = "盘点存储区清单")
+    public String[] wmsCSZones;
+
+    @Transient
+    @ApiParam(value = "盘点库位清单")
+    public String[] wmsCSLocates;
 }

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

@@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 
 /**
  * @Description : 盘点存储区信息
@@ -35,4 +36,8 @@ public class WmsCSZone extends BaseBean {
     @Column(name="ZONE_NO")
     @ApiParam("存储区代码")
     public String zoneNo;
+
+    @Transient
+    @ApiParam("库位代码")
+    public String locateNo;
 }

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

@@ -100,4 +100,12 @@ public class WmsDocMovementMaster extends BaseBean {
 
     @Transient
     private List<WmsDocMovementDetails> movementDetailsList;
+
+    @Transient
+    @ApiParam(value = "源库存地代码")
+    private String srcAreaNo;
+
+    @Transient
+    @ApiParam(value = "目的库存地代码")
+    private String desrAreaNo;
 }

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

@@ -91,18 +91,9 @@ public class WmsOpType extends BaseBean {
 
     @Column(name = "USE_TIME")
     @ApiParam(value = "标准工时(每箱)", example = "0")
-    private Integer userTime;
+    private Integer useTime;
 
     @Column(name = "IS_MULITI")
     @ApiParam(value = "是否允许多人操作", example = "0")
     private Integer isMuliti;
-
-    @Column(name = "TM_ID")
-    @ApiParam(value = "处理组件编号")
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long tmId;
-
-    @Column(name = "DATA_SRC")
-    @ApiParam("数据来源")
-    private String dataSrc;
 }

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

@@ -56,14 +56,6 @@ public class WmsTransQuan extends BaseBean {
     @ApiParam(value = "单位")
     private String unit;
 
-    @Column(name = "QTY")
-    @ApiParam(value = "交易数量", example = "1")
-    private Double qty;
-
-    @Column(name = "REJECT_QTY")
-    @ApiParam(value = "不合格交易数量", example = "1")
-    private Double rejectQty;
-
     @Column(name = "TRANS_STATUS")
     @ApiParam(value = "状态", example = "10")
     private Integer transStatus;
@@ -99,4 +91,36 @@ public class WmsTransQuan extends BaseBean {
     @Column(name = "ERROR_MESSAGE")
     @ApiParam(value = "错误信息")
     private String errorMessage;
+
+    @Column(name = "QTY")
+    @ApiParam(value = "可用数量", example = "0")
+    public Double qty;
+
+    @Column(name = "FAIL_QTY")
+    @ApiParam(value = "不合格数量", example = "0")
+    private Double failQty;
+
+    @Column(name = "HOLD_QTY")
+    @ApiParam(value = "隔离数量", example = "0")
+    private Double holdQty;
+
+    @Column(name = "QC_QTY")
+    @ApiParam(value = "质检中数量", example = "0")
+    private Double qcQty;
+
+    @Column(name = "RIN_QTY")
+    @ApiParam(value = "待入库数量", example = "0")
+    private Double rinQty;
+
+    @Column(name = "FREEZE_QTY")
+    @ApiParam(value = "冻结数量", example = "0")
+    private Double freezeQty;
+
+    @Column(name = "CONSIGN_QTY")
+    @ApiParam(value = "寄售数量", example = "0")
+    private Double consignQty;
+
+    @Column(name = "LOCK_QTY")
+    @ApiParam(value = "锁定数量", example = "0")
+    private Double lockQty;
 }

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

@@ -24,6 +24,12 @@ import java.util.stream.Collectors;
  **/
 public class WmsHqlPack {
 
+    public static String packInParams(String colnumName,String[] params){
+        StringBuffer sb = new StringBuffer();
+        HqlPack.getInPackString(String.join(",", params),colnumName,sb);
+        return sb.toString();
+    }
+
     /**
      * 封装公用查询参数
      * @param bean 实体对象
@@ -188,7 +194,7 @@ public class WmsHqlPack {
         StringBuffer result = new StringBuffer();
 
         HqlPack.getStringLikerPack(wmsPart.getPartNo(), "partNo", result);
-        HqlPack.getStringLikerPack(wmsPart.getPartName(), "partNameRdd", result);
+        HqlPack.getStringLikerPack(wmsPart.getPartName(), "partName", result);
         HqlPack.getStringLikerPack(wmsPart.getPartSpec(), "partSpec", result);
         HqlPack.getStringLikerPack(wmsPart.getPartType(), "partType", result);
 
@@ -351,7 +357,6 @@ public class WmsHqlPack {
 
         HqlPack.getStringEqualPack(wmsOpType.getOpTypeCode(), "opTypeCode", result);
         HqlPack.getStringLikerPack(wmsOpType.getOpTypeName(), "opTypeName", result);
-        HqlPack.getNumEqualPack(wmsOpType.getTmId(), "tmId", result);
         HqlPack.getNumEqualPack(wmsOpType.getSeq(), "seq", result);
 
         getStringBuilderPack(wmsOpType, result);
@@ -643,6 +648,7 @@ public class WmsHqlPack {
         StringBuffer result = new StringBuffer();
 
         HqlPack.getStringLikerPack(wmsTaskInfo.getMoveNo(), "moveNo", result);
+        HqlPack.getStringLikerPack(wmsTaskInfo.getOrderNo(), "orderNo", result);
         HqlPack.getStringLikerPack(wmsTaskInfo.getUserNo(), "userNo", result);
         HqlPack.getStringLikerPack(wmsTaskInfo.getOpTypeCode(), "opTypeCode", result);
         HqlPack.getStringLikerPack(wmsTaskInfo.getRemark(), "remark", result);
@@ -1471,4 +1477,16 @@ public class WmsHqlPack {
         getStringBuilderPack(wmsTransModule, result);
         return result.toString();
     }
+    /**
+     * 根据条件查询系统配置信息
+     * @param wmsConfig
+     * @return
+     */
+    public static String packHqlWmsConfig(WmsConfig wmsConfig) {
+        StringBuffer result = new StringBuffer();
+        HqlPack.getStringEqualPack(wmsConfig.getConfigCode(), "configCode", result);
+        getStringBuilderPack(wmsConfig, result);
+        return result.toString();
+    }
+
 }