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

@@ -502,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-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/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