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/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/repository/WmsWorkCenterZoneRepository.java

@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.WmsWorkCenterZone;
+
+/**
+ * @Description : 产线(工作中心)-存储区信息管理
+ * @Reference :
+ * @Author : sky.meng
+ * @CreateDate : 2019-06-20 14:55
+ * @Modify:
+ **/
+public interface WmsWorkCenterZoneRepository extends BaseRepository<WmsWorkCenterZone, Long> {
+}

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

@@ -1838,6 +1838,28 @@ public class WmsHqlPack {
         getStringBuilderPack(wmsLineLocatePart, result);
         return result;
     }
+
+    /**
+     * 任务数据来源唯一校验
+     *
+     * @param wmsTaskSrc
+     * @return
+     */
+    public static DdlPackBean packHqlWmsTaskSrcIsUniq(WmsTaskSrc wmsTaskSrc) {
+        DdlPackBean result = new DdlPackBean();
+
+        //查询参数封装
+        DdlPreparedPack.getStringEqualPack(wmsTaskSrc.getOrganizeCode(), "organizeCode", result);
+        DdlPreparedPack.getStringEqualPack(wmsTaskSrc.getOpTypeCode(), "opTypeCode", result);
+        DdlPreparedPack.getStringEqualPack(wmsTaskSrc.getDataSrc(), "dataSrc", result);
+        DdlPreparedPack.getNumEqualPack(wmsTaskSrc.getBusiType(), "busiType", result);
+        DdlPreparedPack.getNumEqualPack(wmsTaskSrc.getPriority(), "priority", result);
+        DdlPreparedPack.getNumEqualPack(wmsTaskSrc.getIsSn(), "isSn", result);
+        DdlPreparedPack.getNumEqualPack(wmsTaskSrc.getIsOneStep(), "isOneStep", result);
+        getStringBuilderPack(wmsTaskSrc, result);
+        return result;
+    }
+
     /**
      * 任务数据来源 分页查询
      *
@@ -1852,6 +1874,7 @@ public class WmsHqlPack {
         getStringBuilderPack(wmsTaskSrc, result);
         return result;
     }
+
     /**
      * 供应商零件 分页查询
      *
@@ -1901,4 +1924,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;
+    }
+
 }