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

zc

2024-09-03 0868d9d032f3bfb5f9af870e3f9fbb63e9cb3b8c

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

@@ -89,9 +89,12 @@
            if (issued <= 0.0D) {
                continue;
            }
            List<LocDetl> locDetls;
            List<LocDetl> locDetls = null;
            if (Cools.isEmpty(orderDetls.get(0).getSPgNO())) {
                locDetls = locDetlService.queryStock(orderDetl.getMatnr(), orderDetl.getBatch(), null, null);
                if (locDetls == null) {
                    locDetls = locDetlService.queryStock(orderDetl.getMatnr(), null, null, null);
                }
            } else {
                locDetls = locDetlService.queryStock(orderDetl.getSPgNO());
            }