Merge branch 'test'

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

@@ -17,18 +17,24 @@ import java.util.List;
 @Repository
 public interface IEngineScriptPersistenceRepository extends BaseRepository<EngineScriptPersistence, Long> {
     /**
-     * 按照脚本编号查询脚本实体对象
+     * 按照工厂代码和脚本编号查询脚本实体对象
+     * @param organizeCode 工厂代码
      * @param scriptNo 脚本编号
      * @return 脚本实体对象
      */
     EngineScriptPersistence findByOrganizeCodeAndScriptNo(String organizeCode, String scriptNo);
 
     /**
+     * 按照脚本编号查询脚本实体对象
+     * @param scriptNo 脚本编号
+     * @return 脚本实体对象
+     */
+    EngineScriptPersistence findByScriptNo(String scriptNo);
+
+    /**
      * 查找所有的脚本语言类型
      * @return 数据库中已经存在的脚本语言类型
      */
     @Query("select t.languageType from EngineScriptPersistence t group by t.organizeCode, t.languageType")
     List findGroupByLanguageType();
-
-    EngineScriptPersistence findByScriptNo(String scriptNo);
 }

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

@@ -2181,6 +2181,7 @@ public class WmsHqlPack {
         DdlPreparedPack.getStringEqualPack(wmsStockSn.getVendorNo(), "vendorNo", result);
         // 库位不为空
         DdlPreparedPack.getStringNotNullPack( "locateNo", result);
+        DdlPreparedPack.getStringNoEqualPack("","locateNo", result);
         // 排除创建及出库状态条码
         if(wmsStockSn.getSnStatus() != null){
             DdlPreparedPack.getNumEqualPack(wmsStockSn.getSnStatus(), "snStatus", result);