优化固化流程

yangys

2025-09-20 675d66f1cbc7e92cc0fb4897664ee3a851072334

优化固化流程

 blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/service/MachineService.java

@@ -355,14 +355,25 @@
        if(StringUtils.isBlank(sendPathLine)){
            return null;
        }
        //去掉首位括号，排除发那科机床注释
        String sendPath = escapeSqlWildcard(StringUtils.trim(StringUtils.removeEnd(StringUtils.removeStart(sendPathLine,"("),")")));
        //去掉末尾括号(发那科) ,末尾路径分隔符
        String tempPath = StringUtils.removeEnd(StringUtils.removeEnd(StringUtils.removeEnd(sendPathLine,")"),"/"),"\\");
        //去掉前2位可能的注释(*-)。
        String sendPath = escapeSqlWildcard(StringUtils.trim(StringUtils.substring(tempPath,2)));

        List<Machine> machines = lambdaQuery().eq(Machine::getStatus,Machine.STATUS_ENABLE).likeLeft(Machine::getProgSendDir,sendPath).list();
        List<Machine> machines = lambdaQuery().eq(Machine::getStatus,Machine.STATUS_ENABLE).like(Machine::getProgSendDir,sendPath).list();
        if(machines.isEmpty()){
            return null;
        }else{
            return machines.get(0);
        }
    }

    /**
     * 根据设备编号查询机床
     * @param equipmentCode 设备编号
     * @return 机床对象
     */
    public Machine getByEquipmentCode(String equipmentCode) {
        return this.lambdaQuery().eq(Machine::getEquipmentCode, equipmentCode).one();
    }
}

 blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/entity/TaskDispatch.java

@@ -37,10 +37,14 @@
    public static final int STATUS_EXCEPTION = 5;

    /**
     * 设备编号
     * 机床编号
     */
    private String machineCode;
    /**
     * 设备编号（mes派发的任务会传递）
     */
    private String equipmentCode;
    /**
     * 工序名称，如“精铣”
     */
    private String processName;

 blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/vo/TaskAssignVO.java

@@ -28,8 +28,10 @@
    @Schema(description = "工艺版次")
    private String craftEdition;

    @Schema(description = "设备编号")
    @Schema(description = "机床编号")
    private String machineCode;
    @Schema(description = "设备编号(mes接口传递)")
    private String equipmentCode;

    @Schema(description = "设备型号")
    private String machineMode;

 blade-service/blade-mdm/src/main/java/org/springblade/mdm/thirdpart/controller/MesController.java

@@ -6,6 +6,8 @@
import org.apache.commons.lang3.StringUtils;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.mdm.basesetting.machine.entity.Machine;
import org.springblade.mdm.basesetting.machine.service.MachineService;
import org.springblade.mdm.basesetting.producedivision.entity.QinzheFgb;
import org.springblade.mdm.basesetting.producedivision.service.QinzheFgbService;
import org.springblade.mdm.flow.constants.FlowConstant;
@@ -37,6 +39,8 @@
    private TaskDispatchService taskDispatchService;
    @Autowired
    private QinzheFgbService qinzheFgbService;
    @Autowired
    private MachineService machineService;
    /**
     * 新增
     */
@@ -130,7 +134,12 @@
        taskAssignVO.setCraftEdition(mesTaskVO.getRoutingVersion());
        taskAssignVO.setProcessEdition(mesTaskVO.getOperationVersion());
        taskAssignVO.setOperationId(mesTaskVO.getOperationId());
        taskAssignVO.setMachineCode(mesTaskVO.getEquipmentCode());

        taskAssignVO.setEquipmentCode(mesTaskVO.getEquipmentCode());
        Machine machine = this.machineService.getByEquipmentCode(mesTaskVO.getEquipmentCode());
        if(machine != null) {
            taskAssignVO.setMachineCode(machine.getCode());
        }
        taskAssignVO.setMachineMode(mesTaskVO.getEquipmentModel());
        taskAssignVO.setDispatchBy(mesTaskVO.getDspatchBy());
        if (mesTaskVO.getProductModel() != null) {