Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev

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

@@ -30,7 +30,7 @@ public class WmsUnit extends BaseBean {
 
     @Column(name = "UNIT_CODE")
     @ApiParam(value = "单位代码")
-    private String vendorNo;
+    private String unitCode;
 
     @Column(name = "UNIT_NAME")
     @ApiParam(value = "单位名称")

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

@@ -0,0 +1,9 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.WmsUnitConvert;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface WmsUnitConvertReposity  extends BaseRepository<WmsUnitConvert, Long> {
+}

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

@@ -1890,4 +1890,21 @@ public class WmsHqlPack {
 
         return result;
     }
+
+    /**
+     * 物料 条件封装
+     *
+     * @param wmsPart
+     * @return
+     */
+    public static DdlPackBean packHqlWmsPartByList(WmsPart wmsPart,List<WmsStockSn> partNoList) {
+
+        DdlPackBean packBean = new DdlPackBean();
+        DdlPreparedPack.getInPackList(partNoList.stream().map(part -> part.getPartNo()).collect(Collectors.toList()),"partNo",packBean);
+        DdlPreparedPack.getStringEqualPack(wmsPart.getOrganizeCode(),"organizeCode",packBean);
+        getStringBuilderPack(wmsPart, packBean);
+
+        return packBean;
+    }
+
 }