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

@@ -910,9 +910,10 @@ public class CommonEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum CONTENT_TYPE {
         FORM("x-www-form-urlencoded", "表单"),
-        FILE(" multipart/form-data", "文件"),
-        JSON(" application/json", "JSON"),
-        XML(" application/xml ", "XML");
+        FILE("multipart/form-data", "文件"),
+        JSON("application/json", "JSON"),
+        NONE("default", "默认不需要设置Content-Type"),
+        XML("application/xml", "XML");
 
         private String value;
         private String description;

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

@@ -12,6 +12,43 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 public class MesEnumUtil {
 
     /**
+     * mes-pcn定时任务状态
+     *
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum MES_PCN_TASK_STATUS {
+
+        OPEN(1, "开启"),
+        CLOSE(2, "关闭");
+
+        private int value;
+        private String description;
+
+        MES_PCN_TASK_STATUS(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
      * mes工步类型
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
@@ -844,15 +881,17 @@ public class MesEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum STEP_PARAM_TYPE {
 
-        QUALIFIED(10, "数字"),
-        DEFECTED(20, "字符串"),
-        SCRAPED(30, "可选值");
+        QUALIFIED(10,"number", "数字"),
+        DEFECTED(20, "text","字符串"),
+        SCRAPED(30,"select", "可选值");
 
         private int value;
+        private String code;
         private String description;
 
-        STEP_PARAM_TYPE(int value, String description) {
+        STEP_PARAM_TYPE(int value,String code, String description) {
             this.value = value;
+            this.code = code;
             this.description = description;
         }
 
@@ -860,6 +899,8 @@ public class MesEnumUtil {
             return value;
         }
 
+        public String getCode(){return code;}
+
         public String getDescription() {
             return description;
         }

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

@@ -586,6 +586,16 @@ public class WmsEnumUtil {
             }
             return tmp;
         }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
     }
 
 
@@ -903,6 +913,16 @@ public class WmsEnumUtil {
             return tmp;
         }
 
+        public static String valueOfDescription(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++) {
@@ -953,6 +973,16 @@ public class WmsEnumUtil {
             return tmp;
         }
 
+        public static String valueOfDescription(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++) {
@@ -1166,6 +1196,16 @@ public class WmsEnumUtil {
             }
             return tmp;
         }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
     }
 
     /**
@@ -1320,7 +1360,7 @@ public class WmsEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum ALD_EXECUTE_STATUS {
-        NORMAL(10, "创建"),
+        CREATE(10, "创建"),
         PROCESSING(20, "处理中"),
         COMPLETED(30, "已完成");
         private int value;
@@ -2759,7 +2799,7 @@ public class WmsEnumUtil {
     public enum STOCK_LEVEL_STATUS {
         LOW("LOW", "低于最低库存"),
         HIGH("HIGH", "高于最高库存"),
-        NORMAL("NORMAL", "安全库存");
+        NORMAL("CREATE", "安全库存");
 
         private String value;
         private String description;

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java

@@ -14,6 +14,7 @@ import org.springframework.data.jpa.repository.support.SimpleJpaRepository;
 import javax.persistence.*;
 import java.io.Serializable;
 import java.lang.reflect.Field;
+import java.lang.reflect.Modifier;
 import java.text.SimpleDateFormat;
 import java.util.*;
 
@@ -1190,8 +1191,15 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
 
             //属性值过滤，避免null值
             if(initParam){
-                for(Field checkField : clazz.getFields()){
-                    if(checkField.get(item) == null){
+                for (Field checkField : clazz.getFields()) {
+                    if (!Modifier.isFinal(checkField.getModifiers()) && checkField.get(item) == null) {
+                        // 未赋值的属性，进行初始化赋值
+                        fieldSetInitParam(item, checkField);
+                    }
+                }
+                for (Field checkField : clazz.getDeclaredFields()) {
+                    checkField.setAccessible(true);
+                    if (!Modifier.isFinal(checkField.getModifiers()) && checkField.get(item) == null) {
                         // 未赋值的属性，进行初始化赋值
                         fieldSetInitParam(item, checkField);
                     }

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

@@ -41,7 +41,7 @@ public class MesPcn extends BaseBean {
 
     @Column(name="WORK_CENTER_CODE")
     @ApiParam("工作中心")
-    private String workCentreCode;
+    private String workCenterCode;
 
     @Column(name="PCN_VERSION")
     @ApiParam("PCN版本")

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

@@ -41,7 +41,7 @@ public class MesPcn extends BaseBean {
 
     @Column(name="WORK_CENTER_CODE")
     @ApiParam("工作中心")
-    private String workCentreCode;
+    private String workCenterCode;
 
     @Column(name="PCN_VERSION")
     @ApiParam("PCN版本")

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

@@ -28,102 +28,99 @@ import javax.persistence.Transient;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name="WMS_ACTION_LOG")
-@Api(value="作业记录表")
+@Table(name = "WMS_ACTION_LOG")
+@Api(value = "作业记录表")
 public class WmsActionLog extends BaseBean {
 
     private static final long serialVersionUID = 8664373854844368861L;
-    @Column(name="TASK_NO")
+    @Column(name = "TASK_NO")
     @ApiParam(value = "作业任务编号", example = "1")
     @JsonSerialize(using = ToStringSerializer.class)
     public String taskNo;
 
-    @Column(name="TRANS_TYPE_CODE")
+    @Column(name = "TRANS_TYPE_CODE")
     @ApiParam(value = "交易类型编号")
     public String transTypeCode;
 
-    @Column(name="MOVE_NO")
+    @Transient
+    @Column(name = "MOVE_NO")
     @ApiParam(value = "移动单单号")
     public String moveNo;
 
-    @Column(name="AG_ID")
+    @Column(name = "AG_ID")
     @ApiParam(value = "作业流程编号", example = "1")
     @JsonSerialize(using = ToStringSerializer.class)
     public Long agId;
 
     //get单独处理
-    public Long getAgId() {
-        if(agId != null) {
-            return agId.longValue();
-        }else{
-            return agId;
-        }
+    public long getAgIdVal() {
+        return agId == null ? 0 : agId.longValue();
     }
 
     @Column(name = "AL_NAME_RDD")
     @ApiParam(value = "流程名称")
     public String agNameRdd;
 
-    @Column(name="ACTION_USER_NAME")
+    @Column(name = "ACTION_USER_NAME")
     @ApiParam(value = "作业人员")
     public String actionUserName;
 
-    @Column(name="FIX_NO")
+    @Column(name = "FIX_NO")
     @ApiParam(value = "设备编号")
     public String fixNo;
 
-    @Column(name="START_TIME")
+    @Column(name = "START_TIME")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiParam(value = "开始作业时间")
     public String startTime;
 
-    @Column(name="END_TIME")
+    @Column(name = "END_TIME")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiParam(value = "结束作业时间")
     public String endTime;
 
     @Transient
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @ApiParam(value="开始作业时间查询用，查询起始日期",example = "2018-01-01 01:00:00")
+    @ApiParam(value = "开始作业时间查询用，查询起始日期", example = "2018-01-01 01:00:00")
     public String startTimeStart;
 
     @Transient
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @ApiParam(value="开始作业时间查询用，查询结束日期",example = "2018-12-31 23:59:59")
+    @ApiParam(value = "开始作业时间查询用，查询结束日期", example = "2018-12-31 23:59:59")
     public String startTimeEnd;
 
     @Transient
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @ApiParam(value="结束作业时间查询用，查询起始日期",example = "2018-01-01 01:00:00")
+    @ApiParam(value = "结束作业时间查询用，查询起始日期", example = "2018-01-01 01:00:00")
     public String endTimeStart;
 
     @Transient
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @ApiParam(value="结束作业时间查询用，查询结束日期",example = "2018-12-31 23:59:59")
+    @ApiParam(value = "结束作业时间查询用，查询结束日期", example = "2018-12-31 23:59:59")
     public String endTimeEnd;
 
     // 状态:1=创建,10=处理中,20=已完成
-    @Column(name="ACTION_STATUS")
+    @Column(name = "ACTION_STATUS")
     @ApiParam(value = "作业状态", example = "1")
     public Integer actionStatus;
 
-    @Column(name="TOTAL_STEP")
+    @Column(name = "TOTAL_STEP")
     @ApiParam(value = "总步数", example = "1")
     public Integer totalStep;
 
-    @Column(name="CURRENT_STEP")
+    @Column(name = "CURRENT_STEP")
     @ApiParam(value = "当前步骤", example = "1")
     public Integer currentStep;
 
-    @Column(name="INIT_AM_ID")
+    @Column(name = "INIT_AM_ID")
     @ApiParam(value = "初始化组件编号", example = "0")
     public Long initAmId;
 
-    @Column(name="DETAILS_AM_ID")
+    @Column(name = "DETAILS_AM_ID")
     @ApiParam(value = "明细处理组件编号", example = "0")
     public Long detailsAmId;
 
-    @Column(name="END_AM_ID")
+    @Column(name = "END_AM_ID")
     @ApiParam(value = "结束组件编号", example = "0")
     public Long endAmId;
 

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

@@ -36,9 +36,9 @@ public class WmsActionLogDetails extends BaseBean {
     @JsonSerialize(using = ToStringSerializer.class)
     public Long alId;
 
-    @Column(name = "AL_NAME_RDD")
-    @ApiParam(value = "流程名称")
-    public String agNameRdd;
+    @Column(name = "AG_ID")
+    @ApiParam(value = "流程ID")
+    public Long agId;
 
     @Column(name = "SEQ")
     @ApiParam(value = "序号", example = "1")
@@ -113,6 +113,9 @@ public class WmsActionLogDetails extends BaseBean {
     @ApiParam(value = "作业流程明细ID", example = "1")
     public Long agdId;
 
+    @Column(name="MOVE_NO")
+    @ApiParam(value = "移动单单号")
+    public String moveNo;
     public Long getAsId() {
         if (asId != null) {
             return asId.longValue();

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

@@ -1,6 +1,9 @@
 package cn.estsh.i3plus.pojo.wms.bean;
 
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
+import com.alibaba.fastjson.annotation.JSONField;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -104,6 +107,7 @@ public class WmsMoveDetails extends BaseBean {
      */
     @Column(name="ITEM_STATUS")
     @ApiParam(value = "状态", example = "0")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.MOVE_ORDER_STATUS.class,refForeignKey = "value",value = "description")
     public Integer itemStatus;
 
     @Column(name="REF_ITEM")
@@ -147,23 +151,39 @@ public class WmsMoveDetails extends BaseBean {
 
     @Transient
     @ApiParam("业务类型编码")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_BUSI_TYPE.class,refForeignKey = "value",value = "description")
     private Integer busiTypeCode;
 
     @Transient
+    @ApiParam("生产线")
     private String workCenterCode;
 
     @Transient
-    private String fPartNo;
+    @ApiParam("父物料编码")
+    private String fpartNo;
 
     @Transient
-    private String fPartName;
+    @ApiParam("父物料名称")
+    private String fpartName;
 
     @Transient
+    @ApiParam("数量")
     private Double qty;
 
     @Transient
+    @ApiParam("创建时间")
     private String createDateTime;
 
+   /* @JSONField(name="fPartNo")
+    public String getfPartNo() {
+        return fPartNo;
+    }
+
+    @JSONField(name="fPartName")
+    public String getfPartName() {
+        return fPartName;
+    }*/
+
     public WmsMoveDetails(){}
 
     public WmsMoveDetails(String partNo, Long waitingCounts ,Long finishedCounts){
@@ -195,8 +215,8 @@ public class WmsMoveDetails extends BaseBean {
         this.partNo = partNo;
         this.partNameRdd = partNameRdd;
         this.workCenterCode = workCenterCode;
-        this.fPartNo = fPartNo;
-        this.fPartName = fPartName;
+        this.fpartNo = fPartNo;
+        this.fpartName = fPartName;
         this.unit = unit;
         this.qty = qty;
         this.createDateTime = createDateTime;

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

@@ -1,6 +1,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 cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -40,6 +42,7 @@ public class WmsMoveMaster extends BaseBean {
      */
     @Column(name = "ORDER_STATUS")
     @ApiParam(value = "状态", example = "0")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.MOVE_ORDER_STATUS.class,refForeignKey = "value",value = "description")
     public Integer orderStatus;
 
     @Column(name = "REMARK")
@@ -65,6 +68,7 @@ public class WmsMoveMaster extends BaseBean {
 
     @Column(name = "BUSI_TYPE_CODE")
     @ApiParam(value = "业务类型编码")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_BUSI_TYPE.class,refForeignKey = "value",value = "description")
     private Integer busiTypeCode;
 
     @Column(name = "REF_ORDER_NO")
@@ -77,6 +81,7 @@ public class WmsMoveMaster extends BaseBean {
 
     @Transient
     @ApiParam("状态")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.MOVE_ORDER_STATUS.class,refForeignKey = "value",value = "description")
     private Integer itemStatus;
 
     @Transient
@@ -141,6 +146,28 @@ public class WmsMoveMaster extends BaseBean {
 
     public WmsMoveMaster(){};
 
+    public WmsMoveMaster(String orderNo, Integer orderStatus,  String transTypeCode, String errorMessage,
+                         Integer isUrgent,String carNo, Integer busiTypeCode, String refOrderNo, String refSrc,String partNo, Integer itemStatus,String remark,
+                         String organizeCode,String createDatetime,String createUser,String modifyDatetime,String modifyUser) {
+        this.orderNo = orderNo;
+        this.orderStatus = orderStatus;
+        this.remark = remark;
+        this.isUrgent=isUrgent;
+        this.transTypeCode = transTypeCode;
+        this.errorMessage = errorMessage;
+        this.busiTypeCode = busiTypeCode;
+        this.partNo = partNo;
+        this.itemStatus = itemStatus;
+        this.refOrderNo = refOrderNo;
+        this.carNo = carNo;
+        this.refSrc = refSrc;
+        this.organizeCode =organizeCode;
+        this.createDatetime= createDatetime;
+        this.createUser = createUser;
+        this.modifyDatetime =modifyDatetime;
+        this.modifyUser =modifyUser;
+    }
+
     public WmsMoveMaster(Long id,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 refSrc) {
         this.id = id;

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

@@ -1,6 +1,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 cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -66,6 +68,7 @@ public class WmsMoveSn extends BaseBean {
      */
     @Column(name="ITEM_STATUS")
     @ApiParam(value = "状态", example = "1")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.MOVE_ORDER_STATUS.class,refForeignKey = "value",value = "description")
     public Integer itemStatus;
 
     @Column(name="REMARK")
@@ -129,18 +132,22 @@ public class WmsMoveSn extends BaseBean {
 
     @Column(name="SRC_QC_STATUS")
     @ApiParam(value = "源质量状态", example = "1")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_QC_STATUS.class,refForeignKey = "value",value = "description")
     public Integer srcQcStatus;
 
     @Column(name="SRC_SN_STATUS")
     @ApiParam(value = "源条码状态", example = "1")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_STATUS.class,refForeignKey = "value",value = "description")
     public Integer srcSnStatus;
 
     @Column(name="DEST_QC_STATUS")
     @ApiParam(value = "目的质量状态", example = "1")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_QC_STATUS.class,refForeignKey = "value",value = "description")
     public Integer descQcStatus;
 
     @Column(name="DEST_SN_STATUS")
     @ApiParam(value = "目的条码状态", example = "1")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_STATUS.class,refForeignKey = "value",value = "description")
     public Integer destSnStatus;
 
     @Column(name="DATE_CODE")
@@ -157,9 +164,9 @@ public class WmsMoveSn extends BaseBean {
 
     @Transient
     @ApiParam("业务类型编码")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_BUSI_TYPE.class,refForeignKey = "value",value = "description")
     private Integer busiTypeCode;
 
-
     @Transient
     @ApiParam(value = "交易类型代码")
     private String transTypeCode;

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

@@ -92,7 +92,7 @@ public class WmsPart extends BaseBean {
 
     @ColumnDefault("2")
     @Column(name = "IQC")
-    @ApiParam(value = "收货检验否", example = "1")
+    @ApiParam(value = "是否免检", example = "1")
     private Integer iqc;
 
     @Column(name = "MIN")

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

@@ -13,6 +13,7 @@ import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
 import javax.persistence.Transient;
+import java.util.List;
 
 /**
  * @Description : 产品发运信息
@@ -26,94 +27,99 @@ import javax.persistence.Transient;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name="WMS_DOC_SHIPPING")
+@Table(name = "WMS_DOC_SHIPPING")
 @Api("产品发运信息")
 public class WmsShipping extends BaseBean {
 
     private static final long serialVersionUID = 5760351204320621363L;
-    @Column(name="ORDER_NO")
+    @Column(name = "ORDER_NO")
     @ApiParam("发运单号")
     public String orderNo;
 
-    @Column(name="PART_NO")
+    @Column(name = "PART_NO")
     @ApiParam("物料编码")
     public String partNo;
 
-    @Column(name="PART_NAME_RDD")
+    @Column(name = "PART_NAME_RDD")
     @ApiParam("物料名称")
     public String partNameRdd;
 
-    @Column(name="QTY")
+    @Column(name = "QTY")
     @ColumnDefault("0")
     @ApiParam(value = "需求数量", example = "0")
     public Double qty;
 
-    @Column(name="UNIT")
+    @Column(name = "UNIT")
     @ApiParam("单位")
     public String unit;
 
-    @Column(name="SN")
+    @Column(name = "SN")
     @ApiParam("条码")
     public String sn;
 
     /**
      * 状态:10=新建,20=已处理,30=处理出错
      */
-    @Column(name="ORDER_STATUS")
+    @Column(name = "ORDER_STATUS")
     @ApiParam(value = "状态", example = "10")
     public Integer orderStatus;
 
-    @Column(name="REMARK")
+    @Transient
+    @ApiParam(value = "状态")
+    public List<Integer> orderStatusList;
+
+    @Column(name = "REMARK")
     @ApiParam("备注")
     public String remark;
 
-    @Column(name="SRC")
+    @Column(name = "SRC")
     @ApiParam("单据来源")
     public String src;
 
-    @Column(name="CUST_NO")
+    @Column(name = "CUST_NO")
     @ApiParam("客户编码")
     public String custNo;
 
-    @Column(name="SHIPPING_FLAG")
+    @Column(name = "SHIPPING_FLAG")
     @ApiParam("特殊发货标志")
     public String shippingFlag;
 
-    @Column(name="SHIPPING_TIME")
+    @Column(name = "SHIPPING_TIME")
     @ApiParam("发运时间")
     public String shippingTime;
 
     @Transient
-    @ApiParam(value ="客户简称")
+    @ApiParam(value = "客户简称")
     private String custName;
 
     @Transient
     @ApiParam(value = "发往地简称")
     private String flagName;
 
-    @Column(name="AREA_NO")
+    @Column(name = "AREA_NO")
     @ApiParam("ERP库存地")
     public String areaNo;
 
-    @Column(name="CAR_NO")
+    @Column(name = "CAR_NO")
     @ApiParam("车号")
     public String carNo;
 
-    @Column(name="ERROR_MESSAGE")
+    @Column(name = "ERROR_MESSAGE")
     @ApiParam("错误信息")
     public String errorMessage;
 
-    @Column(name="IS_LOCK")
-    @ApiParam("是否锁定 是否锁定：1=锁定 2=未锁定" )
+    @Column(name = "IS_LOCK")
+    @ApiParam("是否锁定 是否锁定：1=锁定 2=未锁定")
     public Integer isLock;
 
-    @Column(name="ERP_SYNC_FLAG")
-    @ApiParam("ERP同步标识 ERP同步标识：10=待同步，20=同步成功，30=同步失败" )
+    @Column(name = "ERP_SYNC_FLAG")
+    @ApiParam("ERP同步标识 ERP同步标识：10=待同步，20=同步成功，30=同步失败")
     public Integer erpSyncFlag;
 
-    public WmsShipping(){}
+    public WmsShipping() {
+    }
 
-    public WmsShipping(Long id,Double qty, String carNo, String partNo, String partNameRdd, String custNo, String unit,String areaNo) {
+    public WmsShipping(Long id, Double qty, String carNo, String partNo, String partNameRdd, String custNo, String unit, String areaNo) {
         this.id = id;
         this.partNo = partNo;
         this.partNameRdd = partNameRdd;

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

@@ -95,6 +95,11 @@ public class WmsZones extends BaseBean {
         this.zoneNo = zoneNo;
     }
 
+    public WmsZones(String zoneNo,String areaNo){
+        this.zoneNo = zoneNo;
+        this.areaNo = areaNo;
+    }
+
     public WmsZones(){}
 
 }

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

@@ -45,19 +45,18 @@ public class WmsHqlPack {
         DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", hqlStr);
 
         DdlPreparedPack.getStringLikerPack(bean.getCreateUser(), "createUser", hqlStr);
-        if(StringUtils.isNotBlank(bean.getCreateDateTimeStart())&&StringUtils.isNotBlank(bean.getCreateDateTimeEnd())){
-            DdlPreparedPack.timeBuilder(bean.getCreateDateTimeStart(),bean.getCreateDateTimeEnd(),"createDatetime",hqlStr,true);
+        if (StringUtils.isNotBlank(bean.getCreateDateTimeStart()) && StringUtils.isNotBlank(bean.getCreateDateTimeEnd())) {
+            DdlPreparedPack.timeBuilder(bean.getCreateDateTimeStart(), bean.getCreateDateTimeEnd(), "createDatetime", hqlStr, true);
         }
 
         return hqlStr;
     }
 
     /**
-     *
      * @param wmsFix
      * @return
      */
-    public static DdlPackBean packHqlWmsFix(WmsFix wmsFix){
+    public static DdlPackBean packHqlWmsFix(WmsFix wmsFix) {
         DdlPackBean result = new DdlPackBean();
 
         //查询参数封装
@@ -77,9 +76,10 @@ public class WmsHqlPack {
 
     /**
      * 单位换算 分页查询
+     *
      * @return
      */
-    public static DdlPackBean packHqlWmsUnitConvertByPager(WmsUnitConvert wmsUnitConvert){
+    public static DdlPackBean packHqlWmsUnitConvertByPager(WmsUnitConvert wmsUnitConvert) {
         DdlPackBean result = new DdlPackBean();
 
         //查询参数封装
@@ -175,11 +175,12 @@ public class WmsHqlPack {
 
     /**
      * 移库单号集合查询条件封装
+     *
      * @param orderNoList
      * @param organizeCode
      * @return
      */
-    public static DdlPackBean packWmsDocMovementMasterByOrderNos(List<String> orderNoList,String organizeCode) {
+    public static DdlPackBean packWmsDocMovementMasterByOrderNos(List<String> orderNoList, String organizeCode) {
         DdlPackBean packBean = new DdlPackBean();
         DdlPreparedPack.getInPack(orderNoList, "orderNo", packBean);
         DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", packBean);
@@ -616,6 +617,8 @@ public class WmsHqlPack {
         DdlPreparedPack.getStringEqualPack(wmsShipping.getSn(), "sn", result);
         //发运状态
         DdlPreparedPack.getNumEqualPack(wmsShipping.getOrderStatus(), "orderStatus", result);
+        //发运状态集合
+        DdlPreparedPack.getInPackList(wmsShipping.getOrderStatusList(), "orderStatus", result);
         //特殊发货标志
         DdlPreparedPack.getStringEqualPack(wmsShipping.getShippingFlag(), "shippingFlag", result);
         //单据来源
@@ -1305,6 +1308,10 @@ public class WmsHqlPack {
 
         //查询参数封装
         DdlPreparedPack.getStringEqualPack(wmsCSOrderDetails.getOrderNo(), "orderNo", result);
+        DdlPreparedPack.getStringEqualPack(wmsCSOrderDetails.getPartNo(), "partNo", result);
+        DdlPreparedPack.getStringEqualPack(wmsCSOrderDetails.getLocateNo(), "locateNo", result);
+        DdlPreparedPack.getStringEqualPack(wmsCSOrderDetails.getZoneNo(), "zoneNo", result);
+        DdlPreparedPack.getStringEqualPack(wmsCSOrderDetails.getSn(), "sn", result);
 
         getStringBuilderPack(wmsCSOrderDetails, result);
 
@@ -1323,6 +1330,9 @@ public class WmsHqlPack {
         //查询参数封装
         DdlPreparedPack.getStringEqualPack(wmsCSFactTrans.getOrderNo(), "orderNo", result);
         DdlPreparedPack.getStringEqualPack(wmsCSFactTrans.getPartNo(), "partNo", result);
+        DdlPreparedPack.getStringEqualPack(wmsCSFactTrans.getLocateNo(), "locateNo", result);
+        DdlPreparedPack.getStringEqualPack(wmsCSFactTrans.getZoneNo(), "zoneNo", result);
+        DdlPreparedPack.getStringEqualPack(wmsCSFactTrans.getSn(), "sn", result);
 
         getStringBuilderPack(wmsCSFactTrans, result);
 
@@ -2067,7 +2077,7 @@ public class WmsHqlPack {
         DdlPreparedPack.getStringLikerPack(wmsCSRange.getZoneNo(), "zoneNo", result);
 
         DdlPreparedPack.getOrderByPack(new Object[]{1}, new String[]{
-                DdlPreparedPack.getOrderColConvertType("item",CommonEnumUtil.BASIS_TYPE.INT.getValue())}, result);
+                DdlPreparedPack.getOrderColConvertType("item", CommonEnumUtil.BASIS_TYPE.INT.getValue())}, result);
         getStringBuilderPack(wmsCSRange, result);
 
         return result;
@@ -2240,19 +2250,19 @@ public class WmsHqlPack {
 
         DdlPreparedPack.getStringEqualPack(wmsStockSn.getVendorNo(), "vendorNo", result);
         // 库位不为空
-        DdlPreparedPack.getStringNotNullPack( "locateNo", result);
-        DdlPreparedPack.getStringNoEqualPack("","locateNo", result);
+        DdlPreparedPack.getStringNotNullPack("locateNo", result);
+        DdlPreparedPack.getStringNoEqualPack("", "locateNo", result);
         // 排除创建及出库状态条码
-        if(wmsStockSn.getSnStatus() != null){
+        if (wmsStockSn.getSnStatus() != null) {
             DdlPreparedPack.getNumEqualPack(wmsStockSn.getSnStatus(), "snStatus", result);
         }
-        DdlPreparedPack.getNumNOEqualPack(WmsEnumUtil.STOCK_SN_STATUS.CREATE.getValue(),"snStatus",result);
-        DdlPreparedPack.getNumNOEqualPack(WmsEnumUtil.STOCK_SN_STATUS.OUT_STOCK.getValue(),"snStatus",result);
+        DdlPreparedPack.getNumNOEqualPack(WmsEnumUtil.STOCK_SN_STATUS.CREATE.getValue(), "snStatus", result);
+        DdlPreparedPack.getNumNOEqualPack(WmsEnumUtil.STOCK_SN_STATUS.OUT_STOCK.getValue(), "snStatus", result);
 
-        DdlPreparedPack.getNumEqualPack(wmsStockSn.getSnType(),"snType",result);
+        DdlPreparedPack.getNumEqualPack(wmsStockSn.getSnType(), "snType", result);
 
         //数量大于0
-        DdlPreparedPack.getNumberBiggerPack(0,"qty",result);
+        DdlPreparedPack.getNumberBiggerPack(0, "qty", result);
         DdlPreparedPack.getStringRightLikerPack(wmsStockSn.getSn(), "sn", result);
         DdlPreparedPack.getStringEqualPack(wmsStockSn.getDateCode(), "dateCode", result);
         DdlPreparedPack.getStringEqualPack(wmsStockSn.getLotNo(), "lotNo", result);
@@ -2272,7 +2282,7 @@ public class WmsHqlPack {
     public static DdlPackBean packHqlWmsActionLogByActionLog(WmsActionLog actionLog) {
         DdlPackBean packBean = new DdlPackBean();
         DdlPreparedPack.timeBuilder(actionLog.getCreateDatetime(), "createDatetime", packBean, false, false);
-        DdlPreparedPack.getStringEqualPack(actionLog.getMoveNo(), "moveNo", packBean);
+//        DdlPreparedPack.getStringEqualPack(actionLog.getMoveNo(), "moveNo", packBean);
         DdlPreparedPack.getStringEqualPack(actionLog.getTransTypeCode(), "transTypeCode", packBean);
         DdlPreparedPack.getStringEqualPack(actionLog.getFixNo(), "fixNo", packBean);
         DdlPreparedPack.getNumEqualPack(actionLog.getAgId(), "agId", packBean);
@@ -2282,13 +2292,13 @@ public class WmsHqlPack {
         DdlPreparedPack.getNumEqualPack(actionLog.getIsValid(), "isValid", packBean);
         DdlPreparedPack.getNumEqualPack(actionLog.getIsDeleted(), "isDeleted", packBean);
 
-        if((actionLog.getStartTimeStart() != null&&actionLog.getStartTimeStart() !="")
-                || (actionLog.getStartTimeEnd() != null&&actionLog.getStartTimeEnd() != "")){
+        if ((actionLog.getStartTimeStart() != null && actionLog.getStartTimeStart() != "")
+                || (actionLog.getStartTimeEnd() != null && actionLog.getStartTimeEnd() != "")) {
             DdlPreparedPack.timeBuilder(actionLog.getStartTimeStart(), actionLog.getStartTimeEnd(), "startTime", packBean, true);
         }
 
-        if((actionLog.getEndTimeStart() != null&&actionLog.getEndTimeStart() != "")
-                || (actionLog.getEndTimeEnd() != null&&actionLog.getEndTimeEnd() != "")){
+        if ((actionLog.getEndTimeStart() != null && actionLog.getEndTimeStart() != "")
+                || (actionLog.getEndTimeEnd() != null && actionLog.getEndTimeEnd() != "")) {
             DdlPreparedPack.timeBuilder(actionLog.getEndTimeStart(), actionLog.getEndTimeEnd(), "endTime", packBean, true);
         }
 
@@ -2332,9 +2342,10 @@ public class WmsHqlPack {
 
     /**
      * 单位换算 分页查询
+     *
      * @return
      */
-    public static DdlPackBean packHqlWmsStockInitializeByPager(WmsStockInitialize wmsStockInitialize){
+    public static DdlPackBean packHqlWmsStockInitializeByPager(WmsStockInitialize wmsStockInitialize) {
         DdlPackBean result = new DdlPackBean();
 
         //查询参数封装