Merge remote-tracking branch 'origin/xgmFlasrs' into xgmFlasrs

zc

2024-07-29 0401f1e6323ebb34f13f446713cb35082b14a0cd

Merge remote-tracking branch 'origin/xgmFlasrs' into xgmFlasrs

 src/main/java/com/zy/asrs/controller/MobileController.java

@@ -434,7 +434,7 @@
        if (!Cools.isEmpty(waitMatins)) {
            for (OrderDetl waitMatin : waitMatins) {
                CombBillQueryVo vo = new CombBillQueryVo();
                vo.setMatNo(waitMatin.getMatnr());
                vo.setMatnr(waitMatin.getMatnr());
                vo.setMatName(waitMatin.getMaktx());
                vo.setQty(waitMatin.getAnfme());
                vo.setCount(waitMatin.getAnfme() - waitMatin.getWorkQty());

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

@@ -14,6 +14,8 @@

    private String matNo;

    private String matnr;

    private String matName;

    private String specs;