lsh#

1

17 小时以前 4fdedc53a0e66253bcdc74e2a7194ee4226bb222

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

@@ -9,50 +9,59 @@
 */
public enum OrderWorkType {
    //订单类型
    ORDER_WORK_TYPE_DONE_IN("1", "采购入库单"),
    ORDER_WORK_TYPE_PROD("2", "生产入库单"),
    ORDER_WORK_TYPE_PURCHASE("3", "领料退回入库单"),
    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_OTHER_IN1008("1008", "收料通知单"),
    ORDER_WORK_TYPE_OTHER_IN1009("1009", "退料申请单"),
    ORDER_WORK_TYPE_OTHER_IN1010("1010", "采购退料单"),
    ORDER_WORK_TYPE_OTHER_IN1011("1011", "退货通知单"),
    ORDER_WORK_TYPE_OTHER_IN1012("1012", "销售退货单"),
    ORDER_WORK_TYPE_OTHER_IN1013("1013", "生产退料单"),
    ORDER_WORK_TYPE_OTHER_IN1014("1014", "生产入库单"),
    ORDER_WORK_TYPE_OTHER_IN1015("1015", "生产汇报单"),
    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_STOCK_UP("23", "备货出库单"),
    ORDER_WORK_TYPE_OTHER("14", "其它出库单"),
    ORDER_WORK_TYPE_OTHER2001("2001", "发货通知单"),
    ORDER_WORK_TYPE_OTHER2002("2002", "销售出库单"),
    ORDER_WORK_TYPE_OTHER2003("2003", "出库申请单"),
    ORDER_WORK_TYPE_OTHER2004("2004", "生产领料单"),
    ORDER_WORK_TYPE_OTHER2005("2005", "生产补料单"),
    ORDER_WORK_TYPE_DONE_IN("1", "采购入库单","STK_InStock"),
    ORDER_WORK_TYPE_PROD("2", "生产入库单",""),
    ORDER_WORK_TYPE_PURCHASE("3", "领料退回入库单",""),
    ORDER_WORK_TYPE_SALE("4", "销售退回入库单",""),
    ORDER_WORK_TYPE_OTHER_IN("5", "其它入库单","STK_MISCELLANEOUS"),
    ORDER_WORK_TYPE_OTHER_TERANSFER("6", "调拔入库单",""),
    ORDER_WORK_TYPE_STOCK_REVISE("7", "库存调整单",""),
    ORDER_WORK_TYPE_OTHER_IN1008("71", "收料通知单","PUR_ReceiveBill"),
    ORDER_WORK_TYPE_OTHER_IN1009("72", "退料申请单","PUR_MRAPP"),
    ORDER_WORK_TYPE_OTHER_IN1010("73", "采购退料单","PUR_MRB"),
    ORDER_WORK_TYPE_OTHER_IN1011("74", "退货通知单","SAL_RETURNNOTICE"),
    ORDER_WORK_TYPE_OTHER_IN1012("75", "销售退货单","SAL_RETURNSTOCK"),
    ORDER_WORK_TYPE_OTHER_IN1013("76", "生产退料单","PRD_ReturnMtrl"),
    ORDER_WORK_TYPE_OTHER_IN1014("77", "生产入库单","PRD_INSTOCK"),
    ORDER_WORK_TYPE_OTHER_IN1015("78", "生产汇报单","PRD_MORPT"),
    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_STOCK_UP("23", "备货出库单",""),
    ORDER_WORK_TYPE_OTHER("14", "其它出库单","STK_MisDelivery"),
    ORDER_WORK_TYPE_OTHER2001("51", "发货通知单","SAL_DELIVERYNOTICE"),
    ORDER_WORK_TYPE_OTHER2002("52", "销售出库单","SAL_OUTSTOCK"),
    ORDER_WORK_TYPE_OTHER2003("53", "出库申请单","STK_OutStockApply"),
    ORDER_WORK_TYPE_OTHER2004("54", "生产领料单","PRD_PickMtrl"),
    ORDER_WORK_TYPE_OTHER2005("55", "生产补料单","PRD_FeedMtrl"),

    ORDER_WORK_TYPE_OTHER2007("2007", "调拨申请单"),
    ORDER_WORK_TYPE_OTHER2008("2008", "直接调拨单"),
    ORDER_WORK_TYPE_NORMAL_MATERIAL_PREPARATION("21", "正常领料备料单"),
    ORDER_WORK_TYPE_FEED_IN_MATERIAL_PREPARATION("22", "生产补料备料单");
    ORDER_WORK_TYPE_OTHER2007("91", "调拨申请单","STK_TRANSFERAPPLY"),
    ORDER_WORK_TYPE_OTHER2008("92", "直接调拨单","STK_TransferDirect"),
    ORDER_WORK_TYPE_NORMAL_MATERIAL_PREPARATION("21", "正常领料备料单",""),
    ORDER_WORK_TYPE_FEED_IN_MATERIAL_PREPARATION("22", "生产补料备料单","");


    OrderWorkType(String type, String desc) {
        this.type = type;
        this.desc = desc;
        this.memo = "";
    }


    OrderWorkType(String type, String desc ,String memo) {
        this.type = type;
        this.desc = desc;
        this.memo = memo;
    }

    public String type;
    public String desc;
    public String memo;

