From be168b245437a75948138927a2f1f4d1830513e0 Mon Sep 17 00:00:00 2001 From: zjj <3272660260@qq.com> Date: 星期三, 21 五月 2025 14:03:12 +0800 Subject: [PATCH] #出库作业 --- rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/OrderWorkType.java | 15 ++++++++++----- 1 files changed, 10 insertions(+), 5 deletions(-) diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/OrderWorkType.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/OrderWorkType.java index 2f6b32b..df2cbda 100644 --- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/OrderWorkType.java +++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/OrderWorkType.java @@ -13,10 +13,11 @@ ORDER_WORK_TYPE_PROD("2", "鐢熶骇鍏ュ簱鍗�"), ORDER_WORK_TYPE_PURCHASE("3", "棰嗘枡閫�鍥炲叆搴撳崟"), ORDER_WORK_TYPE_SALE("4", "閿�鍞��鍥炲叆搴撳崟"), - ORDER_WORK_TYPE_RETURN("5", "鍏跺畠鍏ュ簱鍗�"), + ORDER_WORK_TYPE_OTHER_IN("5", "鍏跺畠鍏ュ簱鍗�"), ORDER_WORK_TYPE_SUPPLIER("11", "閿�鍞嚭搴撳崟"), ORDER_WORK_TYPE_RETURN_ORDER("12", "棰嗘枡鍑哄簱鍗�"), ORDER_WORK_TYPE_PURCHASE_RETURN("13", "閲囪喘閫�鍥炲嚭搴撳崟"), + ORDER_WORK_TYPE_STOCK_OUT("15", "搴撳瓨鍑哄簱"), ORDER_WORK_TYPE_OTHER("14", "鍏跺畠鍑哄簱鍗�"); @@ -37,8 +38,8 @@ 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_OTHER_IN.desc)) { + return OrderWorkType.ORDER_WORK_TYPE_OTHER_IN.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)) { @@ -47,6 +48,8 @@ return OrderWorkType.ORDER_WORK_TYPE_PURCHASE_RETURN.type; } else if (desc.equals(OrderWorkType.ORDER_WORK_TYPE_OTHER.desc)) { return OrderWorkType.ORDER_WORK_TYPE_OTHER.type; + }else if (desc.equals(OrderWorkType.ORDER_WORK_TYPE_STOCK_OUT.desc)) { + return OrderWorkType.ORDER_WORK_TYPE_STOCK_OUT.type; } return null; } @@ -60,8 +63,8 @@ return OrderWorkType.ORDER_WORK_TYPE_PURCHASE.desc; } else if (type.equals(OrderWorkType.ORDER_WORK_TYPE_SALE.type)) { return OrderWorkType.ORDER_WORK_TYPE_SALE.desc; - } else if (type.equals(OrderWorkType.ORDER_WORK_TYPE_RETURN.type)) { - return OrderWorkType.ORDER_WORK_TYPE_RETURN.desc; + } else if (type.equals(OrderWorkType.ORDER_WORK_TYPE_OTHER_IN.type)) { + return OrderWorkType.ORDER_WORK_TYPE_OTHER_IN.desc; } else if (type.equals(OrderWorkType.ORDER_WORK_TYPE_SUPPLIER.type)) { return OrderWorkType.ORDER_WORK_TYPE_SUPPLIER.desc; } else if (type.equals(OrderWorkType.ORDER_WORK_TYPE_RETURN_ORDER.type)) { @@ -70,6 +73,8 @@ return OrderWorkType.ORDER_WORK_TYPE_PURCHASE_RETURN.desc; } else if (type.equals(OrderWorkType.ORDER_WORK_TYPE_OTHER.type)) { return OrderWorkType.ORDER_WORK_TYPE_OTHER.desc; + } else if (type.equals(OrderWorkType.ORDER_WORK_TYPE_STOCK_OUT.type)) { + return OrderWorkType.ORDER_WORK_TYPE_STOCK_OUT.desc; } return null; } -- Gitblit v1.9.1