From a5049fd165f8fc6f2925422eeb90762dfb380a7d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com>
Date: Fri, 22 Dec 2023 10:22:11 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E6=89=B9=E6=AC=A1=E7=AD=96?=
 =?UTF-8?q?=E7=95=A5/=E4=B8=8B=E6=9E=B6=E7=AD=96=E7=95=A5=20=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E=20=E5=BA=93=E5=AD=98=E4=BD=99=E9=A2=9DDO=20=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=20=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/win/module/wms/util/JobUtils.java     | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/util/JobUtils.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/util/JobUtils.java
index 0c3e523e..c4434f5c 100644
--- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/util/JobUtils.java
+++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/util/JobUtils.java
@@ -870,54 +870,54 @@ public class JobUtils {
         }
         // 根据批次策略 作为查询库存余额排序
         // 批次类型——按 生产时间
-        if (jsonObjectBatch.get("BatchType") != null && jsonObjectBatch.get("BatchType").equals("0")) {
+        if (jsonObjectBatch.get("BatchType") != null && jsonObjectBatch.get("BatchType").equals("PRODUCTION_TIME")) {
             // ASC = 0，正向
-            if (jsonObjectBatch.get("BatchDirection") != null && jsonObjectBatch.get("BatchDirection").equals("0")) {
+            if (jsonObjectBatch.get("BatchDirection") != null && jsonObjectBatch.get("BatchDirection").equals("ASC")) {
                 queryWrapper.orderByAsc("produce_date");
             }
             // DESC = 1，逆向
-            if (jsonObjectBatch.get("BatchDirection") != null && jsonObjectBatch.get("BatchDirection").equals("1")) {
+            if (jsonObjectBatch.get("BatchDirection") != null && jsonObjectBatch.get("BatchDirection").equals("DESC")) {
                 queryWrapper.orderByDesc("produce_date");
             }
         }
         // 批次类型——按 到货时间
-        if (jsonObjectBatch.get("BatchType") != null && jsonObjectBatch.get("BatchType").equals("1")) {
+        if (jsonObjectBatch.get("BatchType") != null && jsonObjectBatch.get("BatchType").equals("ARRIVE_TIME")) {
             // ASC = 0，正向
-            if (jsonObjectBatch.get("BatchDirection") != null && jsonObjectBatch.get("BatchDirection").equals("0")) {
+            if (jsonObjectBatch.get("BatchDirection") != null && jsonObjectBatch.get("BatchDirection").equals("ASC")) {
                 queryWrapper.orderByAsc("arrive_date");
             }
             // DESC = 1，逆向
-            if (jsonObjectBatch.get("BatchDirection") != null && jsonObjectBatch.get("BatchDirection").equals("1")) {
+            if (jsonObjectBatch.get("BatchDirection") != null && jsonObjectBatch.get("BatchDirection").equals("DESC")) {
                 queryWrapper.orderByDesc("arrive_date");
             }
         }
         // 批次类型——按 失效时间
-        if (jsonObjectBatch.get("BatchType") != null && jsonObjectBatch.get("BatchType").equals("2")) {
+        if (jsonObjectBatch.get("BatchType") != null && jsonObjectBatch.get("BatchType").equals("EXPIRE_TIME")) {
             // ASC = 0，正向
-            if (jsonObjectBatch.get("BatchDirection") != null && jsonObjectBatch.get("BatchDirection").equals("0")) {
+            if (jsonObjectBatch.get("BatchDirection") != null && jsonObjectBatch.get("BatchDirection").equals("ASC")) {
                 queryWrapper.orderByAsc("expire_date");
             }
             // DESC = 1，逆向
-            if (jsonObjectBatch.get("BatchDirection") != null && jsonObjectBatch.get("BatchDirection").equals("1")) {
+            if (jsonObjectBatch.get("BatchDirection") != null && jsonObjectBatch.get("BatchDirection").equals("DESC")) {
                 queryWrapper.orderByDesc("expire_date");
             }
         }
         // 批次类型——按 供应商批次
-        if (jsonObjectBatch.get("BatchType") != null && jsonObjectBatch.get("BatchType").equals("3")) {
+        if (jsonObjectBatch.get("BatchType") != null && jsonObjectBatch.get("BatchType").equals("SUPPLIER_BATCH")) {
 //                TODO: 供应商批次 ??? 不知道怎么搞了
         }
         // 批次类型——按 供应商优先级
-        if (jsonObjectBatch.get("BatchType") != null && jsonObjectBatch.get("BatchType").equals("4")) {
+        if (jsonObjectBatch.get("BatchType") != null && jsonObjectBatch.get("BatchType").equals("SUPPLIER_PRIORITY")) {
 //                TODO: 供应商优先级 ??? 不知道怎么搞了
         }
         // 批次类型——按 其它批次
-        if (jsonObjectBatch.get("BatchType") != null && jsonObjectBatch.get("BatchType").equals("5")) {
+        if (jsonObjectBatch.get("BatchType") != null && jsonObjectBatch.get("BatchType").equals("OTHER_BATCH")) {
             // ASC = 0，正向
-            if (jsonObjectBatch.get("BatchDirection") != null && jsonObjectBatch.get("BatchDirection").equals("0")) {
+            if (jsonObjectBatch.get("BatchDirection") != null && jsonObjectBatch.get("BatchDirection").equals("ASC")) {
                 queryWrapper.orderByAsc("batch");
             }
             // DESC = 1，逆向
-            if (jsonObjectBatch.get("BatchDirection") != null && jsonObjectBatch.get("BatchDirection").equals("1")) {
+            if (jsonObjectBatch.get("BatchDirection") != null && jsonObjectBatch.get("BatchDirection").equals("DESC")) {
                 queryWrapper.orderByDesc("batch");
             }
         }