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 = '提交'