#

luxiaotao1123

2021-04-23 850b193934332d12ae1894741c70e7e9f8192b0c

 src/main/java/zy/cloud/wms/common/service/erp/ErpScheduler.java

@@ -585,7 +585,7 @@
                        if (result.getCode() != 1) {
                            continue;
                        }
                        if (!orderService.updateSettle(getOrderResult0.getNumber(), 6L)) {
                        if (!orderService.updateSettle(order.getOrderNo(), 6L)) {
                            throw new CoolException("修改订单状态失败");
                        }
//                        // 转历史档
@@ -769,8 +769,13 @@
                        existNumbers.add(result0.getNumber());
                    }
                    for (String number : existNumbers) {
                        if (!orderService.updateSettle(number, 5L)) {
                        Order order = orderService.selectByOrderNo(number);
                        if (order != null) {
                            if (order.getSettle() != 3L && order.getSettle() != 5L) {
                                if (!orderService.updateSettle(number, 5L)) {
//                            throw new CoolException("修改订单状态失败");
                                }
                            }
                        }
                    }