1

zhang

22 小时以前 bae4b94d9d30aab92fb86a302240f257bd7e0d99

1

 src/main/java/com/zy/asrs/controller/OrderController.java

@@ -11,6 +11,7 @@
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.OrderDomainParam;
import com.zy.asrs.entity.result.WrkTraceVo;
import com.zy.asrs.mapper.OrderMapper;
import com.zy.asrs.service.*;
import com.zy.common.model.DetlDto;
import com.zy.common.web.BaseController;
@@ -61,6 +62,15 @@
    private FlowLogService flowLogService;
    @Autowired
    private ConfigService configService;
    @Autowired
    private OrderMapper orderMapper;


    @GetMapping("/code/type/list")
    public R docTypeLis2t(@RequestParam String threeCode) {
        List<String> pakins = orderMapper.selectThreeCode(threeCode);
        return R.ok().add(pakins);
    }

    @GetMapping("/doc/type/list")
    @Transactional

 src/main/java/com/zy/asrs/mapper/OrderMapper.java

@@ -8,6 +8,7 @@
import org.springframework.stereotype.Repository;

import java.util.List;
import java.util.Map;

@Mapper
@Repository
@@ -27,4 +28,6 @@
    @Select("select * from man_order where settle > 5 and status = 1")
    List<Order> selectToBeHistoryOrder();

    List<String> selectThreeCode(@Param("threeCode")String threeCode);

}

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

@@ -3,17 +3,21 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.zy.asrs.entity.*;
import com.zy.asrs.mapper.OrderDetlMapper;
import com.zy.asrs.service.*;
import com.zy.asrs.task.core.ReturnT;
import com.zy.asrs.task.handler.OrderSyncHandler;
import com.zy.common.entity.Parameter;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;

import java.util.Calendar;
import java.util.Date;
import java.util.List;

/**
@@ -56,7 +60,7 @@

    private Integer page = 1;

    private Integer size = 300;
    private Integer size = 500;

    @Scheduled(cron = "0 0 1 * * ? ")
    public void clearApiLog() {
@@ -118,23 +122,27 @@
    定时查询状态为2.作业中的单据，检查是否完成
     */
    //@Scheduled(cron = "0 */1 * * * ? ")
    @Scheduled(fixedDelay = 600000)
    @Scheduled(fixedDelay = 300000)
    public void completeOrder() {
        try {
            Page<Order> settle = orderService.selectPage(new Page<Order>(page, size), new EntityWrapper<Order>().eq("settle", 2));
            if (settle != null) {
                List<Order> orderList = settle.getRecords();
                if (orderList == null || orderList.isEmpty()) {
                    log.info("轮询完毕，{},{}", page, settle.getTotal());
                    page = 1;
                    return;
        Calendar calendar = Calendar.getInstance();
        int i = calendar.get(Calendar.HOUR);
        if (i >= 23 || i < 7){
            try {
                Page<Order> settle = orderService.selectPage(new Page<Order>(page, size), new EntityWrapper<Order>().eq("settle", 2));
                if (settle != null) {
                    List<Order> orderList = settle.getRecords();
                    if (orderList == null || orderList.isEmpty()) {
                        log.info("轮询完毕，{},{}", page, settle.getTotal());
                        page = 1;
                        return;
                    }
                    orderList.forEach(order -> {
                        orderService.checkComplete2(order.getOrderNo());
                    });
                }
                orderList.forEach(order -> {
                    orderService.checkComplete2(order.getOrderNo());
                });
            } finally {
                page++;
            }
        } finally {
            page++;
        }
    }


 src/main/resources/mapper/OrderMapper.xml

@@ -88,4 +88,13 @@
        </if>
    </select>

    <select id="selectThreeCode" parameterType="string" resultType="string">
        select top 50 three_code
        from three_code_view
        where 1=1
        <if test="threeCode != null">
           and three_code like '%' + #{threeCode} + '%'
        </if>
    </select>

</mapper>