代码优化

skyouc

3 天以前 668f158ac840aed2ccecb8cb746b89b77bf551a6

代码优化

 rsf-admin/src/page/task/TaskList.jsx

@@ -286,7 +286,7 @@
        }
    }
    return (
        (record.taskStatus == 1 || record.taskStatus == 101) && (record.taskType == 1 || record.taskType == 101 || record.taskType == 10 || record.taskType == 104) ?
        (record.taskStatus == 1 || record.taskStatus == 101) && (record.taskType == 1 || record.taskType == 101 || record.taskType == 10 || record.taskType == 103 || record.taskType == 11 ) ?
            <Button
                onClick={clickCancel}
                label="toolbar.cancel">

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

@@ -172,7 +172,7 @@
        task.setTaskCode(ruleCode)
                .setTaskStatus(TaskStsType.GENERATE_IN.id)
                .setTaskType(TaskType.TASK_TYPE_IN.type)
                .setWarehType(WarehType.WAREHOUSE_TYPE_CRN.id)
                .setWarehType(WarehType.WAREHOUSE_TYPE_CRN.val)
                .setTargLoc(targetLoc)
                .setBarcode(barcode)
                .setTargSite(targetSite)
@@ -194,7 +194,6 @@
                .eq(Loc::getCode, locCode)
                .set(Loc::getUseStatus, LocStsType.LOC_STS_TYPE_S.type)
                .set(Loc::getBarcode, barcode));

        if (!updated) {
            throw new CoolException("库位预约失败！！");
        }
@@ -204,9 +203,7 @@
     * 获取并验证组拖明细
     */
    private List<WaitPakinItem> getWaitPakinItems(Long pakinId) {
        List<WaitPakinItem> waitPakinItems = waitPakinItemService.list(
                new LambdaQueryWrapper<WaitPakinItem>().eq(WaitPakinItem::getPakinId, pakinId));

        List<WaitPakinItem> waitPakinItems = waitPakinItemService.list(new LambdaQueryWrapper<WaitPakinItem>().eq(WaitPakinItem::getPakinId, pakinId));
        if (waitPakinItems.isEmpty()) {
            throw new CoolException("数据错误：组拖明细不存在");
        }
@@ -361,18 +358,16 @@
        }
        LocTypeDto locTypeDto = new LocTypeDto(param);
        InTaskMsgDto dto = null;
        switch (warehouseArea.getType()) {
            case "CRN": //堆垛机
                dto = getLocNoCrn(deviceBind, warehouseArea.getId(), param.getSourceStaNo(), matnr, batch, locTypeDto, 0, param.getIoType());
                break;
            case "SXC": //四向库
                break;
            case "CTU": //ctu
                dto = getLocNoCtu(deviceBind, warehouseArea.getId(), param.getSourceStaNo(), matnr, batch, locTypeDto, 0, param.getIoType());
                break;
            default:
                dto = getLocNoCtu(deviceBind, warehouseArea.getId(), param.getSourceStaNo(), matnr, batch, locTypeDto, 0, param.getIoType());
                break;
        //根据立库类型获取获取库位
        if (warehouseArea.getType().equals(WarehType.WAREHOUSE_TYPE_CRN.val)) {
            //堆垛机
            dto = getLocNoCrn(deviceBind, warehouseArea.getId(), param.getSourceStaNo(), matnr, batch, locTypeDto, 0, param.getIoType());

        } else if (warehouseArea.getType().equals(WarehType.WAREHOUSE_TYPE_FOUR_DIRECTIONS.val)) {
            //四向库
        }  else {
            //CTU 库以及其它
            dto = getLocNoCtu(deviceBind, warehouseArea.getId(), param.getSourceStaNo(), matnr, batch, locTypeDto, 0, param.getIoType());
        }
        return dto;
    }
@@ -430,7 +425,6 @@
                            loc = shallowLoc;
                            channel = shallowLoc.getChannel();
                            break;

                        }
                    }
                }

 rsf-server/src/main/java/com/vincent/rsf/server/api/utils/LocUtils.java

@@ -12,15 +12,35 @@
import com.vincent.rsf.server.manager.enums.LocStsType;
import com.vincent.rsf.server.manager.enums.TaskType;
import com.vincent.rsf.server.manager.service.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;


import javax.annotation.PostConstruct;
import javax.annotation.RegEx;
import javax.annotation.Resource;
import java.util.List;

@Component
public class LocUtils {

    public static final Logger logger = LoggerFactory.getLogger(LocUtils.class);

    private static List<Integer>  doubleLocs;

    private static Boolean isDoubleDeep;

    @Autowired
    private SlaveProperties slavePropertie;

    @PostConstruct
    public void init() {
        doubleLocs = slavePropertie.getDoubleLocs();
        isDoubleDeep = slavePropertie.isDoubleDeep();
    }


