From ee673c3e71b28598d45074a9df2a93ea057b6b65 Mon Sep 17 00:00:00 2001
From: Fancy <Fancy.fx@outlook.com>
Date: 星期一, 24 六月 2024 14:41:29 +0800
Subject: [PATCH] debug edit
---
pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/workOrder/WorkOrderSv.java | 133 ++++++++++++++++++++++++++++----------------
1 files changed, 85 insertions(+), 48 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 1cc15ce..2168a9a 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
@@ -5,9 +5,6 @@
import com.dy.pmsGlobal.daoOth.OthFileMapper;
import com.dy.pmsGlobal.daoPlt.PltStationMapper;
import com.dy.pmsGlobal.daoPr.PrAssemblyPlanMapper;
-import com.dy.pmsGlobal.daoPr.PrProductionNodeMapper;
-import com.dy.pmsGlobal.daoPr.PrProductionProcessMapper;
-import com.dy.pmsGlobal.daoPr.PrWorkingInstructionMapper;
import com.dy.pmsGlobal.daoSta.StaAssemblyWorkLastMapper;
import com.dy.pmsGlobal.dyFile.FileOperate;
import com.dy.pmsGlobal.dyFile.FileRestVo;
@@ -15,14 +12,20 @@
import com.dy.pmsGlobal.pojoOth.OthFile;
import com.dy.pmsGlobal.pojoPlt.PltStation;
import com.dy.pmsGlobal.pojoPr.PrAssemblyPlan;
+import com.dy.pmsGlobal.pojoPr.PrProductionNode;
import com.dy.pmsGlobal.pojoPr.PrWorkingInstruction;
import com.dy.pmsGlobal.pojoSta.StaAssemblyWorkLast;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import java.util.Date;
import java.util.List;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.stream.Collectors;
@Slf4j
@Service
@@ -97,60 +100,94 @@
}else if(stationInfo.getDisabled()){
throw new RuntimeException("宸ョ珯("+stationInfo.getName()+")缂栫爜:"+ stationId +"鍦ㄧ郴缁熷凡绂佺敤,璇峰厛鍚敤宸ョ珯");
}
- //妫�鏌ヨ〃涓璼tationId鏄惁宸茬粡瀛樺湪
- StaAssemblyWorkLast param = new StaAssemblyWorkLast();
- param.setStationId(stationId);
- param.setStatus(1);
- List<StaAssemblyWorkLast> userStationList = assemblyWorkLastDao.selectList(param);
- if(userStationList.size() > 0){
- throw new RuntimeException("鍛樺伐("+userStationList.get(0).getUserName()+")缂栫爜:"+ userStationList.get(0).getUserId() + "宸茬粡缁戝畾璇ュ伐绔�("+userStationList.get(0).getStationName()+")缂栫爜:" + userStationList.get(0).getStationId() + ".璇峰厛璁╁叾瑙ｇ粦");
- }
return stationInfo;
}
- public String checkUserAndStation(QueryVo last){
- String message = "OK";
- Long userId = null;
- Long stationId = null;
- String userMsg ="";// checkUser(last.getUserId());
- String stationMsg = "";//checkStationUsed(last.getStationId());
+ public StaAssemblyWorkLast checkStationUsed(QueryVo last){
+ StaAssemblyWorkLast result = new StaAssemblyWorkLast();
+ PltStation stationInfo = null;
+ BaUser userInfo = null;
+ if(StringUtils.isBlank(last.getStationId()) || StringUtils.isBlank(last.getUserId())){
+ throw new RuntimeException("宸ョ珯缂栫爜鎴栧憳宸ョ紪鐮佸潎涓嶈兘涓虹┖,璇锋鏌�");
+ }
//宸ョ珯103
+ if(last.getStationId().startsWith("101")){
+ userInfo = getUserInfo(last.getStationId());
+ }else{
+ stationInfo = getStationInfo(last.getStationId());
+ }
if(last.getUserId().startsWith("103")){
- stationId = getStationInfo(last.getUserId()).getId();
+ stationInfo = getStationInfo(last.getUserId());
}else{
- userId = getUserInfo(last.getUserId()).getId();
+ userInfo = getUserInfo(last.getUserId());
}
- if(last.getStationId().startsWith("103")){
- stationId = getStationInfo(last.getStationId()).getId();
+ if(userInfo == null && stationInfo == null){
+ throw new RuntimeException("鍛樺伐缂栫爜:"+ last.getUserId() + "鍜屽伐绔欑紪鐮�:" + last.getStationId() + "涓嶆纭�,璇锋鏌�");
+ }else if(userInfo == null){
+ throw new RuntimeException("鍛樺伐缂栫爜:"+ last.getUserId() + "涓嶆纭�,璇锋鏌�");
+ }else if(stationInfo == null){
+ throw new RuntimeException("宸ョ珯缂栫爜:" + last.getStationId() + "涓嶆纭�,璇锋鏌�");
+ }
+ //妫�鏌ヨ〃涓璼tationId鏄惁宸茬粡瀛樺湪
+ StaAssemblyWorkLast param = new StaAssemblyWorkLast();
+ param.setStationId(stationInfo.getId());
+ param.setStatus(1);
+ List<StaAssemblyWorkLast> workLasts = assemblyWorkLastDao.selectList(param);
+ long userId = userInfo.getId();
+ if(workLasts.size() > 0){
+ List<StaAssemblyWorkLast> userStationList = workLasts.stream().filter(item->userId == item.getUserId()).collect(Collectors.toList());
+ if(userStationList.size() == 0){
+ throw new RuntimeException("鍛樺伐("+workLasts.get(0).getUserName()+")缂栫爜:"+ workLasts.get(0).getUserId() + "宸茬粡缁戝畾璇ュ伐绔�("+workLasts.get(0).getStationName()+")缂栫爜:" + workLasts.get(0).getStationId() + ".璇峰厛璁╁叾瑙ｇ粦");
+ }else{
+ BeanUtils.copyProperties(userStationList.get(0),result);
+ }
}else{
- //userMsg = checkUser(last.getStationId());
+ result.setUserId(userInfo.getId());
+ result.setUserName(userInfo.getName());
+ result.setStationId(stationInfo.getId());
+ result.setStationName(stationInfo.getName());
+ result.setLineId(stationInfo.getLineId());
}
-
- if(userMsg.startsWith("FALSE") || stationMsg.startsWith("FALSE")){
- if(userMsg.startsWith("FALSE") && stationMsg.startsWith("FALSE")){
- message = userMsg +","+ stationMsg.split("\\^")[1];
- }else if(userMsg.startsWith("FALSE")){
- message = userMsg;
- }else if(stationMsg.startsWith("FALSE")){
- message = stationMsg;
- }
- return message;
- }else{//鏍规嵁缁撴灉 鎵惧埌瀵瑰簲鐨処D鍊�
- if(userMsg.startsWith("USER")){
- userId = Long.parseLong(userMsg.split("\\^")[1]);
- }else if(userMsg.startsWith("STATION")){
- stationId = Long.parseLong(userMsg.split("\\^")[1]);
- }
- if(stationMsg.startsWith("USER")){
- userId = Long.parseLong(stationMsg.split("\\^")[1]);
- }else if(stationMsg.startsWith("STATION")){
- stationId = Long.parseLong(stationMsg.split("\\^")[1]);
- }
+ return result;
+ }
+ @Transactional
+ public int save(QueryVo last) {
+ //鍏坈heck
+ StaAssemblyWorkLast checkResult = checkStationUsed(last);
+ //鏍￠獙planId processId nodeId
+ PrAssemblyPlan params = new PrAssemblyPlan();
+ params.setStatus(1);
+ params.setId(last.getPlanId());
+ params.setProcessId(last.getProcessId());
+ List<PrAssemblyPlan> planList = selectAssyPlanList(params);
+ boolean hasNodeId= planList.stream()
+ .flatMap(process -> process.nodes.stream())
+ .anyMatch(node -> node.id.equals(last.getNodeId()));
+ if(!hasNodeId){
+ throw new RuntimeException("鑺傜偣淇℃伅鏈夎鎴栬鍏朵粬浜哄憳淇敼,璇烽噸鏂伴�夋嫨鑺傜偣淇℃伅");
}
- if(userId == null || stationId == null){
- message = "FALSE^鍛樺伐缂栫爜:"+ last.getUserId() + "鎴栧伐绔欑紪鐮�:" + last.getStationId() + "涓嶆纭�,璇锋鏌�";
- return message;
+ last.setLineId(checkResult.getLineId());
+ StaAssemblyWorkLast staLast = new StaAssemblyWorkLast();
+ BeanUtils.copyProperties(last,staLast);
+ staLast.setUserId(checkResult.getUserId());
+ staLast.setStationId(checkResult.getStationId());
+ int count = 0;
+ if(checkResult.getId() == null){
+ BeanUtils.copyProperties(last,staLast);
+ staLast.setUserId(checkResult.getUserId());
+ staLast.setStationId(checkResult.getStationId());
+ staLast.setStatus(1);
+ staLast.setStartTime(new Date());
+ count = assemblyWorkLastDao.insertSelective(staLast);
+ }else{
+ BeanUtils.copyProperties(checkResult,staLast);
+ staLast.setPlanId(last.getPlanId());
+ staLast.setProcessId(last.getProcessId());
+ staLast.setNodeId(last.getNodeId());
+ staLast.setStatus(1);
+ staLast.setStartTime(new Date());
+ count = assemblyWorkLastDao.updateByPrimaryKeySelective(staLast);
}
- return message;
+ return count;
}
public List<PrAssemblyPlan> selectAssyPlanList(PrAssemblyPlan params){
List<PrAssemblyPlan> planList = assemblyDao.selectAssyPlanList(params);
@@ -177,4 +214,4 @@
ins.extName = file.extName;
}
-}
+}
\ No newline at end of file
--
Gitblit v1.8.0