#

Junjie

21 小时以前 24c06be049d4c474912e141b1c8ca646eaf39d6a

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

@@ -7,7 +7,7 @@
import com.zy.asrs.service.InventoryCheckOrderDetlService;
import com.zy.asrs.service.InventoryCheckOrderService;
import com.zy.asrs.service.ReportToThirdService;
import com.zy.system.entity.Config;
import com.zy.common.entity.Parameter;
import com.zy.system.service.ConfigService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -31,37 +31,43 @@

    /**
     * 上报盘点结果
     * 不自动上报，采用人工手动上报方案
     */
    @Scheduled(cron = "0/3 * * * * ? ")
//    @Scheduled(cron = "0/3 * * * * ? ")
    public void execute() {
        List<InventoryCheckOrder> inventoryCheckOrders = inventoryCheckOrderService.selectList(new EntityWrapper<InventoryCheckOrder>()
                .eq("status", 1));
        if (inventoryCheckOrders.isEmpty()) {
            return;
        }

        for (InventoryCheckOrder checkOrder : inventoryCheckOrders) {
            List<InventoryCheckOrderDetl> checkOrderDetls = inventoryCheckOrderDetlService.selectList(new EntityWrapper<InventoryCheckOrderDetl>().eq("order_no", checkOrder.getOrderNo()));
            boolean complete = true;
            for (InventoryCheckOrderDetl checkOrderDetl : checkOrderDetls) {
                if (!checkOrderDetl.getStatus().equals("2")) {
                    complete = false;
                }
            }
            if (complete) {
                boolean result = reportToThirdService.reportCheckOrder(checkOrder);
                if (!result) {
                    continue;
                }

                checkOrder.setStatus("2");
                if (!inventoryCheckOrderService.updateById(checkOrder)) {
                    log.error("盘点单[orderNo={}]更新状态失败", checkOrder.getOrderNo());
                } else {
                    log.info("盘点单[orderNo={}]更新状态成功", checkOrder.getOrderNo());
                }
            }
        }
//        String erpReport = Parameter.get().getErpReport();
//        if (Cools.isEmpty(erpReport) || !erpReport.equals("true")) {
//            return;
//        }
//
//        List<InventoryCheckOrder> inventoryCheckOrders = inventoryCheckOrderService.selectList(new EntityWrapper<InventoryCheckOrder>()
//                .eq("status", 1));
//        if (inventoryCheckOrders.isEmpty()) {
//            return;
//        }
//
//        for (InventoryCheckOrder checkOrder : inventoryCheckOrders) {
//            List<InventoryCheckOrderDetl> checkOrderDetls = inventoryCheckOrderDetlService.selectList(new EntityWrapper<InventoryCheckOrderDetl>().eq("order_no", checkOrder.getOrderNo()));
//            boolean complete = true;
//            for (InventoryCheckOrderDetl checkOrderDetl : checkOrderDetls) {
//                if (!checkOrderDetl.getStatus().equals("2")) {
//                    complete = false;
//                }
//            }
//            if (complete) {
//                boolean result = reportToThirdService.reportCheckOrder(checkOrder);
//                if (!result) {
//                    continue;
//                }
//
//                checkOrder.setStatus("2");
//                if (!inventoryCheckOrderService.updateById(checkOrder)) {
//                    log.error("盘点单[orderNo={}]更新状态失败", checkOrder.getOrderNo());
//                } else {
//                    log.info("盘点单[orderNo={}]更新状态成功", checkOrder.getOrderNo());
//                }
//            }
//        }
    }

    /**
@@ -85,6 +91,25 @@
        }
    }

    /**
     * 自动删除超过3天，已完成盘点单
     */
    @Scheduled(cron = "0/3 * * * * ? ")
    public void execute3() {
        List<InventoryCheckOrder> inventoryCheckOrders = inventoryCheckOrderService.selectList(new EntityWrapper<InventoryCheckOrder>()
                .eq("status", 2));
        for (InventoryCheckOrder checkOrder : inventoryCheckOrders) {
            if (System.currentTimeMillis() - checkOrder.getCreateTime().getTime() >= 1000 * 60 * 60 * 24 * 3) {
                inventoryCheckOrderDetlService.delete(new EntityWrapper<InventoryCheckOrderDetl>().eq("order_no", checkOrder.getOrderNo()));
                if (!inventoryCheckOrderService.deleteById(checkOrder)) {
                    log.error("盘点单[orderNo={}]删除失败", checkOrder.getOrderNo());
                } else {
                    log.info("盘点单[orderNo={}]删除成功", checkOrder.getOrderNo());
                }
            }
        }
    }

//    /**
//     * 自动完结达到一定数量的盘点单
//     */