库位编号规则和和CTU保持一致

cl

1 天以前 f21530d33ca23aeeba2ef073ac6b64422e4e26ca

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

@@ -11,16 +11,35 @@
    //订单类型
    ORDER_WORK_TYPE_DONE_IN("1", "采购入库单"),
    ORDER_WORK_TYPE_PROD("2", "生产入库单"),
    /** ERP 单别，生产入库（入库类） */
    ORDER_WORK_TYPE_PROD_B017("B017", "生产入库-工单入库"),
    ORDER_WORK_TYPE_PURCHASE("3", "领料退回入库单"),
    ORDER_WORK_TYPE_SALE("4", "销售退回入库单"),
    ORDER_WORK_TYPE_SALES_RETURN_D004("D004", "退货入库-销售退货"),
    ORDER_WORK_TYPE_OTHER_IN("5", "其它入库单"),
    ORDER_WORK_TYPE_OTHER_TERANSFER_IN("6", "调拔入库单"),
    ORDER_WORK_TYPE_OTHER_TERANSFER("8", "调拔入库单"),//项目临时修改
    ORDER_WORK_TYPE_STOCK_REVISE("7", "库存调整单"),
    ORDER_WORK_TYPE_SUPPLIER("11", "销售出库单"),
    ORDER_WORK_TYPE_RETURN_ORDER("12", "领料出库单"),
    ORDER_WORK_TYPE_PROD_ADDITION("18", "生产补料"),
    ORDER_WORK_TYPE_FIX_OUT("19", "外发加工"),
    ORDER_WORK_TYPE_PURCHASE_RETURN("13", "采购退回出库单"),
    ORDER_WORK_TYPE_STOCK_OUT("15", "库存出库"),
    ORDER_WORK_TYPE_STOCK_CHECK("16", "盘点出库"),
    ORDER_WORK_TYPE_STOCK_TERANSFER("17", "调拔出库单"),
    ORDER_WORK_TYPE_OTHER("14", "其它出库单"),

    ORDER_WORK_TYPE_OTHER("14", "其它出库单");
    ORDER_WORK_TYPE_D001("D001", "销售出库"),
    ORDER_WORK_TYPE_A008("A008", "采购仓退"),
    /** ERP 同码多场景时共用 B003 */
    ORDER_WORK_TYPE_B003_ERP("B003", "领料出库-工单发料/超领"),
    ORDER_WORK_TYPE_C036("C036", "借出-出库"),
    ORDER_WORK_TYPE_A005("A005", "采购入库"),
    ORDER_WORK_TYPE_D022("D022", "退货入库-工单退料"),
    ORDER_WORK_TYPE_B042("B042", "生产入库-工单超入"),
    ORDER_WORK_TYPE_B007("B007", "生产入库-入库上架"),
    ORDER_WORK_TYPE_C037("C037", "调拨入库-借出归还");


    OrderWorkType(String type, String desc) {
@@ -36,10 +55,22 @@
            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_PROD_B017.desc)) {
            return OrderWorkType.ORDER_WORK_TYPE_PROD_B017.type;
        } else if (desc.equalsIgnoreCase(OrderWorkType.ORDER_WORK_TYPE_PROD_B017.type)) {
            return OrderWorkType.ORDER_WORK_TYPE_PROD_B017.type;
        } else if ("生产入库".equals(desc)) {
            return OrderWorkType.ORDER_WORK_TYPE_PROD_B017.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.equalsIgnoreCase(OrderWorkType.ORDER_WORK_TYPE_SALES_RETURN_D004.type)) {
            return OrderWorkType.ORDER_WORK_TYPE_SALES_RETURN_D004.type;
        } else if (desc.equals(OrderWorkType.ORDER_WORK_TYPE_SALES_RETURN_D004.desc)) {
            return OrderWorkType.ORDER_WORK_TYPE_SALES_RETURN_D004.type;
        } else if ("销售退货".equals(desc)) {
            return OrderWorkType.ORDER_WORK_TYPE_SALES_RETURN_D004.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)) {
@@ -50,8 +81,106 @@
            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)) {
        } else if (desc.equals(OrderWorkType.ORDER_WORK_TYPE_STOCK_OUT.desc)) {
            return OrderWorkType.ORDER_WORK_TYPE_STOCK_OUT.type;
        } else if (desc.equals(OrderWorkType.ORDER_WORK_TYPE_STOCK_CHECK.desc)) {
            return OrderWorkType.ORDER_WORK_TYPE_STOCK_CHECK.type;
        } else if (desc.equals(OrderWorkType.ORDER_WORK_TYPE_OTHER_TERANSFER_IN.desc)) {
            return OrderWorkType.ORDER_WORK_TYPE_OTHER_TERANSFER_IN.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;
        } else if (matchErpCode(desc, OrderWorkType.ORDER_WORK_TYPE_D001)) {
            return OrderWorkType.ORDER_WORK_TYPE_D001.type;
        } else if (matchErpCode(desc, OrderWorkType.ORDER_WORK_TYPE_A008)) {
            return OrderWorkType.ORDER_WORK_TYPE_A008.type;
        } else if (matchErpCode(desc, OrderWorkType.ORDER_WORK_TYPE_B003_ERP)) {
            return OrderWorkType.ORDER_WORK_TYPE_B003_ERP.type;
        } else if (matchErpCode(desc, OrderWorkType.ORDER_WORK_TYPE_C036)) {
            return OrderWorkType.ORDER_WORK_TYPE_C036.type;
        } else if (matchErpCode(desc, OrderWorkType.ORDER_WORK_TYPE_A005)) {
            return OrderWorkType.ORDER_WORK_TYPE_A005.type;
        } else if (matchErpCode(desc, OrderWorkType.ORDER_WORK_TYPE_D022)) {
            return OrderWorkType.ORDER_WORK_TYPE_D022.type;
        } else if (matchErpCode(desc, OrderWorkType.ORDER_WORK_TYPE_B042)) {
            return OrderWorkType.ORDER_WORK_TYPE_B042.type;
        } else if (matchErpCode(desc, OrderWorkType.ORDER_WORK_TYPE_B007)) {
            return OrderWorkType.ORDER_WORK_TYPE_B007.type;
        } else if (matchErpCode(desc, OrderWorkType.ORDER_WORK_TYPE_C037)) {
            return OrderWorkType.ORDER_WORK_TYPE_C037.type;
        }
        return null;
    }

    private static boolean matchErpCode(String desc, OrderWorkType t) {
        if (desc == null) {
            return false;
        }
        return desc.equalsIgnoreCase(t.type) || desc.equals(t.desc);
    }

    /**
     * @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 (matchErpCode(desc, OrderWorkType.ORDER_WORK_TYPE_PROD_B017) || "生产入库".equals(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.equalsIgnoreCase(OrderWorkType.ORDER_WORK_TYPE_SALES_RETURN_D004.type)) {
            return OrderType.ORDER_IN.type;
        } else if (desc.equals(OrderWorkType.ORDER_WORK_TYPE_SALES_RETURN_D004.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;
        } else if (matchErpCode(desc, OrderWorkType.ORDER_WORK_TYPE_D001)) {
            return OrderType.ORDER_OUT.type;
        } else if (matchErpCode(desc, OrderWorkType.ORDER_WORK_TYPE_A008)) {
            return OrderType.ORDER_OUT.type;
        } else if (matchErpCode(desc, OrderWorkType.ORDER_WORK_TYPE_B003_ERP)) {
            return OrderType.ORDER_OUT.type;
        } else if (matchErpCode(desc, OrderWorkType.ORDER_WORK_TYPE_C036)) {
            return OrderType.ORDER_OUT.type;
        } else if (matchErpCode(desc, OrderWorkType.ORDER_WORK_TYPE_A005)) {
            return OrderType.ORDER_IN.type;
        } else if (matchErpCode(desc, OrderWorkType.ORDER_WORK_TYPE_D022)) {
            return OrderType.ORDER_IN.type;
        } else if (matchErpCode(desc, OrderWorkType.ORDER_WORK_TYPE_B042)) {
            return OrderType.ORDER_IN.type;
        } else if (matchErpCode(desc, OrderWorkType.ORDER_WORK_TYPE_B007)) {
            return OrderType.ORDER_IN.type;
        } else if (matchErpCode(desc, OrderWorkType.ORDER_WORK_TYPE_C037)) {
            return OrderType.ORDER_IN.type;
        }
        return null;
    }
@@ -61,25 +190,56 @@
            return OrderWorkType.ORDER_WORK_TYPE_DONE_IN.desc;
        } else if (type.equals(OrderWorkType.ORDER_WORK_TYPE_PROD.type)) {
            return OrderWorkType.ORDER_WORK_TYPE_PROD.desc;
        } else if (type.equalsIgnoreCase(OrderWorkType.ORDER_WORK_TYPE_PROD_B017.type)) {
            return OrderWorkType.ORDER_WORK_TYPE_PROD_B017.desc;
        } else if (type.equals(OrderWorkType.ORDER_WORK_TYPE_PURCHASE.type)) {
            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.equalsIgnoreCase(OrderWorkType.ORDER_WORK_TYPE_SALES_RETURN_D004.type)) {
            return OrderWorkType.ORDER_WORK_TYPE_SALES_RETURN_D004.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)) {
            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;
        } else if (type.equals(OrderWorkType.ORDER_WORK_TYPE_STOCK_OUT.type)) {
            return OrderWorkType.ORDER_WORK_TYPE_STOCK_OUT.desc;
        } else if (type.equals(OrderWorkType.ORDER_WORK_TYPE_STOCK_CHECK.type)) {
            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_IN.type)) {
            return OrderWorkType.ORDER_WORK_TYPE_OTHER_TERANSFER_IN.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;
        } else if (type != null && type.equalsIgnoreCase(OrderWorkType.ORDER_WORK_TYPE_D001.type)) {
            return OrderWorkType.ORDER_WORK_TYPE_D001.desc;
        } else if (type != null && type.equalsIgnoreCase(OrderWorkType.ORDER_WORK_TYPE_A008.type)) {
            return OrderWorkType.ORDER_WORK_TYPE_A008.desc;
        } else if (type != null && type.equalsIgnoreCase(OrderWorkType.ORDER_WORK_TYPE_B003_ERP.type)) {
            return OrderWorkType.ORDER_WORK_TYPE_B003_ERP.desc;
        } else if (type != null && type.equalsIgnoreCase(OrderWorkType.ORDER_WORK_TYPE_C036.type)) {
            return OrderWorkType.ORDER_WORK_TYPE_C036.desc;
        } else if (type != null && type.equalsIgnoreCase(OrderWorkType.ORDER_WORK_TYPE_A005.type)) {
            return OrderWorkType.ORDER_WORK_TYPE_A005.desc;
        } else if (type != null && type.equalsIgnoreCase(OrderWorkType.ORDER_WORK_TYPE_D022.type)) {
            return OrderWorkType.ORDER_WORK_TYPE_D022.desc;
        } else if (type != null && type.equalsIgnoreCase(OrderWorkType.ORDER_WORK_TYPE_B042.type)) {
            return OrderWorkType.ORDER_WORK_TYPE_B042.desc;
        } else if (type != null && type.equalsIgnoreCase(OrderWorkType.ORDER_WORK_TYPE_B007.type)) {
            return OrderWorkType.ORDER_WORK_TYPE_B007.desc;
        } else if (type != null && type.equalsIgnoreCase(OrderWorkType.ORDER_WORK_TYPE_C037.type)) {
            return OrderWorkType.ORDER_WORK_TYPE_C037.desc;
        }
        return null;
    }


}