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

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

@@ -533,10 +533,10 @@ public class BlockReportEnumUtil {
         LIKE_LEFT(6, "LIKE", "左模糊"),
         LIKE_RIGHT(7, "LIKE", "右模糊"),
         EQUAL(8, "=", "等于"),
-        EQUAL_NOT(9, "!=", "不等于"),
+        EQUAL_NOT(9, "<>", "不等于"),
-        AND(10, "AND", "AND"),
+//        AND(10, "AND", "AND"),
-        OR(11, "OR", "OR"),
+//        OR(11, "OR", "OR"),
-        NOT(12, "NOT", "NOT"),
+//        NOT(12, "NOT", "NOT"),
         IS_NULL(13, "IS NULL", "IS NULL"),
         IS_NOT_NULL(14, "IS NOT NULL", "IS NOT NULL");
 

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

@@ -94,6 +94,39 @@ public class WmsEnumUtil {
     }
 
     /**
+     * 移库单主表：优先级
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PRIORITY {
+        NORMAL(1, "正常"), URGENT(2, "紧急");
+        private int value;
+        private String description;
+
+        PRIORITY(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;
+        }
+    }
+
+    /**
      * 订单明细信息 状态
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
@@ -250,22 +283,20 @@ public class WmsEnumUtil {
     }
 
     /**
-     * 主表信息 状态
+     * 移库单主表状态；质检单主表状态
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum ORDER_STATUS {
+    public enum MASTER_ORDER_STATUS {
-        CREATE(1, "新建"),
+        CREATE(10, "新建"),
-        RECEIPT(10, "收货中"),
+        RECEIPT(20, "处理中"),
-        RECEIPT_FINISH(20, "收货完成"),
+        RECEIPT_FINISH(30, "已完成"),
-        WAREHOUSING(30, "入库中"),
+        CLOSED(40, "已关闭"),
-        WAREHOUSING_FINISH(40, "入库完成"),
+        CANCELLED(50, "已取消");
-        CLOSED(50, "已关闭"),
-        CANCELLED(60, "已取消");
 
         private int value;
         private String description;
 
-        ORDER_STATUS(int value, String description) {
+        MASTER_ORDER_STATUS(int value, String description) {
             this.value = value;
             this.description = description;
         }
@@ -698,53 +729,6 @@ public class WmsEnumUtil {
         }
     }
 
-    /**
-     * 外部单据：移库单状态
-     */
-    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum OUT_MOVEMENT_STATUS {
-        CREATE(10, "新建"),
-        RECEIPT(20, "处理中"),
-        RECEIPT_FINISH(30, "已完成"),
-        CLOSED(40, "已关闭"),
-        CANCELLED(50, "已取消");
-
-        private int value;
-        private String description;
-
-        OUT_MOVEMENT_STATUS(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 int descOf(String desc) {
-            int tmp = 1;
-            for (int i = 0; i < values().length; i++) {
-                if (values()[i].description.equals(desc)) {
-                    tmp = values()[i].value;
-                }
-            }
-            return tmp;
-        }
-    }
 
     /**
      * 物料：分类（ABC）
@@ -1261,8 +1245,8 @@ public class WmsEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum QC_INFO_TYPE {
-        FEED(1, "进料检验"),
+        FEED(10, "进料检验"),
-        ONLINE(10, "在线检验"),
+        ONLINE(20, "在线检验"),
         EMDPRODUCT(30, "成品检验"),
         SHIPMENTS(40, "出货检验");
 
@@ -1777,6 +1761,8 @@ public class WmsEnumUtil {
         OP_SEQ("OP_SEQ", "作业类型序号"),
         TRAN_SEQ("TRAN_SEQ", "交易类型序号"),
         STEP_SEQ("STEP_SEQ", "步骤调用序号"),
+        MOVE_ORDER_NO("MOVE_ORDER_NO", "移库单单号"),
+        QC_ORDER_NO("QC_ORDER_NO", "质检单单号"),
         ORDER_NO("ORDER_NO", "盘点主表序号");
 
         private String code;

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefTaskCyclePlan.java

@@ -35,6 +35,11 @@ public class SysRefTaskCyclePlan extends BaseBean {
     @JsonSerialize(using = ToStringSerializer.class)
     private Long taskCycleId;
 
+    @Column(name="TASK_PLAN_ID")
+    @ApiParam(value ="任务计划id" ,example = "-1")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long taskPlanId;
+
     @Column(name="TASK_PLAN_NAME")
     @ApiParam(value ="任务计划名称")
     private String taskPlanName;

modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/sqlpack/ReportHqlPack.java

@@ -77,12 +77,13 @@ public class ReportHqlPack {
 
         // 查询参数封装
         HqlPack.getNumEqualPack(template.getTemplateType(),"templateType",result);
-        if(template.getTemplateStatus() != null &&
+        if(template.getTemplateStatus() != null){
-                template.getTemplateStatus().intValue() == BlockReportEnumUtil.TEMPLATE_STATUS.SAVE_TEMPLATE_ATTR_CONFIRM.getValue()){
+            if(template.getTemplateStatus().intValue() == CommonEnumUtil.USER_STATUS.DISABLE.getValue()){
-            HqlPack.getNumEqualPack(template.getTemplateStatus(),"templateStatus",result);
+                HqlPack.getNumEqualPack(BlockReportEnumUtil.TEMPLATE_STATUS.SAVE_TEMPLATE_ATTR_CONFIRM.getValue(),"templateStatus",result);
             }else {
                 HqlPack.getNumSmallerPack(BlockReportEnumUtil.TEMPLATE_STATUS.SAVE_TEMPLATE_ATTR_CONFIRM.getValue(),"templateStatus",result);
             }
+        }
         HqlPack.getStringLikerPack(template.getName(),"name",result);
 
         // 添加默认排序

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

@@ -120,6 +120,10 @@ public class WmsDocMovementDetails extends BaseBean {
     @ApiParam(value = "已收货数量", example = "1")
     private Double recQty;
 
+    @Column(name = "MOVE_QTY")
+    @ApiParam(value = "已移库数量", example = "1")
+    private Double moveQty;
+
     @Column(name = "SRC_AREA_NO")
     @ApiParam("源库存地代码")
     public String srcAreaNo;

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

@@ -49,10 +49,6 @@ public class WmsDocMovementSn extends BaseBean {
     @ApiParam(value = "数量", example = "0")
     public Double qty;
 
-//    @Column(name="TRANS_QTY")
-//    @ApiParam(value = "处理数量", example = "0")
-//    public Double transQty;
-
 
     @Column(name="UNIT")
     @ApiParam("单位")
@@ -66,6 +62,6 @@ public class WmsDocMovementSn extends BaseBean {
     public Integer snStatus;
 
     @Column(name="SN")
-    @ApiParam("一维条码")
+    @ApiParam("条码")
     public String sn;
 }

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

@@ -53,10 +53,6 @@ public class WmsMoveDetails extends BaseBean {
     @ApiParam("客户编号")
     public String custNo;
 
-    @Transient
-    @ApiParam(value = "需求数量", example = "0")
-    public Double qty;
-
     @Column(name="TRANS_QTY")
     @ApiParam(value = "处理数量", example = "0")
     public Double transQty;
@@ -127,9 +123,8 @@ public class WmsMoveDetails extends BaseBean {
         this.finishedCounts = finishedCounts;
     }
 
-    public WmsMoveDetails(String partNo, double qty ,double transQty){
+    public WmsMoveDetails(String partNo, double transQty){
         this.partNo = partNo;
-        this.qty = qty;
         this.transQty = transQty;
     }
 

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

@@ -76,10 +76,26 @@ public class WmsMoveSn extends BaseBean {
     @ApiParam(value = "源数量", example = "0")
     public Double srcQty;
 
+    @Column(name="SRC_WH_NO")
+    @ApiParam("源仓库代码")
+    public String srcWhNo;
+
+    @Column(name="SRC_ZONE_NO")
+    @ApiParam("源存储区代码")
+    public String srcZoneNo;
+
     @Column(name="SRC_LOCATE_NO")
     @ApiParam("源库位代码")
     public String srcLocateNo;
 
+    @Column(name="DEST_WH_NO")
+    @ApiParam("目标仓库代码")
+    public String destWhNo;
+
+    @Column(name="DEST_ZONE_NO")
+    @ApiParam("目标存储区代码")
+    public String destZoneNo;
+
     @Column(name="DEST_LOCATE_NO")
     @ApiParam("目标库位代码")
     public String destLocateNo;

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

@@ -64,13 +64,13 @@ public class WmsQCMaster extends BaseBean {
     @ApiParam(value = "版本", example = "1")
     public Integer version;
 
-    @Column(name="PO_NO")
+    @Column(name = "REF_TYPE")
-    @ApiParam("采购单号")
+    @ApiParam("关联单号类型")
-    public String poNo;
+    public String refType;
 
-    @Column(name="ASN_NO")
+    @Column(name = "REF_SRC")
-    @ApiParam("ASN单号")
+    @ApiParam("关联单号")
-    public String asnNo;
+    public String refSrc;
 
     @Column(name = "IB_NO")
     @ApiParam("入库单号")

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

@@ -28,81 +28,71 @@ import javax.persistence.Table;
 @Api("库存交易信息")
 public class WmsTransQuan extends BaseBean {
 
+    @Column(name = "TRANS_NO")
+    @ApiParam(value = "事务编号")
+    private String transNo;
+
     @Column(name = "WH_NO")
-    @ApiParam("仓库代码")
+    @ApiParam(value = "仓库代码")
-    public String whNo;
+    private String whNo;
 
     @Column(name = "ZONE_NO")
-    @ApiParam("存储区编号")
+    @ApiParam(value = "存储区编号")
-    public String zoneNo;
+    private String zoneNo;
 
     @Column(name = "LOCATE_NO")
-    @ApiParam("库位编号")
+    @ApiParam(value = "库位编号")
-    public String locateNo;
+    private String locateNo;
 
     @Column(name = "PART_NO")
-    @ApiParam("物料编码")
+    @ApiParam(value = "零件编号")
-    public String partNo;
+    private String partNo;
 
     @Column(name = "PART_NAME_RDD")
-    @ApiParam("物料名称")
+    @ApiParam(value = "零件名称")
-    public String partNameRdd;
+    private String partNameRdd;
-
-    @Column(name = "SN")
-    @ApiParam("条码")
-    public String sn;
 
     @Column(name = "UNIT")
-    @ApiParam("单位")
+    @ApiParam(value = "单位")
-    public String unit;
+    private String unit;
-
-    /**
-     * 关联交易类型表
-     */
-    @Column(name = "TRANS_CODE")
-    @ApiParam(value = "交易类型代码")
-    public String transCode;
 
     @Column(name = "QTY")
-    @ApiParam(value = "交易数量", example = "0")
+    @ApiParam(value = "交易数量", example = "1")
-    public Double qty;
+    private Double qty;
 
     @Column(name = "REJECT_QTY")
-    @ApiParam(value = "不合格交易数量", example = "0")
+    @ApiParam(value = "不合格交易数量", example = "1")
-    public Double rejectQty;
+    private Double rejectQty;
 
-    @Column(name = "TRANS_NO")
+    @Column(name = "TRANS_STATUS")
-    @ApiParam(value = "事务编号")
+    @ApiParam(value = "状态", example = "10")
-    public String transNo;
+    private Integer transStatus;
 
-    /**
-     * ASN,PO,SO
-     */
     @Column(name = "REF_TYPE")
     @ApiParam(value = "关联单据类型")
-    public String refType;
+    private String refType;
+
+    @Column(name = "BUSI_TYPE")
+    @ApiParam(value = "业务类型", example = "10")
+    private Integer busiType;
 
     @Column(name = "REF_SRC")
     @ApiParam(value = "关联单号")
-    public String refSrc;
+    private String refSrc;
 
-    @Column(name = "TRANS_STATUS")
+    @Column(name = "TRANS_CODE")
-    @ApiParam(value = "状态", example = "1")
+    @ApiParam(value = "交易代码")
-    public Integer transStatus;
+    private String transCode;
-
-    @Column(name = "ERROR_MESSAGE")
-    @ApiParam(value = "错误信息")
-    public String errorMessage;
 
-    @Column(name = "CUST_NO")
+    @Column(name = "MOVE_NO")
-    @ApiParam(value = "客户编号")
+    @ApiParam(value = "库存移动单号")
-    private String custNo;
+    private String moveNo;
 
     @Column(name = "VENDOR_NO")
     @ApiParam(value = "供应商编号")
     private String vendorNo;
 
-    @Column(name="MOVE_NO")
+    @Column(name = "CUST_NO")
-    @ApiParam("移动单号")
+    @ApiParam(value = "客户编号")
-    public String moveNo;
+    private String custNo;
 }

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

@@ -955,10 +955,10 @@ public class WmsHqlPack {
         HqlPack.getStringEqualPack(wmsQCMaster.getOrderNo(), "orderNo", result);
         //业务类型
         HqlPack.getNumEqualPack(wmsQCMaster.getOrderType(), "orderType", result);
-        //采购单号
+        //关联单据类型
-        HqlPack.getStringEqualPack(wmsQCMaster.getPoNo(), "poNo", result);
+        HqlPack.getStringEqualPack(wmsQCMaster.getRefType(), "refType", result);
-        //ASN单号
+        //关联单据号
-        HqlPack.getStringEqualPack(wmsQCMaster.getAsnNo(), "asnNo", result);
+        HqlPack.getStringEqualPack(wmsQCMaster.getRefSrc(), "refSrc", result);
         //入库单号
         HqlPack.getStringEqualPack(wmsQCMaster.getIbNo(), "ibNo", result);