From 4b397a21eb979617f4fe9ff9fc1edb7a1be72900 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期一, 29 九月 2025 17:45:29 +0800
Subject: [PATCH] 工控网涉密网联调
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/thirdpart/controller/MesController.java | 50 +++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 41 insertions(+), 9 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 4bde6e8..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,7 +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.flow.constants.FlowContants;
+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;
import org.springblade.mdm.flow.entity.TaskDispatch;
import org.springblade.mdm.flow.excution.StartDispatcher;
import org.springblade.mdm.flow.service.TaskDispatchService;
@@ -15,7 +19,6 @@
import org.springblade.mdm.thirdpart.service.MesTaskService;
import org.springblade.mdm.thirdpart.vo.MesTaskFinishVO;
import org.springblade.mdm.thirdpart.vo.MesTaskVO;
-import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -34,6 +37,10 @@
private StartDispatcher dispatcher;
@Autowired
private TaskDispatchService taskDispatchService;
+ @Autowired
+ private QinzheFgbService qinzheFgbService;
+ @Autowired
+ private MachineService machineService;
/**
* 鏂板
*/
@@ -41,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);
@@ -71,7 +79,7 @@
}
return R.success();
}catch (Exception e) {
- log.error("鎺ユ敹mes浠诲姟澶辫触", e);;
+ log.error("鎺ユ敹mes浠诲姟澶辫触", e);
return R.fail(e.getMessage());
}
@@ -126,10 +134,19 @@
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) {
+ taskAssignVO.setProductModel(mesTaskVO.getProductModel());
+ }else{
+ taskAssignVO.setProductModel(this.queryProductModel(mesTaskVO.getDrawingCode()));
+ }
try {
taskAssignVO.setPlanStartTime(DateUtil.fromDate(DateUtil.parse(mesTaskVO.getPlanStartTime(),"yyyy-MM-dd HH:mm:ss")).toLocalDate());
}catch(Exception e){
@@ -137,8 +154,22 @@
}
taskAssignVO.setTitle(taskAssignVO.getDrawingNo()+"-"+taskAssignVO.getProcessNo()+"-"+taskAssignVO.getProcessEdition()+"璁″垝浠诲姟");
- taskAssignVO.setIsTempFlow(FlowContants.N);
+ taskAssignVO.setIsTempFlow(FlowConstant.N);
return taskAssignVO;
+ }
+
+ /**
+ * 鏌ヨ浜у搧鍨嬪彿
+ * @param drawingNo 鍥惧彿
+ * @return 浜у搧鍨嬪彿
+ */
+ String queryProductModel(String drawingNo){
+ QinzheFgb fgb = qinzheFgbService.getByLjh(drawingNo);
+ if(fgb!= null){
+ return fgb.getCph();
+ }else{
+ return null;
+ }
}
@PostMapping("/mes-finish-task")
@@ -155,7 +186,7 @@
mesTaskService.finishTask(finishTaskVO);
return R.success();
}catch(Exception e){
- log.error("鎺ユ敹MES宸ュ簭瀹屾垚淇℃伅澶辫触", e);;
+ log.error("鎺ユ敹MES宸ュ簭瀹屾垚淇℃伅澶辫触", e);
return R.fail("鍐呴儴閿欒");
}
@@ -171,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