From d7158c4a607c4ed7137933584fdba89cbe7ae842 Mon Sep 17 00:00:00 2001
From: gongbx <DIMO1992>
Date: Thu, 9 May 2024 20:59:08 +0800
Subject: [PATCH] =?UTF-8?q?opt:=E4=BF=AE=E6=94=B9=E6=AD=A3=E5=BC=8F?=
 =?UTF-8?q?=E7=8E=AF=E5=A2=83=E7=9B=B8=E5=85=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org/nl/common/enums/wms/EasBillTypeEnum.java     |  4 ++--
 .../wms/database/eas/dao/xml/EasOutInBillMapper.xml  | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/nlsso-server/src/main/java/org/nl/common/enums/wms/EasBillTypeEnum.java b/nlsso-server/src/main/java/org/nl/common/enums/wms/EasBillTypeEnum.java
index 31d5269..17d89c8 100644
--- a/nlsso-server/src/main/java/org/nl/common/enums/wms/EasBillTypeEnum.java
+++ b/nlsso-server/src/main/java/org/nl/common/enums/wms/EasBillTypeEnum.java
@@ -11,12 +11,12 @@ public enum EasBillTypeEnum {
     //
     XSCKD(1, "销售出库", "XSCKD"),
     CGTHD(2, "采购退货出库", "CGTHD"),
-    DBCKD(3, "调拨出库", "DBCKD"),
+    DDCKD(3, "调拨出库", "DDCKD"),
     WWFLD(4, "委外出库", "WWFLD"),
     LLCKD(5, "生产出库", "LLCKD"),
     CGRKD(6, "采购入库", "CGRKD"),
     LLTHD(7, "生产退料入库", "LLTHD"),
-    DBRKD(8, "调拨入库", "DBRKD"),
+    DDRKD(8, "调拨入库", "DDRKD"),
     WWRKD(9, "委外入库", "WWRKD"),
     IN(10, "入库", "IN"),
     OUT(11, "出库", "OUT"),
diff --git a/nlsso-server/src/main/java/org/nl/wms/database/eas/dao/xml/EasOutInBillMapper.xml b/nlsso-server/src/main/java/org/nl/wms/database/eas/dao/xml/EasOutInBillMapper.xml
index 7744e19..73e1669 100644
--- a/nlsso-server/src/main/java/org/nl/wms/database/eas/dao/xml/EasOutInBillMapper.xml
+++ b/nlsso-server/src/main/java/org/nl/wms/database/eas/dao/xml/EasOutInBillMapper.xml
@@ -52,31 +52,31 @@
             CASE
                 WHEN types.djlx = 'XSCKD' THEN '销售出库'
                 WHEN types.djlx = 'CGTHD' THEN '采购退货出库'
-                WHEN types.djlx = 'DBCKD' THEN '调拨出库'
+                WHEN types.djlx = 'DDCKD' THEN '调拨出库'
                 WHEN types.djlx = 'WWFLD' THEN '委外出库'
                 WHEN types.djlx = 'LLCKD' THEN '生产出库'
                 WHEN types.djlx = 'CGRKD' THEN '采购入库'
                 WHEN types.djlx = 'LLTHD' THEN '生产退料入库'
-                WHEN types.djlx = 'DBRKD' THEN '调拨入库'
+                WHEN types.djlx = 'DDRKD' THEN '调拨入库'
                 WHEN types.djlx = 'WWRKD' THEN '委外入库'
                 ELSE types.djlx
                 END AS name,
             types.djlx,
             CASE
-                WHEN types.djlx IN ('XSCKD', 'CGTHD', 'DBCKD', 'WWFLD', 'LLCKD') THEN 'OUT'
-                WHEN types.djlx IN ('CGRKD', 'LLTHD', 'DBRKD', 'WWRKD') THEN 'IN'
+                WHEN types.djlx IN ('XSCKD', 'CGTHD', 'DDCKD', 'WWFLD', 'LLCKD') THEN 'OUT'
+                WHEN types.djlx IN ('CGRKD', 'LLTHD', 'DDRKD', 'WWRKD') THEN 'IN'
                 ELSE NULL
                 END AS ywlx,
             COUNT(eas_out_in_bill.djlx) AS counts
         FROM (
                  SELECT 'XSCKD' AS djlx, 1 AS sort
                  UNION SELECT 'CGTHD', 2
-                 UNION SELECT 'DBCKD', 3
+                 UNION SELECT 'DDCKD', 3
                  UNION SELECT 'WWFLD', 4
                  UNION SELECT 'LLCKD', 5
                  UNION SELECT 'CGRKD', 6
                  UNION SELECT 'LLTHD', 7
-                 UNION SELECT 'DBRKD', 8
+                 UNION SELECT 'DDRKD', 8
                  UNION SELECT 'WWRKD', 9
              ) AS types
                  LEFT JOIN eas_out_in_bill ON types.djlx = eas_out_in_bill.djlx AND eas_out_in_bill.djzt = '提交'