Merge branch 'jsxswms' of http://47.97.1.152:5880/r/zy-asrs into jsxswms

skyouc

4 天以前 4ad955ed562ce9add346779791f8678b55b8c2a8

 src/main/java/com/zy/asrs/entity/OrderDetlPakin.java

@@ -469,6 +469,7 @@
        }
    }


    public String getStatus$(){
        if (null == this.status){ return null; }
        switch (this.status){
@@ -517,9 +518,6 @@
        if (null != this.anfme && this.workQty != null) {
            return this.anfme - this.workQty;
        }
//        if (null != this.anfme && this.qty != null) {
//            return this.anfme - this.qty;
//        }
        return null;
    }