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

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

@@ -300,6 +300,54 @@ public class WmsEnumUtil {
     }
 
     /**
+     * 收货主表信息 状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum RC_ORDER_STATUS {
+        CREATE(10, "新建"),
+        RECEIPT(20, "收货中"),
+        RECEIPT_FINISH(30, "收货完成"),
+        CLOSED(40, "已关闭"),
+        CANCELLED(50, "已取消");
+
+        private int value;
+        private String description;
+
+        RC_ORDER_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;
+        }
+    }
+
+    /**
      * PO条码状态信息
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
@@ -454,7 +502,8 @@ public class WmsEnumUtil {
         COMBINATION_LOCATE(40, "D", "组合库"),
         LINE_LOCATE(50, "L", "线边库"),
         NC_LOCATE(60, "N", "NC库"),
-        SPILLAGE_LOCATE(70, "Y", "溢料库");
+        SPILLAGE_LOCATE(70, "Y", "溢料库"),
+        TRANSIT_LOCATE(80, "T", "在途库");
 
         private int value;
         private String code;

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

@@ -23,4 +23,10 @@ public class TransSnModle extends BaseComponetsParam{
     @ApiParam(value = "是否分组")
     public int isGroup;
 
+    @ApiParam(value = "物料")
+    public String partNo;
+
+    @ApiParam(value = "分组编号")
+    public String packageNo;
+
 }

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

@@ -97,4 +97,12 @@ public class WmsDocMovementDetails extends WmsOrderDetailsModel {
     @Column(name = "REC_QTY")
     @ApiParam(value = "已收货数量", example = "1")
     private Double recQty;
+
+    @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/WmsLocate.java

@@ -37,7 +37,7 @@ public class WmsLocate extends BaseBean {
     private String locateName;
 
     /**
-     * 1=收货库,10=基础库,20=机动库,30=组合库,40=线边库,50=NC库
+     * 库位类型:10=收货库,20=基础库,30=机动库,40=组合库,50=线边库,60=NC库，70=溢料,80=在途库位
      */
     @Column(name="LOCATE_TYPE")
     @ApiParam(value ="库位类型")

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

@@ -51,7 +51,7 @@ public class WmsStockSn extends BaseBean {
     private String partNameRdd;
 
     @Column(name = "LOT_NO")
-    @ApiParam("批次编码")
+    @ApiParam("收货日期（批次编码）")
     public String lotNo;
 
     @Column(name = "DATE_CODE")
@@ -98,14 +98,13 @@ public class WmsStockSn extends BaseBean {
     @ApiParam(value = "数量", example = "0")
     private Double qty;
     /**
-     * 1=未质检,10=质检合格,20=质检不合格,30=已退货
+     * 质量状态:10=合格,20=不合格,30=隔离
      */
     @Column(name = "QC_STATUS")
     @ApiParam(value = "质检状态", example = "0")
     private Integer qcStatus;
     /**
-     * :1=创建,10=已收货,20=已质检,30=已入库,40=待出库,50=已出库,
+     * 条码状态：1=创建，10=质检中，20=待入库，30=入库，40=配料，50=出库，60=报废，70=在途
-     * 60=在途,70=已隔离,80=破包,90=冻结,100=作废
      */
     @Column(name = "SN_STATUS")
     @ApiParam(value = "条码状态", example = "0")

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

@@ -1306,6 +1306,19 @@ public class WmsHqlPack {
     }
 
     /**
+     *  根据条件模糊查询库存条码信息
+     * @param wmsStockSn
+     * @return
+     */
+    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);
+        return result.toString();
+    }
+
+    /**
      *  根据条件查询库存信息
      * @param wmsStockQuan
      * @return