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;
         }
@@ -645,14 +676,15 @@ public class WmsEnumUtil {
         ALLOCATION(40, "ALLOCATION", "调拨"),
         SCATTERED_OUT(50, "SCATTERED_OUT", "零星出库"),
         SCATTERED_IN(60, "SCATTERED_IN", "零星入库"),
-        NC_WAREHOSING(70, "NC_WAREHOSING", "NC入库"),
+        NC_WAREHOSING_IN(70, "NC_WAREHOSING", "NC入库"),
         SUPPLIER_RETURN(80, "SUPPLIER_RETURN", "供应商退货"),
         CUSTOMER_RETURN(90, "CUSTOMER_RETURN", "客户退货"),
         PRODUCT_RETURN(100, "PRODUCT_RETURN", "生产退料"),
         INSTRUCTION_MOVE(110, "INSTRUCTION_MOVE", "指令移库"),
         SCRAPPING_OUT(120, "SCRAPPING_OUT", "报废出库"),
         RECEIVING_IN(130, "RECEIVING_IN", "收货入库"),
-        OUTSOURCING_BACK(140, "OUTSOURCING_BACK", "委外退回");
+        OUTSOURCING_BACK(140, "OUTSOURCING_BACK", "委外退回"),
+        NC_WAREHOSING_OUT(150, "NC_WAREHOSING_OUT", "NC出库");
 
         private int value;
         private String code;
@@ -697,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）
@@ -908,7 +893,7 @@ public class WmsEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum TASK_INFO_STATUS {
-        CREATE(10, "创建"), FINISH(20, "待处理"), FAIL(30, "已处理");
+        CREATE(10, "创建"), FINISH(20, "处理中"), FAIL(30, "已处理");
 
         private int value;
         private String description;
@@ -1260,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, "出货检验");
 
@@ -1776,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;
@@ -1832,18 +1819,53 @@ public class WmsEnumUtil {
     }
 
     /**
-     * 可选项类型枚举
+     * 数据对象枚举
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum DATA_OBJ_TYPE {
+        WAREHOUSE(10, "WAREHOUSE", "仓库对象"),
+        ZONE(20, "ZONE", "存储区对象"),
+        LOCATE(30, "LOCATE", "库位对象"),
+        MATERIAL(40, "MATERIAL", "物料对象");
+
+        private String code;
+        private String description;
+        int value;
+
+        DATA_OBJ_TYPE(int value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+    }
+
+    /**
+     * 数据操作枚举
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum DATA_ROLE_TYPE {
+    public enum DATA_OBJ_OP_TYPE {
-        WAREHOUSE(1, "WAREHOUSE", "仓库"),
+        ADD(10, "ADD", "新增"),
-        STOCK(2, "STOCK", "库存");
+        DEL(20, "DEL", "删除"),
+        UPD(30, "UPD", "修改"),
+        QUERY(40, "QUERY", "查询");
 
         private String code;
         private String description;
         int value;
 
-        DATA_ROLE_TYPE(int value, String code, String description) {
+        DATA_OBJ_OP_TYPE(int value, String code, String description) {
             this.value = value;
             this.code = code;
             this.description = description;

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/HqlPack.java

@@ -451,6 +451,32 @@ public class HqlPack {
 	 * @param columnName
 	 * @param result
 	 */
+	public static void getInOrPackString(String data,String columnName, StringBuffer result){
+		if (data != null && data.trim().length()>0) {
+			data = getSafeParam(data);
+			//判断最后一位是不是逗号
+			if(data.lastIndexOf(",") != (data.length()-1)){
+				data += ",";
+			}
+			String[] dataArray = data.substring(0, data.length()-1).split(",");
+			data = "";
+			for (int i = 0 ; i < dataArray.length ;i++) {
+				if(i ==  dataArray.length -1){
+					data += "'" + dataArray[i] + "'";
+				}else{
+					data += "'" + dataArray[i] + "',";
+				}
+			}
+			result.append(" or model."+columnName+" in ( "+ data+ " )");
+		}
+	}
+
+	/**
+	 * 封装in String查询语句
+	 * @param data
+	 * @param columnName
+	 * @param result
+	 */
 	public static void getNotInPackString(String data,String columnName, StringBuffer result){
 		if (data != null && data.trim().length()>0) {
 			data = getSafeParam(data);

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

@@ -29,4 +29,13 @@ public class TransSnModle extends BaseComponetsParam{
     @ApiParam(value = "分组编号")
     public String packageNo;
 
+    /**
+     * 针对抽点
+     */
+    public double cpQty;
+
+    /**
+     * 供应商批次
+     */
+    public String dateCode;
 }

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,11 +77,12 @@ 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_FULFIL.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 {
+            }else {
-            HqlPack.getNumSmallerPack(BlockReportEnumUtil.TEMPLATE_STATUS.SAVE_TEMPLATE_FULFIL.getValue(),"templateStatus",result);
+                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/WmsASNMasterDetails.java

@@ -1,7 +1,6 @@
 package cn.estsh.i3plus.pojo.wms.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
-import cn.estsh.i3plus.pojo.wms.modelbean.WmsOrderDetailsModel;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -28,7 +27,30 @@ import java.util.List;
 @EqualsAndHashCode(callSuper = true)
 @Table(name = "WMS_DOC_ASN_DETAILS")
 @Api("ASN订单明细信息")
-public class WmsASNMasterDetails extends WmsOrderDetailsModel {
+public class WmsASNMasterDetails extends BaseBean {
+    @Column(name = "PART_NO")
+    @ApiParam("物料编码")
+    public String partNo;
+
+    @Column(name = "PART_NAME_RDD")
+    @ApiParam("物料名称")
+    public String partNameRdd;
+
+    @Column(name = "ITEM")
+    @ApiParam("行号")
+    public Integer item;
+
+    @Column(name = "QTY")
+    @ApiParam(value = "需求数量", example = "0")
+    public Double qty;
+
+    @Column(name = "UNIT")
+    @ApiParam("单位")
+    public String unit;
+
+    @Column(name = "ORDER_NO")
+    @ApiParam("订单号")
+    public String orderNo;
 
     @Column(name = "PO_ITEM")
     @ApiParam("PO行号")
@@ -36,11 +58,11 @@ public class WmsASNMasterDetails extends WmsOrderDetailsModel {
 
     @Column(name = "ZDATE")
     @ApiParam("计划交货日期")
-    public String zDate;
+    public String planDate;
 
     @Column(name = "ZTIME")
     @ApiParam("计划交货时间")
-    public String zTime;
+    public String planTime;
 
     /**
      * 状态:N=正常,C=行取消,R=已收货

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

@@ -1,7 +1,6 @@
 package cn.estsh.i3plus.pojo.wms.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
-import cn.estsh.i3plus.pojo.wms.modelbean.WmsOrderDetailsModel;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -27,7 +26,30 @@ import javax.persistence.Table;
 @EqualsAndHashCode(callSuper = true)
 @Table(name = "WMS_DOC_CS_DETAILS")
 @Api("盘点单冻结信息")
-public class WmsCSOrderDetails extends WmsOrderDetailsModel {
+public class WmsCSOrderDetails extends BaseBean {
+    @Column(name = "PART_NO")
+    @ApiParam("物料编码")
+    public String partNo;
+
+    @Column(name = "PART_NAME_RDD")
+    @ApiParam("物料名称")
+    public String partNameRdd;
+
+    @Column(name = "ITEM")
+    @ApiParam("行号")
+    public Integer item;
+
+    @Column(name = "QTY")
+    @ApiParam(value = "需求数量", example = "0")
+    public Double qty;
+
+    @Column(name = "UNIT")
+    @ApiParam("单位")
+    public String unit;
+
+    @Column(name = "ORDER_NO")
+    @ApiParam("订单号")
+    public String orderNo;
 
     @Column(name = "WH_NO")
     @ApiParam("仓库代码")

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

@@ -62,4 +62,7 @@ public class WmsCSOrderMaster extends BaseBean {
     @ApiParam(value = "盘点明细集")
     public List<WmsCSOrderDetails> wmsCSOrderDetailsList;
 
+    @Column(name = "IS_TASK")
+    @ApiParam(value = "是否生产任务", example = "1")
+    public Integer isTask;
 }

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

@@ -29,6 +29,14 @@ import javax.persistence.Transient;
 @Api("抽点记录信息")
 public class WmsCheckFactRecord extends BaseBean {
 
+    @Column(name = "REF_TYPE")
+    @ApiParam(value = "关联单据类型")
+    private String refType;
+
+    @Column(name = "REF_SRC")
+    @ApiParam(value = "关联单据编号")
+    private String refSrc;
+
     @Column(name="PO_NO")
     @ApiParam("采购单号")
     public String poNo;

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

@@ -1,7 +1,6 @@
 package cn.estsh.i3plus.pojo.wms.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
-import cn.estsh.i3plus.pojo.wms.modelbean.WmsOrderDetailsModel;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -27,7 +26,30 @@ import javax.persistence.Table;
 @EqualsAndHashCode(callSuper = true)
 @Table(name = "WMS_DOC_MOVEMENT_DETAILS")
 @Api("移库单明细表")
-public class WmsDocMovementDetails extends WmsOrderDetailsModel {
+public class WmsDocMovementDetails extends BaseBean {
+    @Column(name = "PART_NO")
+    @ApiParam("物料编码")
+    public String partNo;
+
+    @Column(name = "PART_NAME_RDD")
+    @ApiParam("物料名称")
+    public String partNameRdd;
+
+    @Column(name = "ITEM")
+    @ApiParam("行号")
+    public Integer item;
+
+    @Column(name = "QTY")
+    @ApiParam(value = "需求数量", example = "0")
+    public Double qty;
+
+    @Column(name = "UNIT")
+    @ApiParam("单位")
+    public String unit;
+
+    @Column(name = "ORDER_NO")
+    @ApiParam("订单号")
+    public String orderNo;
 
     @Column(name = "SRC_WH_NO")
     @ApiParam("源仓库代码")
@@ -98,6 +120,10 @@ public class WmsDocMovementDetails extends WmsOrderDetailsModel {
     @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

@@ -55,13 +55,13 @@ public class WmsDocMovementSn extends BaseBean {
     public String unit;
 
     /**
-     * 状态:10 = 创建，20 = 已打印，30 = 已收货
+     * 状态:同库存条码状态一致
      */
     @Column(name="SN_STATUS")
     @ApiParam(value = "状态", example = "10")
     public Integer snStatus;
 
-    @Column(name="SN_1D")
+    @Column(name="SN")
-    @ApiParam("一维条码")
+    @ApiParam("条码")
-    public String snOneBarCode;
+    public String sn;
 }

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

@@ -39,4 +39,16 @@ public class WmsLocatePart extends BaseBean{
     @Column(name="PART_NAME_RDD")
     @ApiParam(value ="物料名称")
     private String partNameRdd;
+
+    @Column(name = "PULL_QTY")
+    @ApiParam(value = "拉动数量", example = "0")
+    private Double pullQty;
+
+    @Column(name = "MAX")
+    @ApiParam(value = "最大值", example = "0")
+    private Double max;
+
+    @Column(name = "MIN")
+    @ApiParam(value = "最小值", example = "0")
+    private Double min;
 }

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

@@ -3,6 +3,8 @@ package cn.estsh.i3plus.pojo.wms.bean;
 import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -45,14 +47,6 @@ public class WmsOpType extends BaseBean {
     @ApiParam(value = "序号", example = "0")
     private Integer seq;
 
-    @Column(name = "TM_ID")
-    @ApiParam(value = "交易处理组件ID", example = "0")
-    private Integer tmId;
-
-    @Column(name = "DATA_SRC")
-    @ApiParam("数据来源")
-    private String dataSrc;
-
     @Column(name = "ORDER_MIN")
     @ApiParam(value = "单据处理下限", example = "0")
     private Integer orderMin;
@@ -103,7 +97,12 @@ public class WmsOpType extends BaseBean {
     @ApiParam(value = "是否允许多人操作", example = "0")
     private Integer isMuliti;
 
-    @Transient
+    @Column(name = "TM_ID")
-    @ApiParam(value = "单据集")
+    @ApiParam(value = "处理组件编号")
-    private List<Map<String, List>> orderList;
+    @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/WmsPOMasterDetails.java

@@ -1,7 +1,6 @@
 package cn.estsh.i3plus.pojo.wms.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
-import cn.estsh.i3plus.pojo.wms.modelbean.WmsOrderDetailsModel;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -27,7 +26,30 @@ import javax.persistence.Table;
 @EqualsAndHashCode(callSuper = true)
 @Table(name = "WMS_DOC_PO_DETAILS")
 @Api("PO订单明细信息")
-public class WmsPOMasterDetails extends WmsOrderDetailsModel {
+public class WmsPOMasterDetails extends BaseBean {
+    @Column(name = "PART_NO")
+    @ApiParam("物料编码")
+    public String partNo;
+
+    @Column(name = "PART_NAME_RDD")
+    @ApiParam("物料名称")
+    public String partNameRdd;
+
+    @Column(name = "ITEM")
+    @ApiParam("行号")
+    public Integer item;
+
+    @Column(name = "QTY")
+    @ApiParam(value = "需求数量", example = "0")
+    public Double qty;
+
+    @Column(name = "UNIT")
+    @ApiParam("单位")
+    public String unit;
+
+    @Column(name = "ORDER_NO")
+    @ApiParam("订单号")
+    public String orderNo;
 
     @Column(name = "PRINT_QTY")
     @ApiParam(value = "条码打印数量", example = "0")

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

@@ -1,7 +1,6 @@
 package cn.estsh.i3plus.pojo.wms.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
-import cn.estsh.i3plus.pojo.wms.modelbean.WmsOrderDetailsModel;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
@@ -26,41 +25,64 @@ import javax.persistence.Table;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name="WMS_QC_DETAILS")
+@Table(name = "WMS_QC_DETAILS")
 @Api("质检单明细信息")
-public class WmsQCDetails extends WmsOrderDetailsModel {
+public class WmsQCDetails extends BaseBean {
+    @Column(name = "PART_NO")
+    @ApiParam("物料编码")
+    public String partNo;
+
+    @Column(name = "PART_NAME_RDD")
+    @ApiParam("物料名称")
+    public String partNameRdd;
+
+    @Column(name = "ITEM")
+    @ApiParam("行号")
+    public Integer item;
+
+    @Column(name = "QTY")
+    @ApiParam(value = "需求数量", example = "0")
+    public Double qty;
+
+    @Column(name = "UNIT")
+    @ApiParam("单位")
+    public String unit;
+
+    @Column(name = "ORDER_NO")
+    @ApiParam("订单号")
+    public String orderNo;
 
     /**
      * 状态:N=正常,C=行取消
      */
-    @Column(name="ITEM_STATUS")
+    @Column(name = "ITEM_STATUS")
     @ApiParam(value = "状态", example = "1")
     public Integer itemStatus;
 
-    @Column(name="REMARK")
+    @Column(name = "REMARK")
     @ApiParam("备注")
     public String reMark;
 
 
-    @Column(name="FACT_QTY")
+    @Column(name = "FACT_QTY")
     @ApiParam(value = "实检数量", example = "0")
     public Double factQty;
 
-    @Column(name="PASS_QTY")
+    @Column(name = "PASS_QTY")
     @ApiParam(value = "合格数量", example = "0")
     public Double passQty;
 
-    @Column(name="REJECT_QTY")
+    @Column(name = "REJECT_QTY")
     @ApiParam(value = "不合格数量", example = "0")
     public Double rejectQty;
 
-    @Column(name="QC_USER")
+    @Column(name = "QC_USER")
     @ApiParam("检验员")
     public String qcUser;
 
-    @Column(name="QC_TIME")
+    @Column(name = "QC_TIME")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @ApiParam(value="检验时间",example = "2000-01-01 01:00:00")
+    @ApiParam(value = "检验时间", example = "2000-01-01 01:00:00")
     public String qcTime;
 
 }

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

@@ -25,11 +25,11 @@ import javax.persistence.Transient;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name="WMS_QC_MASTER")
+@Table(name = "WMS_QC_MASTER")
 @Api("质检单主表信息")
 public class WmsQCMaster extends BaseBean {
 
-    @Column(name="ORDER_NO")
+    @Column(name = "ORDER_NO")
     @ApiParam("单号")
     public String orderNo;
 
@@ -37,47 +37,47 @@ public class WmsQCMaster extends BaseBean {
      * 业务类型:IQC=进料检验,IPQC=在线检验,
      * FQC=成品检验,OQC=出货检验
      */
-    @Column(name="ORDER_TYPE")
+    @Column(name = "ORDER_TYPE")
     @ApiParam(value = "业务类型", example = "0")
     public Integer orderType;
 
     /**
      * 状态:1=创建,5=待处理,10=已完成,90=已关闭,91=已取消
      */
-    @Column(name="ORDER_STATUS")
+    @Column(name = "ORDER_STATUS")
     @ApiParam(value = "状态", example = "1")
     public Integer orderStatus;
 
-    @Column(name="REMARK")
+    @Column(name = "REMARK")
     @ApiParam("备注")
     public String reMark;
 
-    @Column(name="CUSTOMER_NO")
+    @Column(name = "CUSTOMER_NO")
     @ApiParam("客户编号")
     public String customerNo;
 
-    @Column(name="VENDOR_NO")
+    @Column(name = "VENDOR_NO")
     @ApiParam("供应商编号")
     public String vendorNo;
 
-    @Column(name="VERSION")
+    @Column(name = "VERSION")
     @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")
+    @Column(name = "IB_NO")
     @ApiParam("入库单号")
     public String ibNo;
 
     @Transient
-    @ApiParam(value ="客户简称")
+    @ApiParam(value = "客户简称")
     private String custName;
 
     @Transient

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

@@ -24,7 +24,7 @@ import javax.persistence.Table;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name="WMS_TASK_DETAILS")
+@Table(name = "WMS_TASK_DETAILS")
 @Api("作业任务明细信息")
 public class WmsTaskDetails extends BaseBean {
 
@@ -109,4 +109,12 @@ public class WmsTaskDetails extends BaseBean {
     @Column(name = "REF_SRC")
     @ApiParam(value = "关联单据编号")
     private String refSrc;
+
+    @Column(name = "SRC_AREA_NO")
+    @ApiParam("源库存地代码")
+    public String srcAreaNo;
+
+    @Column(name = "DEST_AREA_NO")
+    @ApiParam("目的库存地代码")
+    public String destAreaNo;
 }

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

@@ -57,7 +57,7 @@ public class WmsTaskInfo extends BaseBean {
 
     @Column(name = "TRANS_TYPE_CODE")
     @ApiParam("交易类型")
-    private String transTypeCode;
+    public String transTypeCode;
 
     @Column(name = "PRE_USE_TIME")
     @ApiParam(value = "预计作业时间(分钟)", example = "1")

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

@@ -25,7 +25,7 @@ import javax.persistence.Table;
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
 @Table(name = "WMS_TASK_SRC")
-@Api("作业任务表")
+@Api("作业任务数据来源表")
 public class WmsTaskSrc extends BaseBean {
 
     @Column(name = "OP_TYPE_CODE")
@@ -51,6 +51,7 @@ public class WmsTaskSrc extends BaseBean {
     @Column(name = "TRANS_CODE")
     @ApiParam("默认交易类型")
     public String transCode;
+
     @Column(name = "IS_ONE_STEP")
     @ApiParam("是否一步法")
     public Integer isOneStep;

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")
+    @Column(name = "MOVE_NO")
-    @ApiParam(value = "错误信息")
+    @ApiParam(value = "库存移动单号")
-    public String errorMessage;
+    private String moveNo;
-
-    @Column(name = "CUST_NO")
-    @ApiParam(value = "客户编号")
-    private String custNo;
 
     @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/modelbean/WmsOrderDetailsModel.java

@@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.wms.modelbean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import cn.estsh.i3plus.pojo.wms.bean.WmsASNMasterDetails;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -9,10 +10,7 @@ import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
-import javax.persistence.Column;
+import javax.persistence.*;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-import javax.persistence.Transient;
 import java.util.List;
 
 /**
@@ -23,6 +21,10 @@ import java.util.List;
  * @Modify:
  **/
 @Data
+@Entity
+//以子类table为准
+@javax.persistence.Inheritance(strategy= InheritanceType.TABLE_PER_CLASS)
+@JsonInclude(value = JsonInclude.Include.NON_EMPTY)
 @Api("单据明细Model")
 public class WmsOrderDetailsModel extends BaseBean {
 

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsDataAuthRepository.java

@@ -0,0 +1,19 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.WareHouse;
+import cn.estsh.i3plus.pojo.wms.bean.WmsDataAuth;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+/**
+ * @Description : wms数据权限
+ * @Reference :
+ * @Author : jack.lv
+ * @CreateDate : 2019-03-08 14:47
+ * @Modify:
+ **/
+@Repository
+public interface WmsDataAuthRepository extends BaseRepository<WmsDataAuth, Long> {
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTaskSrcRepository.java

@@ -12,6 +12,5 @@ import org.springframework.stereotype.Repository;
  * @CreateDate : 2019-03-06 14:41
  * @Modify:
  **/
-@Repository
 public interface WmsTaskSrcRepository extends BaseRepository<WmsTaskSrc, Long> {
 }

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

@@ -2,13 +2,18 @@ package cn.estsh.i3plus.pojo.wms.sqlpack;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
+import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
 import cn.estsh.i3plus.pojo.base.tool.HqlPack;
 import cn.estsh.i3plus.pojo.base.tool.SqlPack;
 import cn.estsh.i3plus.pojo.wms.bean.*;
+import com.alibaba.fastjson.JSONObject;
+import com.google.common.base.Strings;
 import org.apache.commons.lang3.StringUtils;
 
-import java.util.Date;
 import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
 
 /**
  * @Description : 仓库管理对象封装
@@ -53,8 +58,8 @@ public class WmsHqlPack {
         HqlPack.getNumEqualPack(wmsPOMasterDetails.getItem(), "item", result);
         HqlPack.getStringLikerPack(wmsPOMasterDetails.getPartNo(), "partNo", result);
         HqlPack.getStringLikerPack(wmsPOMasterDetails.getPartNameRdd(), "partNameRdd", result);
-        HqlPack.getStringLikerPack(wmsPOMasterDetails.getZTime(), "zTime", result);
+        HqlPack.getStringLikerPack(wmsPOMasterDetails.getZTime(), "planTime", result);
-        HqlPack.getStringLikerPack(wmsPOMasterDetails.getZDate(), "zDate", result);
+        HqlPack.getStringLikerPack(wmsPOMasterDetails.getZDate(), "planDate", result);
 
         getStringBuilderPack(wmsPOMasterDetails, result);
 
@@ -83,7 +88,7 @@ public class WmsHqlPack {
      * @param orderNos
      * @return
      */
-    public static String packHqlWmsDocMovementDetailsByOrderNos(List<String> orderNos) {
+    public static String packWmsOrderDetailsByOrderNos(List<String> orderNos) {
         StringBuffer result = new StringBuffer();
         StringBuffer orderNoStr = new StringBuffer();
         for (int i = 0; i < orderNos.size(); i++) {
@@ -580,8 +585,8 @@ public class WmsHqlPack {
         HqlPack.getNumEqualPack(wmsASNMasterDetails.getQty(), "qty", result);
         HqlPack.getStringEqualPack(wmsASNMasterDetails.getPoItem(), "poItem", result);
         HqlPack.getStringEqualPack(wmsASNMasterDetails.getUnit(), "unit", result);
-        HqlPack.getStringEqualPack(wmsASNMasterDetails.getZDate(), "zDate", result);
+        HqlPack.getStringEqualPack(wmsASNMasterDetails.getPlanDate(), "planDate", result);
-        HqlPack.getStringEqualPack(wmsASNMasterDetails.getZTime(), "zTime", result);
+        HqlPack.getStringEqualPack(wmsASNMasterDetails.getPlanTime(), "planTime", result);
         HqlPack.getNumEqualPack(wmsASNMasterDetails.getItemStatus(), "itemStatus", result);
         HqlPack.getStringEqualPack(wmsASNMasterDetails.getPackAge(), "packAge", result);
         HqlPack.getNumEqualPack(wmsASNMasterDetails.getIsFree(), "isFree", result);
@@ -950,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);
 
@@ -1313,8 +1318,8 @@ public class WmsHqlPack {
     public static String packHqlWmsStockSnLike(WmsStockSn wmsStockSn) {
         StringBuffer result = new StringBuffer();
         HqlPack.getStringLikerPack(wmsStockSn.getSn(),"sn", result);
-        HqlPack.getOrderByPack(new Object[]{2}, new String[]{"createDatetime"}, result);
         getStringBuilderPack(wmsStockSn, result);
+        HqlPack.getOrderByPack(new Object[]{2}, new String[]{"createDatetime"}, result);
         return result.toString();
     }
 
@@ -1330,4 +1335,69 @@ public class WmsHqlPack {
         getStringBuilderPack(wmsStockQuan, result);
         return result.toString();
     }
+
+    /**
+     *  根据用户角色id列表查询数据权限信息
+     * @return
+     */
+    public static String packHqlWmsDataAuth(WmsDataAuth dataAuth, List<String> roleIds) {
+        StringBuffer result = new StringBuffer();
+        HqlPack.getStringEqualPack(dataAuth.getDataObj() ,"dataObj", result);
+        String data = String.join(",", roleIds);
+        HqlPack.getInPackString(data, "roleCode", result);
+        getStringBuilderPack(new WmsDataAuth(), result);
+        return result.toString();
+    }
+
+    /**
+     * 根据权限数据拼查询任务详情sql
+     * @param groupDataAuth
+     * @return
+     */
+    public static String packHqlWmsTaskDetail(Map<String ,List<WmsDataAuth>> groupDataAuth) {
+        StringBuffer result = new StringBuffer();
+        Set<Map.Entry<String, List<WmsDataAuth>>> entries = groupDataAuth.entrySet();
+        //拼sql
+        entries.stream().filter(o->!Strings.isNullOrEmpty(o.getKey())).forEach(o->{
+            List<WmsDataAuth> value = o.getValue();
+            List<String> vList = value.stream().map(x -> x.getDataObjValue()).collect(Collectors.toList());
+            String data = String.join(",", vList);
+            if (StringUtils.isNotBlank(data)) {
+                List<Map> mapList = JSONObject.parseArray(data, Map.class);
+                if (StringUtils.equalsIgnoreCase(WmsEnumUtil.DATA_OBJ_TYPE.WAREHOUSE.getValue() + "", o.getKey())) {
+                    for (Map whNoItem : mapList) {
+                        HqlPack.getInOrPackString(whNoItem.get("WH_CODE").toString(), "destWhNo", result);
+                    }
+                } else if (StringUtils.equalsIgnoreCase(WmsEnumUtil.DATA_OBJ_TYPE.LOCATE.getValue() + "", o.getKey())) {
+                    for (Map locateNoItem : mapList) {
+                        HqlPack.getInOrPackString(locateNoItem.get("LOCATE_NO").toString(), "destLocateNo", result);
+                    }
+                } else if (StringUtils.equalsIgnoreCase(WmsEnumUtil.DATA_OBJ_TYPE.ZONE.getValue() + "", o.getKey())) {
+                    for (Map zoneNoItem : mapList) {
+                        HqlPack.getInOrPackString(zoneNoItem.get("ZONE_CODE").toString(), "destZoneNo", result);
+                    }
+                } else if (StringUtils.equalsIgnoreCase(WmsEnumUtil.DATA_OBJ_TYPE.MATERIAL.getValue() + "", o.getKey())) {
+                    for (Map zoneNoItem : mapList) {
+                        HqlPack.getInOrPackString(zoneNoItem.get("PART_NO").toString(), "partNo", result);
+                    }
+                }
+            }
+        });
+        getStringBuilderPack(new WmsDataAuth(), result);
+        return result.toString();
+    }
+
+    /**
+     * 给定字段动态in sql
+     * @param columnName
+     * @param vals
+     * @return
+     */
+    public static String packHqlAndIn(BaseBean bean,String columnName,List<String> vals) {
+        StringBuffer result = new StringBuffer();
+        String data = String.join(",", vals);
+        HqlPack.getInPackString(data,columnName,result);
+        getStringBuilderPack(bean, result);
+        return result.toString();
+    }
 }