From 83207d8367cf5cdce0aedb5cf92b007ff9c7f7cd Mon Sep 17 00:00:00 2001 From: zjj <3272660260@qq.com> Date: 星期五, 18 四月 2025 13:28:38 +0800 Subject: [PATCH] #收货历史单明细导出问题修复 --- rsf-server/src/main/java/com/vincent/rsf/server/api/entity/enums/OrderWorkType.java | 34 +++++++++++++++++++++++++++------- 1 files changed, 27 insertions(+), 7 deletions(-) diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/entity/enums/OrderWorkType.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/entity/enums/OrderWorkType.java index 09c00e4..32079e6 100644 --- a/rsf-server/src/main/java/com/vincent/rsf/server/api/entity/enums/OrderWorkType.java +++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/entity/enums/OrderWorkType.java @@ -9,13 +9,13 @@ */ public enum OrderWorkType { //璁㈠崟绫诲瀷 - ORDER_PURCHASE_IN("purchase", "閲囪喘鍗�"), - ORDER_PROD_IN("prod", "鐢熶骇棰嗘枡鍗�"), - ORDER_DONE_IN("done", "瀹屽伐鍏ユ枡鍗�"), - ORDER_SALE_IN("sale", "閿�鍞鍗�"), - ORDER_PROD_BACK_IN("prod back", "鐢熶骇閫�鏂欏崟"), - ORDER_SPLR_BACK_OUT("supplier back", "渚涘簲鍟嗗嚭璐у崟"), - ORDER_SALE_BACK_IN("sale back", "閿�鍞��璐у崟") + ORDER_WORK_TYPE_DONE_IN("1", "瀹屽伐鍏ュ簱鍗�"), + ORDER_WORK_TYPE_PROD("2", "鐢熶骇棰嗘枡鍗�"), + ORDER_WORK_TYPE_PURCHASE("3", "澶栬喘鏀惰揣"), + ORDER_WORK_TYPE_SALE("4", "閿�鍞鍗�"), + ORDER_WORK_TYPE_RETURN("5", "鐢熶骇閫�鏂欏崟"), + ORDER_WORK_TYPE_SUPPLIER("6", "閫�璐т緵搴斿晢鍑鸿揣鍗�"), + ORDER_WORK_TYPE_RETURN_ORDER("7", "閿�鍞��璐у叆搴撳崟") ; OrderWorkType(String type, String desc) { @@ -26,4 +26,24 @@ public String type; public String desc; + public static String getWorkType(String desc) { + if (desc.equals(OrderWorkType.ORDER_WORK_TYPE_DONE_IN.desc)) { + return OrderWorkType.ORDER_WORK_TYPE_DONE_IN.type; + } else if (desc.equals(OrderWorkType.ORDER_WORK_TYPE_PROD.desc)) { + return OrderWorkType.ORDER_WORK_TYPE_PROD.type; + } else if (desc.equals(OrderWorkType.ORDER_WORK_TYPE_PURCHASE.desc)) { + return OrderWorkType.ORDER_WORK_TYPE_PURCHASE.type; + } else if (desc.equals(OrderWorkType.ORDER_WORK_TYPE_SALE.desc)) { + return OrderWorkType.ORDER_WORK_TYPE_SALE.type; + } else if (desc.equals(OrderWorkType.ORDER_WORK_TYPE_RETURN.desc)) { + return OrderWorkType.ORDER_WORK_TYPE_RETURN.type; + } else if (desc.equals(OrderWorkType.ORDER_WORK_TYPE_SUPPLIER.desc)) { + return OrderWorkType.ORDER_WORK_TYPE_SUPPLIER.type; + }else if (desc.equals(OrderWorkType.ORDER_WORK_TYPE_RETURN_ORDER.desc)) { + return OrderWorkType.ORDER_WORK_TYPE_RETURN_ORDER.type; + } + return null; + } + + } -- Gitblit v1.9.1