From 85e577295d32ce9e7fa17c885d6b65233ad7a326 Mon Sep 17 00:00:00 2001
From: 刘小明 <liuxm_a@163.com>
Date: 星期二, 30 七月 2024 16:42:07 +0800
Subject: [PATCH] 规范格式,清理警告
---
pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/workOrder/WorkOrderSv.java | 34 +++++++++++++++++++++++++---------
1 files changed, 25 insertions(+), 9 deletions(-)
diff --git a/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/workOrder/WorkOrderSv.java b/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/workOrder/WorkOrderSv.java
index 03fe92e..f25ca7e 100644
--- a/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/workOrder/WorkOrderSv.java
+++ b/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/workOrder/WorkOrderSv.java
@@ -3,6 +3,7 @@
import com.alibaba.excel.util.StringUtils;
import com.dy.pmsGlobal.daoBa.BaUserMapper;
import com.dy.pmsGlobal.daoPlt.PltProductMapper;
+import com.dy.pmsGlobal.daoPlt.PltProductionLineMapper;
import com.dy.pmsGlobal.daoPlt.PltStationMapper;
import com.dy.pmsGlobal.daoPr.PrAssemblyPlanMapper;
import com.dy.pmsGlobal.daoPr.PrProductionNodeMapper;
@@ -10,6 +11,7 @@
import com.dy.pmsGlobal.daoSta.StaAssemblyWorkLastMapper;
import com.dy.pmsGlobal.pojoBa.BaUser;
import com.dy.pmsGlobal.pojoPlt.PltProduct;
+import com.dy.pmsGlobal.pojoPlt.PltProductionLine;
import com.dy.pmsGlobal.pojoPlt.PltStation;
import com.dy.pmsGlobal.pojoPr.PrAssemblyPlan;
import com.dy.pmsGlobal.pojoPr.PrProductionNode;
@@ -39,8 +41,8 @@
private static final String WORK_TYPE_INSPECTION = "3";
private static final String WORK_TYPE_REPAIR = "4";
- private static final String USER_PREFIX = "101";
- private static final String STATION_PREFIX = "103";
+// private static final String USER_PREFIX = "101";
+// private static final String STATION_PREFIX = "103";
private PrAssemblyPlanMapper assemblyDao;
private BaUserMapper baUserDao;
@@ -49,6 +51,7 @@
private StaAssemblyWorkHistoryMapper assemblyWorkHistoryDao;
private PrProductionNodeMapper nodeDao;
private PltProductMapper productDao;
+ private PltProductionLineMapper lineDao;
@Autowired
public void setAssemblyDao(PrAssemblyPlanMapper assemblyDao) {
@@ -85,6 +88,10 @@
this.productDao = productDao;
}
+ @Autowired
+ public void setLineDao(PltProductionLineMapper lineDao) {
+ this.lineDao = lineDao;
+ }
public BaUser getUserInfo(String id) {
Long userId = null;
@@ -92,7 +99,7 @@
throw new RuntimeException("鍛樺伐缂栫爜涓嶈兘涓虹┖");
}
//鐢ㄦ埛101
- if (id.startsWith(USER_PREFIX)) {
+ if (id.startsWith(QrCodeConstant.TypeWorker)) {
userId = Long.parseLong(id.toString().substring(3));
} else {
userId = Long.parseLong(id.toString());
@@ -113,7 +120,7 @@
throw new RuntimeException("宸ョ珯缂栫爜涓嶈兘涓虹┖");
}
//宸ョ珯103
- if (id.startsWith(STATION_PREFIX)) {
+ if (id.startsWith(QrCodeConstant.TypeStation)) {
stationId = Long.parseLong(id.toString().substring(3));
} else {
stationId = Long.parseLong(id.toString());
@@ -123,6 +130,13 @@
throw new RuntimeException("宸ョ珯缂栫爜:" + stationId + "涓嶅湪绯荤粺涓�,璇峰厛缁存姢宸ョ珯淇℃伅");
} else if (stationInfo.getDisabled()) {
throw new RuntimeException("宸ョ珯(" + stationInfo.getName() + ")缂栫爜:" + stationId + "鍦ㄧ郴缁熷凡绂佺敤,璇峰厛鍚敤宸ョ珯");
+ }
+ //妫�鏌ョ嚎浣撴槸鍚﹁绂佺敤
+ PltProductionLine lineInfo = lineDao.selectByPrimaryKey(stationInfo.getLineId());
+ if (lineInfo == null ) {
+ throw new RuntimeException("宸ョ珯(" + stationInfo.getName() + ")缂栫爜:" + stationId + "鎵�鍦ㄧ嚎浣撶紪鐮�:" + lineInfo.getId() + "鍦ㄧ郴缁熶笉瀛樺湪,璇峰厛鎵剧鐞嗕汉鍛樻鏌�");
+ }else if(lineInfo.getDisabled()){
+ throw new RuntimeException("宸ョ珯(" + stationInfo.getName() + ")缂栫爜:" + stationId + "鎵�鍦ㄧ嚎浣撶紪鐮�:" + lineInfo.getName() + "鍦ㄧ郴缁熷凡绂佺敤,璇峰厛鍚敤绾夸綋");
}
return stationInfo;
}
@@ -135,12 +149,12 @@
throw new RuntimeException("宸ョ珯缂栫爜鎴栧憳宸ョ紪鐮佸潎涓嶈兘涓虹┖,璇锋鏌�");
}
//宸ョ珯103
- if (vo.getStationId().startsWith(USER_PREFIX)) {
+ if (vo.getStationId().startsWith(QrCodeConstant.TypeWorker)) {
userInfo = getUserInfo(vo.getStationId());
} else {
stationInfo = getStationInfo(vo.getStationId());
}
- if (vo.getUserId().startsWith(STATION_PREFIX)) {
+ if (vo.getUserId().startsWith(QrCodeConstant.TypeStation)) {
stationInfo = getStationInfo(vo.getUserId());
} else {
userInfo = getUserInfo(vo.getUserId());
@@ -228,9 +242,11 @@
}
return result;
} else {
+ List<PrProductionNode> nodeInfo = assyPlan.getProcess().getNodes().stream()
+ .filter(node -> node.id.equals(result.getNodeId())).collect(Collectors.toList());
result.setPlanName(assyPlan.getName());
result.setProcessName(assyPlan.getProcessName());
- result.setNodeName(assyPlan.getProcess().getNodes().get(0).getContent());
+ result.setNodeName(nodeInfo.get(0).getContent());
//鎵惧埌瀵瑰簲鐨勪骇鍝佷俊鎭�
PltProduct product = productDao.selectByPrimaryKey(assyPlan.getProId());
if (product != null) {
@@ -314,7 +330,7 @@
.filter(node -> node.id.equals(vo.getNodeId())).collect(Collectors.toList());
result.setPlanName(assyPlan.getName());
result.setProcessName(assyPlan.getProcessName());
- result.setNodeName(assyPlan.getProcess().getNodes().get(0).getContent());
+ result.setNodeName(nodeInfo.get(0).getContent());
//鎵惧埌瀵瑰簲鐨勪骇鍝佷俊鎭�
PltProduct product = productDao.selectByPrimaryKey(assyPlan.getProId());
if (product == null) {
@@ -396,7 +412,7 @@
if (workLast == null) {
throw new RuntimeException("绯荤粺涓病鏈夊綋鍓嶇櫥褰曚俊鎭�,璇锋鏌ユ垨閲嶆柊鐧诲綍");
}
- if ((!StringUtils.isBlank(assistant)) && assistant.startsWith(USER_PREFIX)) {
+ if ((!StringUtils.isBlank(assistant)) && assistant.startsWith(QrCodeConstant.TypeWorker)) {
assistant = assistant.substring(3);
}
if (!StringUtils.isBlank(workLast.getAssistants())) {
--
Gitblit v1.8.0