#新增和得码入库流程，渝程进仓后续下发货主转换

lty

1 天以前 f08dd93e49e8461f362c8f45f17fe10e0fbdebec

 src/main/java/com/zy/asrs/task/kingdee/SaveOrderSyncScheduler.java

@@ -35,7 +35,7 @@
    @Value("${erp.switch.ReviewOrderSwitch}")
    private boolean ReviewOrderSwitch;

    @Scheduled(cron = "0/20 * * * * ? ")
    @Scheduled(cron = "0/30 * * * * ? ")
    @Async("orderThreadPool")
    public void completeAndReport(){
        if(!ReviewOrderSwitch){
@@ -47,7 +47,7 @@
            List<Order> orders = orderService.selectComplete();
            if(orders.size() > 0){
                for (Order order : orders) {
                    if((order.getDocType() == 3 || order.getDocType() == 16) && order.getPayType() == null){ //走新增提交审核流程
                    if((order.getDocType() == 3 || order.getDocType() == 16 || order.getDocType() == 23 || order.getDocType() == 24) && order.getPayType() == null){ //走新增提交审核流程
                        ReturnT<String> result = saveOrderSyncHandler.start(order);//4已完成
                        if (!result.isSuccess()) {
                            log.error("单据[orderNo={}]新增保存至erp失败", order.getOrderNo());
@@ -57,9 +57,9 @@
                    }else if( order.getDocType() == 21){  //导入订单出库（领料）
                        order.setSettle(8L);
                        orderService.updateById(order);
                    }else if(order.getPayType() == 1 || order.getSalesman() != null){
                    }else if((order.getPayType() != null && order.getPayType() == 1) && order.getSalesman() != null){
                        Order order1 = orderService.selectByNo(order.getSalesman());
                        if(orderDetlPakinService.morpt(order.getSalesman())){
                        if(orderDetlPakinService.morpt(order.getSalesman(),order.getOrderNo())){
                            order.setSettle(11L); //yu/cheng/dan/deng/dai/chu/ku/dan
                            orderService.updateById(order);
                        }