From af0ee4d30ae6cb2eee76ed9da7aad007edd4113f Mon Sep 17 00:00:00 2001
From: Fancy <Fancy.fx@outlook.com>
Date: 星期四, 27 六月 2024 11:12:32 +0800
Subject: [PATCH] some NotNull error
---
pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/workOrder/WorkOrderSv.java | 199 ++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 169 insertions(+), 30 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 503fef2..e0fc39b 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
@@ -1,22 +1,22 @@
package com.dy.pmsStation.workOrder;
import com.alibaba.excel.util.StringUtils;
+import com.dy.common.webUtil.BaseResponseUtils;
import com.dy.pmsGlobal.daoBa.BaUserMapper;
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.StaAssemblyWorkHistoryMapper;
import com.dy.pmsGlobal.daoSta.StaAssemblyWorkLastMapper;
import com.dy.pmsGlobal.dyFile.FileOperate;
import com.dy.pmsGlobal.dyFile.FileRestVo;
import com.dy.pmsGlobal.pojoBa.BaUser;
import com.dy.pmsGlobal.pojoOth.OthFile;
-import com.dy.pmsGlobal.pojoPlt.PltProductionLine;
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.StaAssemblyWorkHistory;
import com.dy.pmsGlobal.pojoSta.StaAssemblyWorkLast;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
@@ -27,6 +27,7 @@
import java.util.Date;
import java.util.List;
+import java.util.concurrent.atomic.AtomicLong;
import java.util.stream.Collectors;
@Slf4j
@@ -36,6 +37,7 @@
private BaUserMapper baUserDao;
private PltStationMapper pltStationDao;
private StaAssemblyWorkLastMapper assemblyWorkLastDao;
+ private StaAssemblyWorkHistoryMapper assemblyWorkHistoryDao;
private FileOperate fileOperate;
private OthFileMapper othFileMapper;
@Value("${dy.webFile.fmUrl}")
@@ -51,6 +53,10 @@
@Autowired
private void setPltStationDao(PltStationMapper pltStationDao){
this.pltStationDao = pltStationDao;
+ }
+ @Autowired
+ private void setStaAssemblyWorkHistoryDao(StaAssemblyWorkHistoryMapper assemblyWorkHistoryDao){
+ this.assemblyWorkHistoryDao = assemblyWorkHistoryDao;
}
@Autowired
private void setStaAssemblyWorkLastDao(StaAssemblyWorkLastMapper assemblyWorkLastDao){
@@ -84,8 +90,8 @@
}
return userInfo;
}
-
public PltStation getStationInfo(String id){
+ //浠呮鏌ュ伐绔欎俊鎭互鍙婂伐绔欏崰鐢ㄦ儏鍐�
Long stationId = null;
if(StringUtils.isBlank(id)){
throw new RuntimeException("宸ョ珯缂栫爜涓嶈兘涓虹┖");
@@ -104,30 +110,53 @@
}
return stationInfo;
}
- public StaAssemblyWorkLast checkStationUsed(QueryVo last){
+ public StaAssemblyWorkLast checkStationUsed(String id){
+ StaAssemblyWorkLast result = new StaAssemblyWorkLast();
+ PltStation stationInfo = null;
+ if(StringUtils.isBlank(id)){
+ throw new RuntimeException("宸ョ珯缂栫爜涓嶈兘涓虹┖,璇锋鏌�");
+ }
+ stationInfo = getStationInfo(id);
+ //妫�鏌ヨ〃涓璼tationId鏄惁宸茬粡瀛樺湪
+ StaAssemblyWorkLast param = new StaAssemblyWorkLast();
+ param.setStationId(stationInfo.getId());
+ param.setStatus(1);
+ List<StaAssemblyWorkLast> workLasts = assemblyWorkLastDao.selectList(param);
+ if(workLasts.size() > 0){
+ BeanUtils.copyProperties(workLasts.get(0),result);
+ }else{
+ result.setStationId(stationInfo.getId());
+ result.setStationName(stationInfo.getName());
+ result.setLineId(stationInfo.getLineId());
+ result.setLineName(stationInfo.getLineName());
+ }
+ return result;
+ }
+
+ public StaAssemblyWorkLast checkUserAndStationUsed(QueryVo vo){
StaAssemblyWorkLast result = new StaAssemblyWorkLast();
PltStation stationInfo = null;
BaUser userInfo = null;
- if(StringUtils.isBlank(last.getStationId()) || StringUtils.isBlank(last.getUserId())){
+ if(StringUtils.isBlank(vo.getStationId()) || StringUtils.isBlank(vo.getUserId())){
throw new RuntimeException("宸ョ珯缂栫爜鎴栧憳宸ョ紪鐮佸潎涓嶈兘涓虹┖,璇锋鏌�");
}
//宸ョ珯103
- if(last.getStationId().startsWith("101")){
- userInfo = getUserInfo(last.getStationId());
+ if(vo.getStationId().startsWith("101")){
+ userInfo = getUserInfo(vo.getStationId());
}else{
- stationInfo = getStationInfo(last.getStationId());
+ stationInfo = getStationInfo(vo.getStationId());
}
- if(last.getUserId().startsWith("103")){
- stationInfo = getStationInfo(last.getUserId());
+ if(vo.getUserId().startsWith("103")){
+ stationInfo = getStationInfo(vo.getUserId());
}else{
- userInfo = getUserInfo(last.getUserId());
+ userInfo = getUserInfo(vo.getUserId());
}
if(userInfo == null && stationInfo == null){
- throw new RuntimeException("鍛樺伐缂栫爜:"+ last.getUserId() + "鍜屽伐绔欑紪鐮�:" + last.getStationId() + "涓嶆纭�,璇锋鏌�");
+ throw new RuntimeException("鍛樺伐缂栫爜:"+ vo.getUserId() + "鍜屽伐绔欑紪鐮�:" + vo.getStationId() + "涓嶆纭�,璇锋鏌�");
}else if(userInfo == null){
- throw new RuntimeException("鍛樺伐缂栫爜:"+ last.getUserId() + "涓嶆纭�,璇锋鏌�");
+ throw new RuntimeException("鍛樺伐缂栫爜:"+ vo.getUserId() + "涓嶆纭�,璇锋鏌�");
}else if(stationInfo == null){
- throw new RuntimeException("宸ョ珯缂栫爜:" + last.getStationId() + "涓嶆纭�,璇锋鏌�");
+ throw new RuntimeException("宸ョ珯缂栫爜:" + vo.getStationId() + "涓嶆纭�,璇锋鏌�");
}
//妫�鏌ヨ〃涓璼tationId鏄惁宸茬粡瀛樺湪
StaAssemblyWorkLast param = new StaAssemblyWorkLast();
@@ -143,6 +172,8 @@
BeanUtils.copyProperties(userStationList.get(0),result);
}
}else{
+ result.setUserId(userInfo.getId());
+ result.setUserName(userInfo.getName());
result.setStationId(stationInfo.getId());
result.setStationName(stationInfo.getName());
result.setLineId(stationInfo.getLineId());
@@ -150,46 +181,73 @@
return result;
}
@Transactional
- public int save(QueryVo last) {
+ public StaAssemblyWorkLast save(QueryVo vo) {
//鍏坈heck
- StaAssemblyWorkLast checkResult = checkStationUsed(last);
+ StaAssemblyWorkLast checkResult = checkUserAndStationUsed(vo);
//鏍￠獙planId processId nodeId
PrAssemblyPlan params = new PrAssemblyPlan();
params.setStatus(1);
- params.setId(last.getPlanId());
- params.setProcessId(last.getProcessId());
+ params.setId(vo.getPlanId());
+ params.setProcessId(vo.getProcessId());
List<PrAssemblyPlan> planList = selectAssyPlanList(params);
- planList.stream().forEach(process -> {
- process.nodes.stream().filter(node -> node.id == last.getNodeId());
- });
- last.setLineId(checkResult.getLineId());
+ boolean hasNodeId= planList.stream()
+ .flatMap(process -> process.getProcess().getNodes().stream())
+ .anyMatch(node -> node.id.equals(vo.getNodeId()));
+ if(!hasNodeId){
+ throw new RuntimeException("鑺傜偣淇℃伅鏈夎鎴栬鍏朵粬浜哄憳淇敼,璇烽噸鏂伴�夋嫨鑺傜偣淇℃伅");
+ }
+ vo.setLineId(checkResult.getLineId());
StaAssemblyWorkLast staLast = new StaAssemblyWorkLast();
- BeanUtils.copyProperties(last,staLast);
+ BeanUtils.copyProperties(vo,staLast);
staLast.setUserId(checkResult.getUserId());
staLast.setStationId(checkResult.getStationId());
int count = 0;
if(checkResult.getId() == null){
- BeanUtils.copyProperties(last,staLast);
+ BeanUtils.copyProperties(vo,staLast);
staLast.setUserId(checkResult.getUserId());
staLast.setStationId(checkResult.getStationId());
staLast.setStatus(1);
staLast.setStartTime(new Date());
count = assemblyWorkLastDao.insertSelective(staLast);
}else{
+ //淇濆瓨涓�鏉istory?
BeanUtils.copyProperties(checkResult,staLast);
- staLast.setPlanId(last.getPlanId());
- staLast.setProcessId(last.getProcessId());
- staLast.setNodeId(last.getNodeId());
+ staLast.setPlanId(vo.getPlanId());
+ staLast.setProcessId(vo.getProcessId());
+ staLast.setNodeId(vo.getNodeId());
staLast.setStatus(1);
staLast.setStartTime(new Date());
count = assemblyWorkLastDao.updateByPrimaryKeySelective(staLast);
}
+ if (count <= 0) {
+ throw new RuntimeException("鏁版嵁搴撳瓨鍌ㄥけ璐�");
+ }
+ StaAssemblyWorkLast result = assemblyWorkLastDao.selectByPrimaryKey(staLast.getId());
+ return result;
+ }
+ @Transactional
+ public int logout(String id) {
+ //鎵惧埌鐧诲綍璁板綍
+ StaAssemblyWorkLast workLast = assemblyWorkLastDao.selectByPrimaryKey(Long.parseLong(id));
+ if(workLast == null){
+ throw new RuntimeException("绯荤粺涓病鏈夎鏉＄櫥褰曚俊鎭�");
+ }
+ //鏇存柊鐧诲綍璁板綍
+ workLast.setStatus(2);
+ workLast.setEndTime(new Date());
+ // 淇濆瓨history
+ StaAssemblyWorkHistory history = new StaAssemblyWorkHistory();
+ BeanUtils.copyProperties(workLast,history);
+ history.setId(null);
+ int count = assemblyWorkHistoryDao.insertSelective(history);
+ //鍒犻櫎last
+ assemblyWorkLastDao.deleteByPrimaryKey(Long.parseLong(id));
return count;
}
public List<PrAssemblyPlan> selectAssyPlanList(PrAssemblyPlan params){
List<PrAssemblyPlan> planList = assemblyDao.selectAssyPlanList(params);
planList.stream().forEach(process -> {
- process.nodes.forEach(node -> {
+ process.getProcess().getNodes().forEach(node -> {
if(node.instruction != null){
addUrl(node.instruction);
}
@@ -210,5 +268,86 @@
ins.orgName = file.orgName;
ins.extName = file.extName;
}
+ //workId assistants 浼犵殑鏄崟涓殑userId 蹇呬紶鍙傛暟
+ public List<BaUser> updateAssistant(QueryVo vo) {
+ //鎵惧埌workId
+ StaAssemblyWorkLast workLast = assemblyWorkLastDao.selectByPrimaryKey(vo.getWorkId());
+ if(workLast == null){
+ throw new RuntimeException("绯荤粺涓病鏈夎鏉＄櫥褰曚俊鎭�,璇锋鏌ユ垨閲嶆柊鐧诲綍");
+ }
+ //濡傛灉assistants 鏈�101 鍒欏垹鎺�
+ StringBuilder sb = new StringBuilder();
+ String[] assistantArr = vo.getAssistants().split(",");
+ for (String item : assistantArr) {
+ if(item.startsWith("101")){
+ sb.append(item.substring(3)).append(",");
+ }else{
+ sb.append(item).append(",");
+ }
+ }
+ String assistantStr = assistantArr.length > 0 ? sb.deleteCharAt(sb.length() - 1).toString() : "";
+ List<BaUser> userInfo = baUserDao.selectByAssistants(vo.getAssistants());
+ return userInfo;
+ }
+ public int addAssistant(String workId ,String assistant) {
+ //鎵惧埌workId
+ StaAssemblyWorkLast workLast = assemblyWorkLastDao.selectByPrimaryKey(Long.parseLong(workId));
+ if(workLast == null){
+ throw new RuntimeException("绯荤粺涓病鏈夊綋鍓嶇櫥褰曚俊鎭�,璇锋鏌ユ垨閲嶆柊鐧诲綍");
+ }
+ BaUser userInfo = getUserInfo(assistant);
+ //褰撳墠鐧诲綍浜轰笉鑳芥槸杈呭姪浜哄憳
+ if(workLast.getUserId() == userInfo.getId()){
+ throw new RuntimeException(userInfo.getName() +"鏄綋鍓嶇櫥褰曚汉鍛�,涓嶅繀娣诲姞涓鸿緟鍔╀汉鍛�.");
+ }
+ String userId = userInfo.getId().toString();
+ if(StringUtils.isBlank(workLast.getAssistants())){
+ workLast.setAssistants(userId);
+ }else{
+ //宸茬粡娣诲姞鐨勮緟鍔╀汉鍛� 涓嶅繀閲嶅娣诲姞
+ String assistants = workLast.getAssistants();
+ String[] assistantArr = assistants.split(",");
+ for (String item : assistantArr) {
+ if(userId.equals(item)){
+ throw new RuntimeException(userInfo.getName() +"宸茬粡娣诲姞涓鸿緟鍔╀汉鍛�,涓嶅繀閲嶅娣诲姞.");
+ }
+ }
+ workLast.setAssistants(assistants +","+ userId);
+ }
+ int count = assemblyWorkLastDao.updateByPrimaryKey(workLast);
+ return count;
+ }
+ public int removeAssistant(String workId ,String assistant) {
+ //鎵惧埌workId
+ StaAssemblyWorkLast workLast = assemblyWorkLastDao.selectByPrimaryKey(Long.parseLong(workId));
+ if(workLast == null){
+ throw new RuntimeException("绯荤粺涓病鏈夊綋鍓嶇櫥褰曚俊鎭�,璇锋鏌ユ垨閲嶆柊鐧诲綍");
+ }
+ if((!StringUtils.isBlank(assistant)) && assistant.startsWith("101")){
+ assistant = assistant.substring(3);
+ }
+ if(!StringUtils.isBlank(workLast.getAssistants())){
+ StringBuilder sb = new StringBuilder();
+ String[] assistantArr = workLast.getAssistants().split(",");
+ for (String item : assistantArr) {
+ if((!StringUtils.isBlank(assistant)) && (!assistant.equals(item))){
+ sb.append(item).append(",");
+ }
+ }
+ String assistantStr = sb.length() > 0 ? sb.deleteCharAt(sb.length() - 1).toString() : "";
+ workLast.setAssistants(assistantStr);
+ }
+ int count = assemblyWorkLastDao.updateByPrimaryKey(workLast);
+ return count;
+ }
+ public List<BaUser> getAssistantList(String workId) {
+ //鎵惧埌workId
+ StaAssemblyWorkLast workLast = assemblyWorkLastDao.selectByPrimaryKey(Long.parseLong(workId));
+ if(workLast == null){
+ throw new RuntimeException("绯荤粺涓病鏈夊綋鍓嶇櫥褰曚俊鎭�,璇锋鏌ユ垨閲嶆柊鐧诲綍");
+ }
+ List<BaUser> assistantList = baUserDao.selectByAssistants(workLast.getAssistants());
+ return assistantList;
+ }
}
\ No newline at end of file
--
Gitblit v1.8.0