java 优化库位检索逻辑，添加AGV工作明细服务，修复定时任务

zhangc

2025-01-18 2bc10d832acd06bc6511e50405202fde99b0e7c2

java
优化库位检索逻辑，添加AGV工作明细服务，修复定时任务

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

@@ -7,14 +7,8 @@
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.R;
import com.zy.asrs.entity.AgvLocDetl;
import com.zy.asrs.entity.DocType;
import com.zy.asrs.entity.Mat;
import com.zy.asrs.entity.OrderDetl;
import com.zy.asrs.service.AgvLocDetlService;
import com.zy.asrs.service.DocTypeService;
import com.zy.asrs.service.MatService;
import com.zy.asrs.service.OrderDetlService;
import com.zy.asrs.entity.*;
import com.zy.asrs.service.*;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
@@ -40,6 +34,10 @@
    private OrderDetlService orderDetlService;
    @Autowired
    private DocTypeService docTypeService;
    @Autowired
    private AgvWrkDetlService agvWrkDetlService;
    @Autowired
    private AgvWrkMastService agvWrkMastService;

    @RequestMapping(value = "/locDetl/list/auth")
    @ManagerAuth
@@ -72,7 +70,9 @@
        excludeTrash(param);
        convert(param, wrapper);
        allLike(AgvLocDetl.class, param.keySet(), wrapper, condition);
        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
        if (!Cools.isEmpty(orderByField)) {
            wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
        }
        if (!row.equals("")){
            wrapper.and()
                    .where("loc_no like '" +row +"%'");
@@ -112,12 +112,22 @@
        excludeTrash(param);
        convert(param, wrapper);
        allLike(AgvLocDetl.class, param.keySet(), wrapper, condition);
        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
        if (!Cools.isEmpty(orderByField)) {
            wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
        }
        if (!row.equals("")){
            wrapper.and()
                    .where("loc_no like '" +row +"%'");
        }
        Page<AgvLocDetl> agvLocDetlPage = agvLocDetlService.selectPage(new Page<>(curr, limit), wrapper);
        AgvWrkMast agvWrkMast = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>().eq("source_loc_no", param.get("loc_no")));
        String orderNo = null;
        if (agvWrkMast != null) {
            List<AgvWrkDetl> agvWrkDetls = agvWrkDetlService.selectByWrkNo(agvWrkMast.getWrkNo());
            if (!agvWrkDetls.isEmpty()) {
                orderNo = agvWrkDetls.get(0).getOrderNo();
            }
        }
        List<DocType> pakins = docTypeService.selectList(new EntityWrapper<DocType>().eq("pakout", 1));
        List<Long> docIds = new ArrayList<>();
        for (DocType pakin : pakins) {
@@ -126,10 +136,19 @@
            }
        }
        for (AgvLocDetl record : agvLocDetlPage.getRecords()) {
            OrderDetl orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>()
            OrderDetl orderDetl;
            if (!Cools.isEmpty(orderNo)) {
                orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>()
                        .eq("order_no", orderNo)
                    .eq("three_code", record.getThreeCode())
                    .eq("matnr", record.getMatnr())
                    .in("source",docIds));
            } else {
                orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>()
                        .eq("three_code", record.getThreeCode())
                        .eq("matnr", record.getMatnr())
                        .in("source", docIds));
            }
//            if (orderDetl.getAnfme() - orderDetl.getQty() > 0) {
//                record.setStock(orderDetl.getAnfme() - orderDetl.getQty());
//            } else {

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

@@ -18,12 +18,13 @@
    private OrderLogHandler orderLogHandler;
    @Autowired
    private OrderService orderService;

//
//    @Value("${erp.enable}")
//    private boolean isERP;
//
    //@Scheduled(cron = "0/10 * * * * ? ")
    @Scheduled(fixedDelay = 10000)
    @Scheduled(fixedDelay = 600000)
    private void execute(){
        List<Order> orders = orderService.selectToBeHistoryOrder();
        if (orders.isEmpty()) {

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

@@ -26,5 +26,11 @@
            log.error(returnT.getMsg());
        }
    }

    @Scheduled(cron = "* * 1 * * ? ")
    private void executeOrderLog() {
        ReturnT<String> returnT = overYearLogHandler.start2();
        if (!returnT.isSuccess()) {
            log.error(returnT.getMsg());
        }
    }
}

 src/main/java/com/zy/asrs/task/handler/OverYearLogHandler.java

@@ -34,4 +34,19 @@
        return SUCCESS;
    }

    @Transactional
    public ReturnT<String> start2() {
        try {
            // 删除半年以上的历史档
            jdbcTemplate.update("delete from man_order_log where dateadd(day,366,create_time) <= getdate();");
            jdbcTemplate.update("delete from man_order_detl_log where dateadd(day,366,create_time) <= getdate();");

        } catch (Exception e) {
            e.printStackTrace();
            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
            return FAIL.setMsg(e.getMessage());
        }
        return SUCCESS;
    }

}