优化固化流程

yangys

2025-09-20 675d66f1cbc7e92cc0fb4897664ee3a851072334

 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) {