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/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;
+        }
     }
 
     /**

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

@@ -3,6 +3,7 @@ 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;
@@ -150,6 +151,7 @@ public class WmsMoveDetails extends BaseBean {
 
     @Transient
     @ApiParam("业务类型编码")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_BUSI_TYPE.class,refForeignKey = "value",value = "description")
     private Integer busiTypeCode;
 
     @Transient
@@ -158,11 +160,11 @@ public class WmsMoveDetails extends BaseBean {
 
     @Transient
     @ApiParam("父物料编码")
-    private String fPartNo;
+    private String fpartNo;
 
     @Transient
     @ApiParam("父物料名称")
-    private String fPartName;
+    private String fpartName;
 
     @Transient
     @ApiParam("数量")
@@ -172,6 +174,16 @@ public class WmsMoveDetails extends BaseBean {
     @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){
@@ -203,8 +215,8 @@ public class WmsMoveDetails extends BaseBean {
         this.partNo = partNo;
         this.partNameRdd = partNameRdd;
         this.workCenterCode = workCenterCode;
-        this.fPartNo = fPartNo;
+        this.fpartNo = fPartNo;
-        this.fPartName = fPartName;
+        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

@@ -146,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

@@ -164,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 : 产品发运信息
@@ -63,6 +64,10 @@ public class WmsShipping extends BaseBean {
     @ApiParam(value = "状态", example = "10")
     public Integer orderStatus;
 
+    @Transient
+    @ApiParam(value = "状态")
+    public List<Integer> orderStatusList;
+
     @Column(name = "REMARK")
     @ApiParam("备注")
     public String remark;
@@ -111,7 +116,8 @@ public class WmsShipping extends BaseBean {
     @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) {
         this.id = id;

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

@@ -53,7 +53,6 @@ public class WmsHqlPack {
     }
 
     /**
-     *
      * @param wmsFix
      * @return
      */
@@ -77,6 +76,7 @@ public class WmsHqlPack {
 
     /**
      * 单位换算 分页查询
+     *
      * @return
      */
     public static DdlPackBean packHqlWmsUnitConvertByPager(WmsUnitConvert wmsUnitConvert) {
@@ -175,6 +175,7 @@ public class WmsHqlPack {
 
     /**
      * 移库单号集合查询条件封装
+     *
      * @param orderNoList
      * @param organizeCode
      * @return
@@ -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);
 
@@ -2332,6 +2342,7 @@ public class WmsHqlPack {
 
     /**
      * 单位换算 分页查询
+     *
      * @return
      */
     public static DdlPackBean packHqlWmsStockInitializeByPager(WmsStockInitialize wmsStockInitialize) {