CS_ORDER_STATUS 枚举修改

DdlPreparedPack getNotInPack getNotInPackString 方法修改

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

@@ -915,7 +915,7 @@ public class WmsEnumUtil {
         private int value;
         private String description;
 
-        CS_ORDER_TYPE(int value, String description) {
+        CS_ORDER_TYPE(int value,String description) {
             this.value = value;
             this.description = description;
         }
@@ -944,18 +944,20 @@ public class WmsEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum CS_ORDER_STATUS {
-        CREATE(10, "创建"),
+        CREATE(10,"CREATE", "创建"),
-        STARTING_INVENTORY(20, "开启盘点"),
+        STARTING_INVENTORY(20,"STARTING_INVENTORY", "开启盘点"),
-        IN_INVENTORY(30, "盘点中"),
+        IN_INVENTORY(30,"IN_INVENTORY", "盘点中"),
-        INVENTORY_FINISH(40, "盘点完成"),
+        INVENTORY_FINISH(40,"INVENTORY_FINISH", "盘点完成"),
-        THAWING(50, "已解冻"),
+        THAWING(50,"THAWING", "已解冻"),
-        CLOSED(60, "已关闭");
+        CLOSED(60, "CLOSED","已关闭");
 
         private int value;
+        private String code;
         private String description;
 
-        CS_ORDER_STATUS(int value, String description) {
+        CS_ORDER_STATUS(int value, String code, String description) {
             this.value = value;
+            this.code = code;
             this.description = description;
         }
 
@@ -963,6 +965,10 @@ public class WmsEnumUtil {
             return value;
         }
 
+        public String getCode() {
+            return code;
+        }
+
         public String getDescription() {
             return description;
         }

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java

@@ -466,7 +466,7 @@ public class DdlPreparedPack {
                     data += "'" + dataArray[i] + "',";
                 }
             }
-            packBean.addColumnQuery(columnName," and." + columnName + " not in (:m_" + columnName + ")", data);
+            packBean.addColumnQuery(columnName," and " + columnName + " not in (:m_" + columnName + ")", data);
         }
     }
 
@@ -479,7 +479,7 @@ public class DdlPreparedPack {
      */
     public static void getNotInPack(String data, String columnName, DdlPackBean packBean) {
         if (data != null && data.trim().length() > 0) {
-            packBean.addColumnQuery(columnName," and." + columnName + " not in (:m_" + columnName + ")", data);
+            packBean.addColumnQuery(columnName," and " + columnName + " not in (:m_" + columnName + ")", data);
         }
     }
 }

modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java

@@ -5,6 +5,7 @@ import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.enumutil.SwebEnumUtil;
 import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
+import cn.estsh.i3plus.pojo.base.tool.HqlPack;
 import cn.estsh.i3plus.pojo.sweb.bean.*;
 import cn.estsh.i3plus.pojo.sweb.modelbean.SwebPOForPubListEnterModel;
 import org.apache.commons.lang3.StringUtils;
@@ -71,17 +72,23 @@ public class SwebHqlPack {
         return buildHql(swebConfig, result);
     }
 
-    public static DdlPackBean getPurchaseOrderDetailsWhereHql(SwebPOForPubListEnterModel model) {
+
-        DdlPackBean result = new DdlPackBean();
+    // DdlPackBean方法中的 getNumNOEqualPack（） 方法存在问题，所有先用  HqlPack
-        DdlPreparedPack.getStringEqualPack(model.getOrderNo(), "orderNo", result);
+    public static String getPurchaseOrderDetailsWhereHql(SwebPOForPubListEnterModel model) {
-        DdlPreparedPack.getStringEqualPack(model.getVendorCode(), "vendorCode", result);
+        StringBuffer result = new StringBuffer();
-        DdlPreparedPack.getNumEqualPack(model.getOrderType(), "orderType", result);
+        HqlPack.getNumNOEqualPack(SwebEnumUtil.ORDER_MASTER_STATUS.CREATE.getValue(),"itemStatus",result);
-        DdlPreparedPack.getStringEqualPack(model.getPartNo(), "partNo", result);
+        HqlPack.getNumNOEqualPack(SwebEnumUtil.ORDER_MASTER_STATUS.RECEIPT.getValue(),"itemStatus",result);
+
+        HqlPack.getStringEqualPack(model.getOrderNo(), "orderNo", result);
+        HqlPack.getStringEqualPack(model.getVendorCode(), "vendorCode", result);
+        HqlPack.getNumEqualPack(model.getOrderType(), "orderType", result);
+        HqlPack.getStringEqualPack(model.getPartNo(), "partNo", result);
         // 封装有效状态和删除状态
-        DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", result);
+        HqlPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", result);
-        DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result);
+        HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result);
-        DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result);
+        HqlPack.getStringEqualPack(model.getOrganizeCode(), "organizeCode", result);
-        return buildHql(model, result);
+        HqlPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result);
+        return  result.toString();
     }
 
     public static DdlPackBean getProcurementPlanOrderWhereHql(SwebProcurementPlanOrder swebProcurementPlanOrder) {