root/nl_sanqi_wms
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

opt:修改正式环境相关

Browse Source
This commit is contained in:
gongbx
2024-05-09 20:59:08 +08:00
parent 250c7f27f6
commit d7158c4a60
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
nlsso-server/src/main/java/org/nl/common/enums/wms/EasBillTypeEnum.java
View File

@@ -11,12 +11,12 @@ public enum EasBillTypeEnum {
// //
XSCKD(1, "销售出库", "XSCKD"), XSCKD(1, "销售出库", "XSCKD"),
CGTHD(2, "采购退货出库", "CGTHD"), CGTHD(2, "采购退货出库", "CGTHD"),
DBCKD(3, "调拨出库", "DBCKD"), DDCKD(3, "调拨出库", "DDCKD"),
WWFLD(4, "委外出库", "WWFLD"), WWFLD(4, "委外出库", "WWFLD"),
LLCKD(5, "生产出库", "LLCKD"), LLCKD(5, "生产出库", "LLCKD"),
CGRKD(6, "采购入库", "CGRKD"), CGRKD(6, "采购入库", "CGRKD"),
LLTHD(7, "生产退料入库", "LLTHD"), LLTHD(7, "生产退料入库", "LLTHD"),
DBRKD(8, "调拨入库", "DBRKD"), DDRKD(8, "调拨入库", "DDRKD"),
WWRKD(9, "委外入库", "WWRKD"), WWRKD(9, "委外入库", "WWRKD"),
IN(10, "入库", "IN"), IN(10, "入库", "IN"),
OUT(11, "出库", "OUT"), OUT(11, "出库", "OUT"),

12
nlsso-server/src/main/java/org/nl/wms/database/eas/dao/xml/EasOutInBillMapper.xml
View File

@@ -52,31 +52,31 @@
CASE CASE
WHEN types.djlx = 'XSCKD' THEN '销售出库' WHEN types.djlx = 'XSCKD' THEN '销售出库'
WHEN types.djlx = 'CGTHD' THEN '采购退货出库' WHEN types.djlx = 'CGTHD' THEN '采购退货出库'
WHEN types.djlx = 'DBCKD' THEN '调拨出库' WHEN types.djlx = 'DDCKD' THEN '调拨出库'
WHEN types.djlx = 'WWFLD' THEN '委外出库' WHEN types.djlx = 'WWFLD' THEN '委外出库'
WHEN types.djlx = 'LLCKD' THEN '生产出库' WHEN types.djlx = 'LLCKD' THEN '生产出库'
WHEN types.djlx = 'CGRKD' THEN '采购入库' WHEN types.djlx = 'CGRKD' THEN '采购入库'
WHEN types.djlx = 'LLTHD' THEN '生产退料入库' WHEN types.djlx = 'LLTHD' THEN '生产退料入库'
WHEN types.djlx = 'DBRKD' THEN '调拨入库' WHEN types.djlx = 'DDRKD' THEN '调拨入库'
WHEN types.djlx = 'WWRKD' THEN '委外入库' WHEN types.djlx = 'WWRKD' THEN '委外入库'
ELSE types.djlx ELSE types.djlx
END AS name, END AS name,
types.djlx, types.djlx,
CASE CASE
WHEN types.djlx IN ('XSCKD', 'CGTHD', 'DBCKD', 'WWFLD', 'LLCKD') THEN 'OUT' WHEN types.djlx IN ('XSCKD', 'CGTHD', 'DDCKD', 'WWFLD', 'LLCKD') THEN 'OUT'
WHEN types.djlx IN ('CGRKD', 'LLTHD', 'DBRKD', 'WWRKD') THEN 'IN' WHEN types.djlx IN ('CGRKD', 'LLTHD', 'DDRKD', 'WWRKD') THEN 'IN'
ELSE NULL ELSE NULL
END AS ywlx, END AS ywlx,
COUNT(eas_out_in_bill.djlx) AS counts COUNT(eas_out_in_bill.djlx) AS counts
FROM ( FROM (
SELECT 'XSCKD' AS djlx, 1 AS sort SELECT 'XSCKD' AS djlx, 1 AS sort
UNION SELECT 'CGTHD', 2 UNION SELECT 'CGTHD', 2
UNION SELECT 'DBCKD', 3 UNION SELECT 'DDCKD', 3
UNION SELECT 'WWFLD', 4 UNION SELECT 'WWFLD', 4
UNION SELECT 'LLCKD', 5 UNION SELECT 'LLCKD', 5
UNION SELECT 'CGRKD', 6 UNION SELECT 'CGRKD', 6
UNION SELECT 'LLTHD', 7 UNION SELECT 'LLTHD', 7
UNION SELECT 'DBRKD', 8 UNION SELECT 'DDRKD', 8
UNION SELECT 'WWRKD', 9 UNION SELECT 'WWRKD', 9
) AS types ) AS types
LEFT JOIN eas_out_in_bill ON types.djlx = eas_out_in_bill.djlx AND eas_out_in_bill.djzt = '提交' LEFT JOIN eas_out_in_bill ON types.djlx = eas_out_in_bill.djlx AND eas_out_in_bill.djzt = '提交'