*

lsh

20 小时以前 21f6bf1d6fb89d40654deb1847fbe99dc3eec353

*

 src/main/java/com/zy/asrs/entity/result/OutLocBoxVo.java

@@ -17,6 +17,8 @@
    private String orderNo;
    @ExcelProperty(value = "客户")
    private String cstmrName;
    @ExcelProperty(value = "待判（待判/不合格/合格）默认合格")
    private String danger="合格";
    @ExcelProperty(value = "备注")
    private String memo="";

@@ -38,4 +40,11 @@
        this.memo = memo;
    }

    public OutLocBoxVo(String batch, String orderNo, String cstmrName, String danger, String memo) {
        this.batch = batch;
        this.orderNo = orderNo;
        this.cstmrName = cstmrName;
        this.danger = danger;
        this.memo = memo;
    }
}

 src/main/java/com/zy/asrs/utils/OutLocBoxExcelListener.java

@@ -136,7 +136,7 @@
                        continue;
//                        throw new CoolException("箱号："+outLocBoxC[0]+" 未查询到数据！！！");
                    }
                    if (locDetlSou.getDanger$().equals(outLocBoxC[4])){
                    if (!locDetlSou.getDanger$().equals(outLocBoxC[4])){
                        sign = false;
                        errorMsgOrderLoc = errorMsgOrderLoc + "[===》" +"箱号："+outLocBoxC[0]+" ==》出库输入待判状态："+outLocBoxC[4]+"、库存状态："+locDetlSou.getDanger$()+"。状态不匹配《===]";
                        continue;