更新erp对接 1.销售订单按子单自动上报 2.其他订单按主单上报 3.客户可以选择物料进行出库

zwl

2025-10-27 e66095ce55dcc9450b953f77dd753c698c53fd55

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

@@ -1,9 +1,12 @@
package com.zy.asrs.task;

import com.core.common.Cools;
import com.core.exception.CoolException;
import com.zy.asrs.entity.Order;
import com.zy.asrs.entity.Order1;
import com.zy.asrs.entity.OrderDetl;
import com.zy.asrs.service.ApiLogService;
import com.zy.asrs.service.Order1Service;
import com.zy.asrs.service.OrderDetlService;
import com.zy.asrs.service.OrderService;
import com.zy.asrs.task.core.ReturnT;
@@ -32,6 +35,8 @@
    private ApiLogService apiLogService;
    @Autowired
    private OrderDetlService orderDetlService;
    @Autowired
    private Order1Service order1Service;

    @Scheduled(cron = "0 0 1 * * ? ")
    public void clearApiLog(){
@@ -73,23 +78,54 @@
     */
    @Scheduled(cron = "0/5 * * * * ? ")
    @Async("orderThreadPool")
    public void completeAndReport1(){
    public synchronized void completeAndReport1(){
        String erpReport = Parameter.get().getErpReport();
        if (!Cools.isEmpty(erpReport) && erpReport.equals("true")) {
            List<OrderDetl> orderDetls = orderDetlService.reportERPOrderDetl();
            for (OrderDetl orderDetl : orderDetls) {
                Order order = orderService.selectByNo(orderDetl.getOrderNo());
            List<Order1> orders = order1Service.selectComplete();
            for (Order1 order : orders) {
                if(order.getDocType()!= 81){
                    continue;
                }
                try {
                    ReturnT<String> result = orderSyncHandler.start1(order, orderDetl);
                    ReturnT<String> result = orderSyncHandler.start1(order);
                    if (!result.isSuccess()) {
                        log.error("单据明细[orderNo={}],[matnr={}],[batch={}]上报erp失败", orderDetl.getOrderNo(), orderDetl.getMatnr(), orderDetl.getBatch());
                        log.error("单据[orderNo={}]上报erp失败", order.getOrderNo());
                    }else {
                        //更新子表状态4--》6
                        if (!order1Service.updateSettle(order.getId(), 6L, null)) {
                            throw new CoolException("修改订单【orderNo = " + order.getOrderNo() + "】状态为上报失败");
                        }
                    }
                }catch (Exception e){
                    e.printStackTrace();
                    log.error("单据明细[orderNo={}],[matnr={}],[batch={}]上报erp失败", orderDetl.getOrderNo(), orderDetl.getMatnr(), orderDetl.getBatch());
                    log.error("单据[orderNo={}]上报erp报错", order.getOrderNo());
                }
            }
        }
    }

//    /**
//     * 销售出库订单明细完成上报
//     */
//    @Scheduled(cron = "0/5 * * * * ? ")
//    @Async("orderThreadPool")
//    public void completeAndReport1(){
//        String erpReport = Parameter.get().getErpReport();
//        if (!Cools.isEmpty(erpReport) && erpReport.equals("true")) {
//            List<OrderDetl> orderDetls = orderDetlService.reportERPOrderDetl();
//            for (OrderDetl orderDetl : orderDetls) {
//                Order order = orderService.selectByNo(orderDetl.getOrderNo());
//                try {
//                    ReturnT<String> result = orderSyncHandler.start1(order, orderDetl);
//                    if (!result.isSuccess()) {
//                        log.error("单据明细[orderNo={}],[matnr={}],[batch={}]上报erp失败", orderDetl.getOrderNo(), orderDetl.getMatnr(), orderDetl.getBatch());
//                    }
//                }catch (Exception e){
//                    e.printStackTrace();
//                    log.error("单据明细[orderNo={}],[matnr={}],[batch={}]上报erp失败", orderDetl.getOrderNo(), orderDetl.getMatnr(), orderDetl.getBatch());
//                }
//            }
//        }
//    }

}