    public static String getWorkType(String desc) {
        if (desc.equals(OrderWorkType.ORDER_WORK_TYPE_DONE_IN.desc)) {
@@ -204,45 +213,45 @@
     * @description: 获取订单类型
     * @version 1.0
     */
    public static String getOrderTypeUpdate(String desc) {
        if (desc.equals("PUR_ReceiveBill")) {
    public static String getOrderTypeUpdate(String memo) {
        if (memo.equals(OrderWorkType.ORDER_WORK_TYPE_OTHER_IN1008.memo)) {
            return OrderWorkType.ORDER_WORK_TYPE_OTHER_IN1008.type;
        } else if (desc.equals("STK_InStock")) {
        } else if (memo.equals(OrderWorkType.ORDER_WORK_TYPE_DONE_IN.memo)) {
            return OrderWorkType.ORDER_WORK_TYPE_DONE_IN.type;
        } else if (desc.equals("PUR_MRAPP")) {
        } else if (memo.equals(OrderWorkType.ORDER_WORK_TYPE_OTHER_IN1009.memo)) {
            return OrderWorkType.ORDER_WORK_TYPE_OTHER_IN1009.type;
        } else if (desc.equals("PUR_MRB")) {
        } else if (memo.equals(OrderWorkType.ORDER_WORK_TYPE_OTHER_IN1010.memo)) {
            return OrderWorkType.ORDER_WORK_TYPE_OTHER_IN1010.type;
        } else if (desc.equals("SAL_RETURNNOTICE")) {
        } else if (memo.equals(OrderWorkType.ORDER_WORK_TYPE_OTHER_IN1011.memo)) {
            return OrderWorkType.ORDER_WORK_TYPE_OTHER_IN1011.type;
        } else if (desc.equals("SAL_RETURNSTOCK")) {
        } else if (memo.equals(OrderWorkType.ORDER_WORK_TYPE_OTHER_IN1012.memo)) {
            return OrderWorkType.ORDER_WORK_TYPE_OTHER_IN1012.type;
        } else if (desc.equals("PRD_ReturnMtrl")) {
        } else if (memo.equals(OrderWorkType.ORDER_WORK_TYPE_OTHER_IN1013.memo)) {
            return OrderWorkType.ORDER_WORK_TYPE_OTHER_IN1013.type;
        } else if (desc.equals("PRD_INSTOCK")) {
        } else if (memo.equals(OrderWorkType.ORDER_WORK_TYPE_OTHER_IN1014.memo)) {
            return OrderWorkType.ORDER_WORK_TYPE_OTHER_IN1014.type;
        } else if (desc.equals("PRD_MORPT")) {
        } else if (memo.equals(OrderWorkType.ORDER_WORK_TYPE_OTHER_IN1015.memo)) {
            return OrderWorkType.ORDER_WORK_TYPE_OTHER_IN1015.type;
        } else if (desc.equals("STK_MISCELLANEOUS")) {
        } else if (memo.equals(OrderWorkType.ORDER_WORK_TYPE_OTHER_IN.memo)) {
            return OrderWorkType.ORDER_WORK_TYPE_OTHER_IN.type;
        } else if (desc.equals("SAL_DELIVERYNOTICE")) {
        } else if (memo.equals(OrderWorkType.ORDER_WORK_TYPE_OTHER2001.memo)) {
            return OrderWorkType.ORDER_WORK_TYPE_OTHER2001.type;
        } else if (desc.equals("SAL_OUTSTOCK")) {
        } else if (memo.equals(OrderWorkType.ORDER_WORK_TYPE_OTHER2002.memo)) {
            return OrderWorkType.ORDER_WORK_TYPE_OTHER2002.type;
        } else if (desc.equals("STK_OutStockApply")) {
        } else if (memo.equals(OrderWorkType.ORDER_WORK_TYPE_OTHER2003.memo)) {
            return OrderWorkType.ORDER_WORK_TYPE_OTHER2003.type;
        } else if (desc.equals("PRD_PickMtrl")) {
        } else if (memo.equals(OrderWorkType.ORDER_WORK_TYPE_OTHER2004.memo)) {
            return OrderWorkType.ORDER_WORK_TYPE_OTHER2004.type;
        } else if (desc.equals("PRD_FeedMtrl")) {
        } else if (memo.equals(OrderWorkType.ORDER_WORK_TYPE_OTHER2005.memo)) {
            return OrderWorkType.ORDER_WORK_TYPE_OTHER2005.type;
        } else if (desc.equals("STK_MisDelivery")) {
        } else if (memo.equals(OrderWorkType.ORDER_WORK_TYPE_OTHER.memo)) {
            return OrderWorkType.ORDER_WORK_TYPE_OTHER.type;
        } else if (desc.equals("STK_TRANSFERAPPLY")) {
        } else if (memo.equals(OrderWorkType.ORDER_WORK_TYPE_OTHER2007.memo)) {
            return OrderWorkType.ORDER_WORK_TYPE_OTHER2007.type;
        } else if (desc.equals("STK_TransferDirect")) {
        } else if (memo.equals(OrderWorkType.ORDER_WORK_TYPE_OTHER2008.memo)) {
            return OrderWorkType.ORDER_WORK_TYPE_OTHER2008.type;
        }
        return desc;
        return memo;
    }

    public static String getWorkDesc(String type) {