From edecbd9cb1b31ded46b8592634780d999db6b6f0 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期一, 22 九月 2025 14:19:21 +0800
Subject: [PATCH] 文件下发，回传文件处理的查看下载
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/thirdpart/controller/MesController.java | 89 ++++++++++++++++++++++++++++++++++++--------
1 files changed, 73 insertions(+), 16 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 77b6682..39531b9 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
@@ -5,7 +5,12 @@
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springblade.core.tool.api.R;
-import org.springblade.mdm.flow.constants.FlowContants;
+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;
import org.springblade.mdm.flow.entity.TaskDispatch;
import org.springblade.mdm.flow.excution.StartDispatcher;
import org.springblade.mdm.flow.service.TaskDispatchService;
@@ -14,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.*;
@@ -33,13 +37,18 @@
private StartDispatcher dispatcher;
@Autowired
private TaskDispatchService taskDispatchService;
+ @Autowired
+ private QinzheFgbService qinzheFgbService;
+ @Autowired
+ private MachineService machineService;
/**
* 鏂板
*/
- @PostMapping("/new-mes-task")
+ @PostMapping("/mes-new-task")
@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);
@@ -51,7 +60,7 @@
TaskDispatch dispatch = mesTaskService.saveTask(startVO);
- log.error("MES浠诲姟淇濆瓨鎴愬姛");
+ log.info("MES浠诲姟淇濆瓨鎴愬姛");
if(!dispatch.isDuplicateTask()){
try {
FlowStartResult result = dispatcher.start(startVO);
@@ -70,7 +79,7 @@
}
return R.success();
}catch (Exception e) {
- log.error("鎺ユ敹mes浠诲姟澶辫触", e);;
+ log.error("鎺ユ敹mes浠诲姟澶辫触", e);
return R.fail(e.getMessage());
}
@@ -84,7 +93,7 @@
/**
* 楠岃瘉鏁版嵁
* @param startVO
- * @return
+ * @return 绮楀憰淇℃伅鍒楄〃
*/
private List<String> checkTaskData(TaskAssignVO startVO) {
List<String> errorList = new ArrayList<>();
@@ -102,25 +111,68 @@
if(StringUtils.isBlank(startVO.getMachineCode())){
errorList.add("璁惧缂栫爜涓嶈兘涓虹┖");
}
- //TODO 宸ュ簭鍚嶇О 鎴戜滑鏄繀濉紝
+
+ if(StringUtils.isBlank(startVO.getProcessName())){
+ errorList.add("宸ュ簭鍚嶇О涓嶈兘涓虹┖");
+ }
return errorList;
}
/**
* 浠巑esvo杞崲涓哄唴閮ㄤ换鍔″垎娲緑o
- * @param mesTaskVO
- * @return
+ * @param mesTaskVO mes鍙戦�佹暟鎹甐O
+ * @return mdm鍐呴儴鐨勬淳宸O
*/
TaskAssignVO toTaskAssignVO(MesTaskVO mesTaskVO) {
TaskAssignVO taskAssignVO = new TaskAssignVO();
- BeanUtils.copyProperties(mesTaskVO, taskAssignVO);
+
+ taskAssignVO.setOrderNumber(mesTaskVO.getOrderNumber());
+ taskAssignVO.setDrawingNo(mesTaskVO.getDrawingCode());
+ taskAssignVO.setDrawingNoEdition(mesTaskVO.getDrawingVersion());
+ taskAssignVO.setProcessNo(mesTaskVO.getOperationCode());
+ taskAssignVO.setProcessName(mesTaskVO.getOperationName());
+ taskAssignVO.setCraftEdition(mesTaskVO.getRoutingVersion());
+ taskAssignVO.setProcessEdition(mesTaskVO.getOperationVersion());
+ taskAssignVO.setOperationId(mesTaskVO.getOperationId());
+
+ 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){
+ log.error("鎺ユ敹mes鏁版嵁锛岃鍒掑紑濮嬫椂闂磋浆鎹㈤敊璇�");
+ }
taskAssignVO.setTitle(taskAssignVO.getDrawingNo()+"-"+taskAssignVO.getProcessNo()+"-"+taskAssignVO.getProcessEdition()+"璁″垝浠诲姟");
- taskAssignVO.setIsTempFlow(FlowContants.N);
+ taskAssignVO.setIsTempFlow(FlowConstant.N);
return taskAssignVO;
}
- @PostMapping("/finish-task")
+ /**
+ * 鏌ヨ浜у搧鍨嬪彿
+ * @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")
@Operation(summary = "MES浠诲姟瀹屾垚鎺ㄩ��", description = "MES浠诲姟瀹屾垚鎺ㄩ��")
public R<Void> finishTask(@RequestBody MesTaskFinishVO finishTaskVO) {
log.info("鏀跺埌mes浠诲姟瀹屾垚鎺ㄩ��:{}",finishTaskVO);
@@ -134,21 +186,26 @@
mesTaskService.finishTask(finishTaskVO);
return R.success();
}catch(Exception e){
- log.error("鎺ユ敹MES宸ュ簭瀹屾垚淇℃伅澶辫触", e);;
+ log.error("鎺ユ敹MES宸ュ簭瀹屾垚淇℃伅澶辫触", e);
return R.fail("鍐呴儴閿欒");
}
}
+ /**
+ * MES浜屾鎺ㄩ�佹暟鎹鏌�
+ * @param finishTaskVO 浜屾鎺ㄩ�佹暟鎹�
+ * @return 閿欒淇℃伅鍒楄〃
+ */
private List<String> checkFinishTaskData(MesTaskFinishVO finishTaskVO) {
List<String> errorList = new ArrayList<>();
- if(StringUtils.isBlank(finishTaskVO.getMesTaskId())){
- errorList.add("鍞竴鏍囪瘑涓嶈兘涓虹┖");
+ if(StringUtils.isBlank(finishTaskVO.getOperationId())){
+ errorList.add("宸ュ簭鍞竴鐮佷笉鑳戒负绌�");
}
if(StringUtils.isBlank(finishTaskVO.getInspector())){
errorList.add("妫�楠屽憳涓嶈兘涓虹┖");
}
- if(finishTaskVO.getCheckTime() == null){
+ if(finishTaskVO.getAcruslEndEime() == null){
errorList.add("妫�楠屽弽棣堟椂闂翠笉鑳戒负绌�");
}
return errorList;
--
Gitblit v1.9.3