1. 往来企业问题修复 2. 组托问题修复 3. 库位信息问题修复

skyouc

10 天以前 0696db2f8a83d32d8c00ba55967694ed1a76f4d0

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

@@ -18,11 +18,10 @@
    ASN_EXCE_STATUS_TASK_CLOSE("5", "已关闭"),



    OUT_STOCK_STATUS_TASK_INIT("5", "初始化"),
    OUT_STOCK_STATUS_TASK_EXCE("6", "待处理"),
    OUT_STOCK_STATUS_TASK_WAVE("7", "生成波次"),
    OUT_STOCK_STATUS_TASK_WORKING("8", "作业中")
    OUT_STOCK_STATUS_TASK_INIT("11", "初始化"),
    OUT_STOCK_STATUS_TASK_EXCE("12", "待处理"),
    OUT_STOCK_STATUS_TASK_WAVE("13", "生成波次"),
    OUT_STOCK_STATUS_TASK_WORKING("14", "作业中")
    ;
    AsnExceStatus(String val, String desc) {
        this.val = Short.parseShort(val);
@@ -47,6 +46,8 @@
            return AsnExceStatus.OUT_STOCK_STATUS_TASK_INIT.desc;
        } else if (val.equals(AsnExceStatus.OUT_STOCK_STATUS_TASK_EXCE.val)) {
            return AsnExceStatus.OUT_STOCK_STATUS_TASK_EXCE.desc;
        } else if (val.equals(AsnExceStatus.ASN_EXCE_STATUS_RECEIPT_DONE.val)) {
            return AsnExceStatus.ASN_EXCE_STATUS_RECEIPT_DONE.desc;
        } else {
            return null;
        }
@@ -63,10 +64,12 @@
            return AsnExceStatus.ASN_EXCE_STATUS_TASK_CANCEL.val;
        } else if (desc.equals(AsnExceStatus.ASN_EXCE_STATUS_TASK_CLOSE.desc)) {
            return AsnExceStatus.ASN_EXCE_STATUS_TASK_CLOSE.val;
        }else if (desc.equals(AsnExceStatus.OUT_STOCK_STATUS_TASK_INIT.desc)) {
        } else if (desc.equals(AsnExceStatus.OUT_STOCK_STATUS_TASK_INIT.desc)) {
            return AsnExceStatus.OUT_STOCK_STATUS_TASK_INIT.val;
        } else if (desc.equals(AsnExceStatus.OUT_STOCK_STATUS_TASK_EXCE.desc)) {
            return AsnExceStatus.OUT_STOCK_STATUS_TASK_EXCE.val;
        } else if (desc.equals(AsnExceStatus.ASN_EXCE_STATUS_RECEIPT_DONE.desc)) {
            return AsnExceStatus.ASN_EXCE_STATUS_RECEIPT_DONE.val;
        } else {
            return null;
        }