    /**
     * 获取 浅库位对应的深库位号
@@ -113,7 +133,7 @@
      return LocNecessaryParametersDoubleExtension(curRow, crnNumber); //已完善
    }

    //经典双伸库位
    //经典双伸库位,  获取双深排
    public static int[] LocNecessaryParametersDoubleExtension( Integer curRow, Integer crnNumber) {
        int[] necessaryParameters = new int[]{0, 0, 0, 0};

@@ -192,6 +212,14 @@
        return dto.getLocType1().equals(Integer.parseInt(loc.getType()));
    }

    public static String  getCrnLoc() {
        SlaveProperties bean = SpringUtils.getBean(SlaveProperties.class);
        System.out.println(bean.getDoubleLocs());

        return null;
    }


    public static String zerofill(String msg, Integer count) {
        if (msg.length() == count) {
            return msg;

 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocItemController.java

@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.vincent.rsf.framework.common.Cools;
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.server.api.utils.LocUtils;
import com.vincent.rsf.server.common.constant.Constants;
import com.vincent.rsf.server.common.utils.ExcelUtil;
import com.vincent.rsf.server.common.annotation.OperationLog;
@@ -127,6 +128,7 @@
            return R.error("参数不能为空！！");
        }
        map.setType(Constants.TASK_TYPE_OUT_CHECK);

        return R.ok("任务生成成功").add(locItemService.generateTask(map));
    }


 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TaskController.java

@@ -141,7 +141,7 @@
        for (Task task : tasks) {
            if (StringUtils.isNotBlank(task.getParentId() + "")) {
                Task task1 = taskService.getById(task.getParentId());
                if (!Objects.isNull(task1)) {
                if (!Objects.isNull(task1) && task1.getTaskType().equals(TaskStsType.UPDATED_IN.id)) {
                    throw new CoolException("父任务：" + task1.getTaskCode() + "未执行完成！");
                }
            }

 rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Task.java

@@ -60,7 +60,7 @@
    private Long parentId;

    @ApiModelProperty("仓库类型")
    private Integer warehType;
    private String warehType;

    /**
     * 任务类型

 rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/WarehType.java

@@ -3,18 +3,18 @@
public enum WarehType {

    //仓库类型
    WAREHOUSE_TYPE_FOUR_DIRECTIONS("1", "四向库"),
    WAREHOUSE_TYPE_AGV("2", "AGV库"),
    WAREHOUSE_TYPE_CTU("3", "CTU库"),
    WAREHOUSE_TYPE_PLAT("4", "平库"),
    WAREHOUSE_TYPE_CRN("5", "堆垛机库"),
    WAREHOUSE_TYPE_FOUR_DIRECTIONS("SXC", "四向库"),
    WAREHOUSE_TYPE_AGV("AGV", "AGV库"),
    WAREHOUSE_TYPE_CTU("CTU", "CTU库"),
    WAREHOUSE_TYPE_PLAT("PLAT", "平库"),
    WAREHOUSE_TYPE_CRN("CRN", "堆垛机库"),
    ;

    public Integer id;
    public String val;
    public String desc;

    WarehType(String id, String desc) {
        this.id = Integer.parseInt(id);
    WarehType(String val, String desc) {
        this.val = val;
        this.desc = desc;
    }


 rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java

@@ -82,7 +82,6 @@
            throw new CoolException("参数不能为空！！");
        }
        /**获取组拖*/
//        List<Long> ids = pakins.stream().map(WaitPakin::getId).collect(Collectors.toList());
        List<WaitPakin> waitPakins = waitPakinService.list(new LambdaQueryWrapper<WaitPakin>()
                .in(WaitPakin::getId, pakins.getId())
                .eq(WaitPakin::getIoStatus, Short.parseShort(PakinIOStatus.PAKIN_IO_STATUS_DONE.val)));
@@ -105,7 +104,7 @@
            task.setTaskCode(ruleCode)
                    .setTaskStatus(TaskStsType.GENERATE_IN.id)
                    .setTaskType(TaskType.TASK_TYPE_IN.type)
                    .setWarehType(WarehType.WAREHOUSE_TYPE_AGV.id)
                    .setWarehType(WarehType.WAREHOUSE_TYPE_AGV.val)
                    .setTargLoc(targetLoc)
                    .setOrgSite(orgSta)
                    .setBarcode(pakin.getBarcode())
@@ -190,7 +189,7 @@
            task.setTaskCode(ruleCode)
                    .setTaskStatus(TaskStsType.COMPLETE_IN.id)
                    .setTaskType(TaskType.TASK_TYPE_IN.type)
                    .setWarehType(WarehType.WAREHOUSE_TYPE_PLAT.id)
                    .setWarehType(WarehType.WAREHOUSE_TYPE_PLAT.val)
                    .setTargLoc(targetLoc)
                    .setBarcode(pakin.getBarcode())
                    .setCreateBy(loginUserId)
@@ -593,7 +592,7 @@
                    throw new CoolException("更新库位状态失败！！");
                }
            }
            if (!Objects.isNull(task.getWarehType()) && task.getWarehType().equals(WarehType.WAREHOUSE_TYPE_AGV.id)) {
            if (!Objects.isNull(task.getWarehType()) && task.getWarehType().equals(WarehType.WAREHOUSE_TYPE_AGV.val)) {
                BasStation basStation = null;
                if (task.getTaskType().equals(TaskType.TASK_TYPE_IN.type) || task.getTaskType().equals(TaskType.TASK_TYPE_EMPITY_IN.type)) {
                    basStation = basStationService.getOne(new LambdaQueryWrapper<BasStation>()