WMS功能完善

pang.jiabao

2026-01-19 78b8f5141aa11bfa0f94361407ed43362c8852ce

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

@@ -5,6 +5,7 @@
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
import com.zy.asrs.enums.LocStsType;
import com.zy.asrs.mapper.BasDevpMapper;
import com.zy.asrs.service.*;
import com.zy.asrs.service.impl.BasStationServiceImpl;
import com.zy.asrs.service.impl.LocCacheServiceImpl;
@@ -19,6 +20,7 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.interceptor.TransactionAspectSupport;

import javax.annotation.Resource;
import java.util.*;
import java.util.stream.Collectors;

@@ -56,6 +58,9 @@
    private TaskDetlService taskDetlService;
    @Autowired
    private BasStationServiceImpl basStationService;

    @Resource
    private BasDevpMapper basDevpMapper;

    public ReturnT<String> start(WrkMast wrkMast) {
        // 4.入库完成
@@ -436,6 +441,11 @@
                default:
                    break;
            }

            // 出入库任务控制 入库暂存-1
            if(wrkMast.getSourceStaNo().equals("205")) {
                basDevpMapper.updateInQty(Integer.parseInt(wrkMast.getSourceStaNo()),2);
            }
            // 修改工作主档状态
            wrkMast.setWrkSts(5L);
            wrkMast.setModiTime(now);
@@ -585,6 +595,12 @@
        return SUCCESS;
    }

    @Resource
    private TaskLogService taskLogService;

    @Resource
    private TaskDetlLogService taskDetlLogService;

    /**
     * @author Ryan
     * @date 2025/9/23
@@ -592,15 +608,19 @@
     * @version 1.0
     */
    @Transactional(rollbackFor = Exception.class)
    public ReturnT<String> AgvStart(Task task) {
        // 4.入库完成
        if (task.getWrkSts() == 4) {
            return agvDoIn(task);
            // 14.出库完成
        } else if (task.getWrkSts() == 14) {
            return agvDoOut(task);
        }
        return SUCCESS;
    public void AgvStart(Task task) {

        // 保存工作主档历史档
        taskLogService.save(task.getWrkNo());

        // 删除工作主档
        taskService.deleteById(task.getId());

        // 保存工作明细档历史档
        taskDetlLogService.save(task.getWrkNo());

        // 删除工作档明细
        taskDetlService.delete(new EntityWrapper<TaskDetl>().eq("wrk_no", task.getWrkNo()));
    }