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

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java

@@ -1231,7 +1231,7 @@ public class WmsEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum QC_INFO_TYPE {
-        FEED(1, "进料检验"), ONLINE(10, "在线检验"), EMDPRODUCT(30, "成品检验,"), SHIPMENTS(40, "出货检验,");
+        FEED(1, "进料检验"), ONLINE(10, "在线检验"), EMDPRODUCT(30, "成品检验"), SHIPMENTS(40, "出货检验");
 
         private int value;
         private String description;
@@ -1267,9 +1267,9 @@ public class WmsEnumUtil {
     public enum QC_INFO_STATUS {
         CREATE(1, "新建"),
         FINISH(5, "待处理"),
-        FAIL(10, "已完成,"),
-        CLOSE(90, "已关闭,"),
-        CANCEL(91, "已取消,");
+        FAIL(10, "已完成"),
+        CLOSE(90, "已关闭"),
+        CANCEL(91, "已取消");
 
         private int value;
         private String description;

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

@@ -579,9 +579,9 @@ public class WmsHqlPack {
     public static String packHqlWmsTaskInfo(WmsTaskInfo wmsTaskInfo) {
         StringBuffer result = new StringBuffer();
 
-        HqlPack.getStringEqualPack(wmsTaskInfo.getMoveNo(), "moveNo", result);
-        HqlPack.getStringEqualPack(wmsTaskInfo.getUserNo(), "userNo", result);
-        HqlPack.getStringEqualPack(wmsTaskInfo.getOpTypeCode(), "opTypeCode", result);
+        HqlPack.getStringLikerPack(wmsTaskInfo.getMoveNo(), "moveNo", result);
+        HqlPack.getStringLikerPack(wmsTaskInfo.getUserNo(), "userNo", result);
+        HqlPack.getStringLikerPack(wmsTaskInfo.getOpTypeCode(), "opTypeCode", result);
         HqlPack.getStringLikerPack(wmsTaskInfo.getReMark(), "reMark", result);
         HqlPack.getNumEqualPack(wmsTaskInfo.getTaskStatus(), "taskStatus", result);