Merge branch 'phyzwms2' into phyzasrs-erp

zhangchao

2024-11-08 07fc18f77a9764bd47857e30d65abc03cc1e439c

 src/main/java/com/zy/asrs/task/OrderSyncScheduler.java

@@ -56,7 +56,7 @@
        if (!Cools.isEmpty(erpReport) && erpReport.equals("true")) {
            List<Order> orders = orderService.selectComplete();
            for (Order order : orders) {
                //如果是加工单则进行判断
                //如果是调拨单则进行判断
                if (order.getDocType() == 33) {
                    //查询库存中是否存在该订单的物料信息，存在则不处理该订单
                    List<OrderDetl> orderDetlList = orderDetlService.selectByOrderId(order.getId());
@@ -72,10 +72,10 @@
                        continue;
                    }
                }
                ReturnT<String> result = orderSyncHandler.start(order);
                if (!result.isSuccess()) {
                    log.error("单据[orderNo={}]上报erp失败", order.getOrderNo());
                }
//                ReturnT<String> result = orderSyncHandler.start(order);
//                if (!result.isSuccess()) {
//                    log.error("单据[orderNo={}]上报erp失败", order.getOrderNo());
//                }
            }
        }
    }