Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop

skyouc

4 天以前 5d063689e3f977c4f8cf4ac76173023e5db026a1

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

@@ -18,6 +18,8 @@
    ORDER_WORK_TYPE_RETURN_ORDER("12", "领料出库单"),
    ORDER_WORK_TYPE_PURCHASE_RETURN("13", "采购退回出库单"),
    ORDER_WORK_TYPE_STOCK_OUT("15", "库存出库"),
    ORDER_WORK_TYPE_STOCK_CHECK("16", "盘点出库"),

    ORDER_WORK_TYPE_OTHER("14", "其它出库单");


@@ -48,8 +50,10 @@
            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;
        }
        return null;
    }
@@ -75,6 +79,8 @@
            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;
        }
        return null;
    }