#问题修复

zjj

3 天以前 00298a6bbcf433f244df08037dad5470635934a1

 rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/WcsServiceImpl.java

@@ -7,17 +7,13 @@
import com.vincent.rsf.server.api.entity.dto.InTaskMsgDto;
import com.vincent.rsf.server.api.entity.dto.LocTypeDto;
import com.vincent.rsf.server.api.controller.params.TaskInParam;
import com.vincent.rsf.server.api.entity.enums.OrderType;
import com.vincent.rsf.server.api.entity.enums.TaskStsType;
import com.vincent.rsf.server.api.entity.enums.TaskType;
import com.vincent.rsf.server.manager.enums.*;
import com.vincent.rsf.server.api.service.WcsService;
import com.vincent.rsf.server.api.utils.LocUtils;
import com.vincent.rsf.server.api.utils.SlaveProperties;
import com.vincent.rsf.server.manager.entity.*;
import com.vincent.rsf.server.manager.enums.PakinIOStatus;
import com.vincent.rsf.server.manager.service.*;
import com.vincent.rsf.server.manager.service.impl.LocServiceImpl;
import com.vincent.rsf.server.manager.utils.LocManageUtil;
import com.vincent.rsf.server.system.constant.SerialRuleCode;
import com.vincent.rsf.server.system.enums.LocStsType;
import com.vincent.rsf.server.system.utils.SerialRuleUtils;
@@ -27,7 +23,6 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;
@@ -54,10 +49,41 @@
    private TaskItemService taskItemService;
    @Autowired
    private WaitPakinItemService waitPakinItemService;
    @Autowired
    private BasStationService basStationService;


    @Override
    @Transactional(rollbackFor = Exception.class)
    public InTaskMsgDto createInTask(TaskInParam param, Long loginUserId) {
    public void agvTaskPickUpComplete(TaskInParam param) {
        Task task = taskService.getOne(new LambdaQueryWrapper<Task>()
                .eq(Task::getBarcode, param.getBarcode())
        );
        if (null == task) {
            throw new CoolException("未找到任务信息");
        }
//        if (!task.getTaskStatus().equals(TaskStsType.WCS_CONVEYOR_START.id)){
//            throw new CoolException("任务状态有误");
//        }
        BasStation basStation = basStationService.getOne(new LambdaQueryWrapper<BasStation>()
                .eq(BasStation::getStationName, param.getSourceStaNo())
        );
        if (null == basStation) {
            throw new CoolException("未找到站点信息");
        }
        task.setTaskStatus(TaskStsType.WCS_EXECUTE_OUT_TOTE_LOAD.id);
        taskService.updateById(task);

        basStation.setUseStatus(StaUseStatusType.TYPE_O.type);
        basStation.setBarcode(null);
        basStationService.updateById(basStation);


    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public InTaskMsgDto createInTask(TaskInParam param) {
        // 获取库位号
        InTaskMsgDto locNo = getLocNo(param);

@@ -72,7 +98,7 @@

        // 创建并保存任务
        Task task = createTask(ruleCode, locNo.getLocNo(), waitPakin.getBarcode(),
                deviceSite.getDeviceSite(), param.getSourceStaNo().toString(), loginUserId);
                deviceSite.getDeviceSite(), param.getSourceStaNo().toString(), param.getUser());

        // 更新库位状态
        updateLocStatus(task.getTargLoc(), waitPakin.getBarcode());
@@ -81,15 +107,17 @@
        List<WaitPakinItem> waitPakinItems = getWaitPakinItems(waitPakin.getId());

        // 创建并保存任务明细
        saveTaskItems(task.getId(), waitPakinItems, loginUserId);
        saveTaskItems(task.getId(), waitPakinItems, param.getUser());

        // 更新组托状态
        updateWaitPakinStatus(param.getBarcode(), loginUserId);
        updateWaitPakinStatus(param.getBarcode(), param.getUser());

        // 设置工作单号并返回
        locNo.setWorkNo(ruleCode);
        return locNo;
    }



    /**
     * 验证设备站点
@@ -139,6 +167,7 @@
        task.setTaskCode(ruleCode)
                .setTaskStatus(TaskStsType.GENERATE_IN.id.shortValue())
                .setTaskType(TaskType.TASK_TYPE_IN.type.shortValue())
                .setWarehType(WarehType.WAREHOUSE_TYPE_CRN.id)
                .setTargLoc(targetLoc)
                .setBarcode(barcode)
                .setTargSite(targetSite)
@@ -188,7 +217,7 @@
            BeanUtils.copyProperties(item, taskItem);

            return taskItem.setTaskId(taskId)
                    .setOrderType(OrderType.ORDER_RECEIPT.type)
                    .setOrderType(OrderType.ORDER_IN.type)
                    .setSource(item.getId())
                    .setTrackCode(item.getTrackCode())
                    .setCreateBy(loginUserId)
@@ -575,9 +604,9 @@
                .eq(Loc::getAreaId, area)
                .eq(Loc::getUseStatus, LocStsType.LOC_STS_TYPE_O.type)
                .eq(Loc::getType, locTypeDto.getLocType1())
                .orderByAsc(Loc::getRow)
                .orderByAsc(Loc::getCol)
                .orderByAsc(Loc::getLev)
                .orderByAsc(Loc::getCol)
                .orderByAsc(Loc::getRow)
        );
        for (Loc loc2 :loc1){
            if (!LocUtils.locMoveCheckLocTypeComplete(loc2, locTypeDto)) {