解决冲突

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

@@ -88,6 +88,7 @@ public class WmsHqlPack {
 
         return result.toString();
     }
+
     /**
      * 查询任务合并的移库单明细 查询条件封装
      *
@@ -98,17 +99,15 @@ public class WmsHqlPack {
         StringBuffer result = new StringBuffer();
         StringBuffer orderNoStr = new StringBuffer();
         for (int i = 0; i < orderNos.size(); i++) {
-            if (i == orderNos.size()) {
-                orderNoStr.append("'" + orderNos.get(i) + "'");
-            } else {
             orderNoStr.append("'" + orderNos.get(i) + "',");
         }
-        }
+        orderNoStr.deleteCharAt(orderNoStr.length() - 1);
         result.append(" and model.isDeleted=" + CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue() +
                 " and model.isValid=" + CommonEnumUtil.IS_VAILD.VAILD.getValue() +
-                "and model.orderNo in (" + orderNos + ")" + " order by model.partNo,model.orderNo");
+                " and model.orderNo in (" + orderNoStr + ")" + " order by model.partNo,model.orderNo");
         return result.toString();
     }
+
     /**
      * 库存移动单查询封装
      *
@@ -411,6 +410,7 @@ public class WmsHqlPack {
 
         return result.toString();
     }
+
     /**
      * 查询满足处理周期的作业类型 查询条件封装
      *
@@ -441,6 +441,7 @@ public class WmsHqlPack {
 
         return result.toString();
     }
+
     /**
      * 存储区信息 查询条件封装
      *
@@ -873,6 +874,7 @@ public class WmsHqlPack {
 
         return result.toString();
     }
+
     /**
      * 内部单据：库存移动单主表唯一性查询
      * @param wmsMoveMaster
@@ -1294,6 +1296,7 @@ public class WmsHqlPack {
 
     /**
      * 按moveNo 取最后一笔插入的数据
+     *
      * @param wmsMoveSn
      * @return
      */
@@ -1309,6 +1312,7 @@ public class WmsHqlPack {
 
     /**
      * 根据条件查询库存条码信息
+     *
      * @param wmsStockSn
      * @return
      */
@@ -1324,6 +1328,7 @@ public class WmsHqlPack {
 
     /**
      * 根据条件模糊查询库存条码信息
+     *
      * @param wmsStockSn
      * @return
      */
@@ -1337,6 +1342,7 @@ public class WmsHqlPack {
 
     /**
      * 根据条件查询库存信息
+     *
      * @param wmsStockQuan
      * @return
      */
@@ -1350,6 +1356,7 @@ public class WmsHqlPack {
 
     /**
      * 根据用户角色id列表查询数据权限信息
+     *
      * @return
      */
     public static String packHqlWmsDataAuth(WmsDataAuth dataAuth, List<String> roleIds) {
@@ -1405,11 +1412,10 @@ public class WmsHqlPack {
      * @param vals
      * @return
      */
-    public static String packHqlAndIn(WmsTaskInfo bean,String columnName,List<String> vals) {
+    public static String packHqlAndIn(BaseBean bean, String columnName, List<String> vals) {
         StringBuffer result = new StringBuffer();
         String data = String.join(",", vals);
         HqlPack.getInPackString(data, columnName, result);
-        HqlPack.getNumEqualPack(bean.getTaskStatus(), "taskStatus", result);
         getStringBuilderPack(bean, result);
         return result.toString();
     }
@@ -1448,6 +1454,7 @@ public class WmsHqlPack {
 
     /**
      * 根据条件查询任务生成日志
+     *
      * @param wmsTaskCreateLog
      * @return
      */
@@ -1461,6 +1468,7 @@ public class WmsHqlPack {
 
     /**
      * 根据条件查询作业处理组件
+     *
      * @param wmsTransModule
      * @return
      */
@@ -1478,6 +1486,7 @@ public class WmsHqlPack {
         getStringBuilderPack(wmsTransModule, result);
         return result.toString();
     }
+
     /**
      * 根据条件查询系统配置信息
      * @param wmsConfig