From a0f3e98fdd9472af3c78b42423a7e3fa6fb92eba Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期六, 13 九月 2025 14:28:55 +0800
Subject: [PATCH] 清理无用老代码
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/thirdpart/controller/MesController.java | 29 +++++++++++++++++++++++++----
1 files changed, 25 insertions(+), 4 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..af1cce3 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,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.producedivision.entity.QinzheFgb;
+import org.springblade.mdm.basesetting.producedivision.service.QinzheFgbService;
import org.springblade.mdm.flow.constants.FlowContants;
import org.springblade.mdm.flow.entity.TaskDispatch;
import org.springblade.mdm.flow.excution.StartDispatcher;
@@ -15,7 +17,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 +35,8 @@
private StartDispatcher dispatcher;
@Autowired
private TaskDispatchService taskDispatchService;
+ @Autowired
+ private QinzheFgbService qinzheFgbService;
/**
* 鏂板
*/
@@ -71,7 +74,7 @@
}
return R.success();
}catch (Exception e) {
- log.error("鎺ユ敹mes浠诲姟澶辫触", e);;
+ log.error("鎺ユ敹mes浠诲姟澶辫触", e);
return R.fail(e.getMessage());
}
@@ -129,7 +132,11 @@
taskAssignVO.setMachineCode(mesTaskVO.getEquipmentCode());
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){
@@ -139,6 +146,20 @@
taskAssignVO.setTitle(taskAssignVO.getDrawingNo()+"-"+taskAssignVO.getProcessNo()+"-"+taskAssignVO.getProcessEdition()+"璁″垝浠诲姟");
taskAssignVO.setIsTempFlow(FlowContants.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 +176,7 @@
mesTaskService.finishTask(finishTaskVO);
return R.success();
}catch(Exception e){
- log.error("鎺ユ敹MES宸ュ簭瀹屾垚淇℃伅澶辫触", e);;
+ log.error("鎺ユ敹MES宸ュ簭瀹屾垚淇℃伅澶辫触", e);
return R.fail("鍐呴儴閿欒");
}
--
Gitblit v1.9.3