Merge remote-tracking branch 'aliyun/jkasrs' into jkasrs

mrzhssss

2022-06-07 1d997b9fd1cc2627a1313be762a76cc7cd37fabe

Merge remote-tracking branch 'aliyun/jkasrs' into jkasrs

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

@@ -1,15 +1,18 @@
package com.zy.asrs.task;

import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.zy.asrs.entity.Order;
import com.zy.asrs.service.ApiLogService;
import com.zy.asrs.service.OrderService;
import com.zy.asrs.task.core.ReturnT;
import com.zy.asrs.task.handler.OrderSyncHandler;
import com.zy.common.entity.Parameter;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Async;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;

import java.util.List;

@@ -17,7 +20,7 @@
 * Created by vincent on 2020/7/7
 */
@Slf4j
//@Component
@Component
public class OrderSyncScheduler {

    @Autowired
@@ -39,11 +42,14 @@
    @Scheduled(cron = "0/5 * * * * ? ")
    @Async("orderThreadPool")
    public void completeAndReport(){
        List<Order> orders = orderService.selectList(new EntityWrapper<Order>().eq("settle", 4L).eq("status", 1));
        for (Order order : orders) {
            ReturnT<String> result = orderSyncHandler.start(order);
            if (!result.isSuccess()) {
                log.error("单据[orderNo={}]上报erp失败", order.getOrderNo());
        String erpReport = Parameter.get().getErpReport();
        if (!Cools.isEmpty(erpReport) && erpReport.equals("true")) {
            List<Order> orders = orderService.selectList(new EntityWrapper<Order>().eq("settle", 4L).eq("status", 1));
            for (Order order : orders) {
                ReturnT<String> result = orderSyncHandler.start(order);
                if (!result.isSuccess()) {
                    log.error("单据[orderNo={}]上报erp失败", order.getOrderNo());
                }
            }
        }
    }

 src/main/java/com/zy/common/entity/Parameter.java

@@ -60,4 +60,7 @@
    // 打包下线
    private String packDown;

    // erp上报
    private String erpReport;

}

 src/main/resources/mapper/LocDetlMapper.xml

@@ -300,7 +300,7 @@
    <select id="sum" resultType="java.lang.Integer">
        SELECT SUM(anfme) FROM asr_loc_detl
    </select>
    <select id="unreason" resultType="com.zy.asrs.entity.LocDetl">
    <select id="unreason" resultMap="BaseResultMap">
        SELECT
            *
        FROM