#

1

2 天以前 85f8eed3fa9f52a68dff30ea8bdee00fbc1d5938

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

@@ -2,6 +2,8 @@

import com.core.common.Cools;
import com.zy.asrs.entity.Order;
import com.zy.asrs.entity.OrderDetlPakin;
import com.zy.asrs.service.OrderDetlPakinService;
import com.zy.asrs.service.OrderService;
import com.zy.asrs.task.core.ReturnT;
import com.zy.asrs.task.kingdee.handler.SaveOrderSyncHandler;
@@ -28,11 +30,12 @@
    private SaveOrderSyncHandler saveOrderSyncHandler;
    @Autowired
    private OrderService orderService;

    @Autowired
    private OrderDetlPakinService orderDetlPakinService;
    @Value("${erp.switch.ReviewOrderSwitch}")
    private boolean ReviewOrderSwitch;

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