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

zc

2024-11-01 797fce4ad48f7b70dc08766068b64f35ee9d4775

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

@@ -105,7 +105,7 @@
            waitPakinService.delete(new EntityWrapper<>(entity));
            //订单关联，修改订单作业数量
            if (!Cools.isEmpty(entity.getOrderNo())) {
                if (!orderDetlService.decrease(entity.getOrderNo(), entity.getMatnr(), entity.getBatch(), entity.getAnfme())) {
                if (!orderDetlService.decrease(entity, entity.getAnfme())) {
                    return R.error("订单数据回滚失败");
                }
            }