Merge remote-tracking branch 'origin/devlop' into devlop

zhang

1 天以前 16a09540001bd00f01b848f0ca125d16bf314450

 rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/OrderWorkType.java

@@ -15,6 +15,7 @@
    ORDER_WORK_TYPE_SALE("4", "销售退回入库单"),
    ORDER_WORK_TYPE_OTHER_IN("5", "其它入库单"),
    ORDER_WORK_TYPE_OTHER_TERANSFER("6", "调拔入库单"),
    ORDER_WORK_TYPE_STOCK_REVISE("7", "库存调整单"),
    ORDER_WORK_TYPE_SUPPLIER("11", "销售出库单"),
    ORDER_WORK_TYPE_RETURN_ORDER("12", "领料出库单"),
    ORDER_WORK_TYPE_PURCHASE_RETURN("13", "采购退回出库单"),
@@ -57,6 +58,49 @@
            return OrderWorkType.ORDER_WORK_TYPE_STOCK_CHECK.type;
        } else if (desc.equals(OrderWorkType.ORDER_WORK_TYPE_STOCK_TERANSFER.desc)) {
            return OrderWorkType.ORDER_WORK_TYPE_STOCK_TERANSFER.type;
        } else if (desc.equals(OrderWorkType.ORDER_WORK_TYPE_OTHER_TERANSFER.desc)) {
            return OrderWorkType.ORDER_WORK_TYPE_OTHER_TERANSFER.type;
        } else if (desc.equals(OrderWorkType.ORDER_WORK_TYPE_STOCK_REVISE.desc)) {
            return OrderWorkType.ORDER_WORK_TYPE_STOCK_REVISE.type;
        }
        return null;
    }

    /**
     * @author Ryan
     * @date 2025/8/26
     * @description: 获取订单类型
     * @version 1.0
     */
    public static String getOrderType(String desc) {
        if (desc.equals(OrderWorkType.ORDER_WORK_TYPE_DONE_IN.desc)) {
            return OrderType.ORDER_IN.type;
        } else if (desc.equals(OrderWorkType.ORDER_WORK_TYPE_PROD.desc)) {
            return OrderType.ORDER_IN.type;
        } else if (desc.equals(OrderWorkType.ORDER_WORK_TYPE_PURCHASE.desc)) {
            return OrderType.ORDER_IN.type;
        } else if (desc.equals(OrderWorkType.ORDER_WORK_TYPE_SALE.desc)) {
            return OrderType.ORDER_IN.type;
        } else if (desc.equals(OrderWorkType.ORDER_WORK_TYPE_OTHER_IN.desc)) {
            return OrderType.ORDER_IN.type;
        } else if (desc.equals(OrderWorkType.ORDER_WORK_TYPE_SUPPLIER.desc)) {
            return OrderType.ORDER_OUT.type;
        } else if (desc.equals(OrderWorkType.ORDER_WORK_TYPE_RETURN_ORDER.desc)) {
            return OrderType.ORDER_OUT.type;
        } else if (desc.equals(OrderWorkType.ORDER_WORK_TYPE_PURCHASE_RETURN.desc)) {
            return OrderType.ORDER_OUT.type;
        } else if (desc.equals(OrderWorkType.ORDER_WORK_TYPE_OTHER.desc)) {
            return OrderType.ORDER_OUT.type;
        } else if (desc.equals(OrderWorkType.ORDER_WORK_TYPE_STOCK_OUT.desc)) {
            return OrderType.ORDER_OUT.type;
        } else if (desc.equals(OrderWorkType.ORDER_WORK_TYPE_STOCK_CHECK.desc)) {
            return OrderType.ORDER_CHECK.type;
        } else if (desc.equals(OrderWorkType.ORDER_WORK_TYPE_STOCK_TERANSFER.desc)) {
            return OrderType.ORDER_TRANSFER.type;
        } else if (desc.equals(OrderWorkType.ORDER_WORK_TYPE_OTHER_TERANSFER.desc)) {
            return OrderType.ORDER_TRANSFER.type;
        } else if (desc.equals(OrderWorkType.ORDER_WORK_TYPE_STOCK_REVISE.desc)) {
            return OrderType.ORDER_REVISE.type;
        }
        return null;
    }
@@ -76,7 +120,7 @@
            return OrderWorkType.ORDER_WORK_TYPE_SUPPLIER.desc;
        } else if (type.equals(OrderWorkType.ORDER_WORK_TYPE_RETURN_ORDER.type)) {
            return OrderWorkType.ORDER_WORK_TYPE_RETURN_ORDER.desc;
        }else if (type.equals(OrderWorkType.ORDER_WORK_TYPE_PURCHASE_RETURN.type)) {
        } else if (type.equals(OrderWorkType.ORDER_WORK_TYPE_PURCHASE_RETURN.type)) {
            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;
@@ -86,6 +130,10 @@
            return OrderWorkType.ORDER_WORK_TYPE_STOCK_CHECK.desc;
        } else if (type.equals(OrderWorkType.ORDER_WORK_TYPE_STOCK_TERANSFER.type)) {
            return OrderWorkType.ORDER_WORK_TYPE_STOCK_TERANSFER.desc;
        } else if (type.equals(OrderWorkType.ORDER_WORK_TYPE_OTHER_TERANSFER.type)) {
            return OrderWorkType.ORDER_WORK_TYPE_OTHER_TERANSFER.desc;
        } else if (type.equals(OrderWorkType.ORDER_WORK_TYPE_STOCK_REVISE.type)) {
            return OrderWorkType.ORDER_WORK_TYPE_STOCK_REVISE.desc;
        }
        return null;
    }