From 3baca21e0e6563f8379359ef2ba78c224eb4bc80 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期二, 23 九月 2025 22:45:51 +0800
Subject: [PATCH] 修复审批表，确认表内容
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/thirdpart/controller/MesController.java | 21 ++++++++++++++++-----
1 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/thirdpart/controller/MesController.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/thirdpart/controller/MesController.java
index af1cce3..59cab57 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/thirdpart/controller/MesController.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/thirdpart/controller/MesController.java
@@ -6,9 +6,11 @@
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.FlowContants;
+import org.springblade.mdm.flow.constants.FlowConstant;
import org.springblade.mdm.flow.entity.TaskDispatch;
import org.springblade.mdm.flow.excution.StartDispatcher;
import org.springblade.mdm.flow.service.TaskDispatchService;
@@ -37,6 +39,8 @@
private TaskDispatchService taskDispatchService;
@Autowired
private QinzheFgbService qinzheFgbService;
+ @Autowired
+ private MachineService machineService;
/**
* 鏂板
*/
@@ -44,6 +48,7 @@
@Operation(summary = "鎺ユ敹MES浠诲姟", description = "鎺ユ敹MES浠诲姟")
public R<Void> newTask(@RequestBody MesTaskVO mesTaskVO) {
try {
+ log.info("鎺ユ敹MES浠诲姟锛屽弬鏁�:{}", mesTaskVO);
TaskAssignVO startVO = this.toTaskAssignVO(mesTaskVO);
List<String> errors = checkTaskData(startVO);
@@ -129,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) {
@@ -144,7 +154,7 @@
}
taskAssignVO.setTitle(taskAssignVO.getDrawingNo()+"-"+taskAssignVO.getProcessNo()+"-"+taskAssignVO.getProcessEdition()+"璁″垝浠诲姟");
- taskAssignVO.setIsTempFlow(FlowContants.N);
+ taskAssignVO.setIsTempFlow(FlowConstant.N);
return taskAssignVO;
}
@@ -192,12 +202,13 @@
if(StringUtils.isBlank(finishTaskVO.getOperationId())){
errorList.add("宸ュ簭鍞竴鐮佷笉鑳戒负绌�");
}
+ /*
if(StringUtils.isBlank(finishTaskVO.getInspector())){
errorList.add("妫�楠屽憳涓嶈兘涓虹┖");
}
- if(finishTaskVO.getAcruslEndEime() == null){
+ if(finishTaskVO.getAcruslEndTime() == null){
errorList.add("妫�楠屽弽棣堟椂闂翠笉鑳戒负绌�");
- }
+ }*/
return errorList;
}
--
Gitblit v1.9.3