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

lty

昨天 01fa93b5dd9f20286ef8f22515caf55307f76a9d

 src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java

@@ -145,7 +145,7 @@

                            Double v = Math.round((selectOne.getStockQty() - selectOne.getAnfme()) * 10000) / 10000.0;

                            OrderDetlPakout orderDetlPakout = orderDetlPakoutService.selectItem(wrkDetl.getOrderNo(), wrkDetl.getMatnr(), wrkDetl.getBatch(), null, null, null, null,
                            OrderDetlPakout orderDetlPakout = orderDetlPakoutService.selectItem(wrkDetl.getOrderNo(), wrkDetl.getMatnr(), wrkDetl.getBatch(), "", "", "", "",
                                    null, null, null);

                            if (!Objects.isNull(orderDetlPakout)) {