From 4e8c24a99b7c958b1380c2f760f1b826c5b6e009 Mon Sep 17 00:00:00 2001
From: Fancy <Fancy.fx@outlook.com>
Date: 星期四, 25 七月 2024 17:22:28 +0800
Subject: [PATCH] edit bug
---
pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/workOrder/WorkOrderSv.java | 250 +++++++++++++++++++++++++++-----------------------
1 files changed, 135 insertions(+), 115 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 30ce98d..16f4d06 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,11 +11,13 @@
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;
import com.dy.pmsGlobal.pojoSta.StaAssemblyWorkHistory;
import com.dy.pmsGlobal.pojoSta.StaAssemblyWorkLast;
+import com.dy.pmsGlobal.util.QrCodeConstant;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -33,6 +36,11 @@
private static final int STATUS_REPAIR = 3;
private static final int STATUS_WASTE = 4;
+ private static final String WORK_TYPE_ASSEMBLY = "1";
+ private static final String WORK_TYPE_TEST = "2";
+ 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";
@@ -43,6 +51,7 @@
private StaAssemblyWorkHistoryMapper assemblyWorkHistoryDao;
private PrProductionNodeMapper nodeDao;
private PltProductMapper productDao;
+ private PltProductionLineMapper lineDao;
@Autowired
public void setAssemblyDao(PrAssemblyPlanMapper assemblyDao) {
@@ -79,6 +88,10 @@
this.productDao = productDao;
}
+ @Autowired
+ public void setLineDao(PltProductionLineMapper lineDao) {
+ this.lineDao = lineDao;
+ }
public BaUser getUserInfo(String id) {
Long userId = null;
@@ -118,6 +131,13 @@
} 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;
}
@@ -151,15 +171,28 @@
param.setStationId(stationInfo.getId());
param.setStatus(STATUS_NORMAL);
List<StaAssemblyWorkLast> workLasts = assemblyWorkLastDao.selectList(param);
- long userId = userInfo.getId();
+ //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() + ".璇峰厛璁╁叾瑙ｇ粦");
+ StaAssemblyWorkLast paramQuery = new StaAssemblyWorkLast();
+ paramQuery.setUserId(userInfo.getId());
+ paramQuery.setStationId(stationInfo.getId());
+ paramQuery.setPlanId(vo.getPlanId());
+ paramQuery.setProcessId(vo.getProcessId());
+ paramQuery.setNodeId(vo.getNodeId());
+ paramQuery.setWorkType(vo.getWorkType());
+ StaAssemblyWorkLast userStation = assemblyWorkLastDao.existsEntity(paramQuery);
+ //List<StaAssemblyWorkLast> userStationList = workLasts.stream().filter(item -> userId == item.getUserId()).collect(Collectors.toList());
+ if (userStation == null) {
+ //鍒犻櫎宸ョ珯鐧诲綍淇℃伅
+ for (int i = 0; i < workLasts.size(); i++) {
+ logout(workLasts.get(i).getId().toString());
+ }
+ //throw new RuntimeException("鍛樺伐(" +userInfo.getName() + ")缂栫爜:" + workLasts.get(0).getUserId() + "宸茬粡缁戝畾璇ュ伐绔�(" + stationInfo.getName() + ")缂栫爜:" + workLasts.get(0).getStationId() + ".璇峰厛璁╁叾瑙ｇ粦");
} else {
- BeanUtils.copyProperties(userStationList.get(0), result);
+ BeanUtils.copyProperties(userStation, result);
}
- } else {
+ }
+ if (result.getId() == null) {
result.setUserId(userInfo.getId());
result.setUserName(userInfo.getName());
result.setStationId(stationInfo.getId());
@@ -170,47 +203,58 @@
}
public StaAssemblyWorkLast getWorkLast(String workId) {
+ if (StringUtils.isBlank(workId)) {
+ throw new RuntimeException("鐧诲綍ID涓虹┖,璇疯仈绯荤鐞嗗憳鏌ョ湅骞惰В鍐抽棶棰�.");
+ }
StaAssemblyWorkLast result = assemblyWorkLastDao.selectByPrimaryKey(Long.parseLong(workId));
if (result == null) {
- return null;
+ throw new RuntimeException("绯荤粺涓病鏈夎鏉＄櫥褰曚俊鎭�");
+ //return null;
}
BaUser userInfo = getUserInfo(result.getUserId().toString());
PltStation stationInfo = getStationInfo(result.getStationId().toString());
- //鏍￠獙planId processId nodeId
- PrAssemblyPlan assyPlan = assemblyDao.selectByPrimaryKey(result.getPlanId());
- boolean hasNodeId = assyPlan.getProcess().getNodes().stream()
- .anyMatch(node -> node.id.equals(result.getNodeId()));
- if (userInfo == null || stationInfo == null || assyPlan == null || (!hasNodeId)) {
- //鐩存帴鍒犻櫎璁板綍
- logout(result.getId().toString());
- result.setId(null);
- if(userInfo == null){
- result.setUserId(null);
- result.setUserName("");
- }
- if(stationInfo == null){
- result.setStationId(null);
- result.setStationName("");
- }
- if(assyPlan == null){
- result.setPlanId(null);
- result.setPlanName("");
- }
- if(!hasNodeId){
- result.setNodeId(null);
- result.setNodeName("");
- }
- return result;
- }else {
- result.setPlanName(assyPlan.getName());
- result.setProcessName(assyPlan.getProcessName());
- result.setNodeName(assyPlan.getProcess().getNodes().get(0).getContent());
- //鎵惧埌瀵瑰簲鐨勪骇鍝佷俊鎭�
- PltProduct product = productDao.selectByPrimaryKey(assyPlan.getProId());
- if (product != null) {
- result.setProName(product.getName());
- String devicePrefix = "110" + product.getCode() + assyPlan.getBatchNo();
- result.setDevicePrefix(devicePrefix);
+ //濡傛灉鏄棤浠诲姟璁″垝 濡傜淮淇畐ork_type 娌℃湁 planId processId nodeId
+ if (result.getPlanId() != null) {
+ //鏍￠獙planId processId nodeId
+ PrAssemblyPlan assyPlan = assemblyDao.selectByPrimaryKey(result.getPlanId());
+ boolean hasNodeId = assyPlan.getProcess().getNodes().stream()
+ .anyMatch(node -> node.id.equals(result.getNodeId()));
+ if (userInfo == null || stationInfo == null || assyPlan == null || (!hasNodeId)) {
+ //鐩存帴鍒犻櫎璁板綍
+ logout(result.getId().toString());
+ result.setId(null);
+ result.setStatus(STATUS_WORK_LAST_LOGOUT);
+ if (userInfo == null) {
+ result.setUserId(null);
+ result.setUserName("");
+ }
+ if (stationInfo == null) {
+ result.setStationId(null);
+ result.setStationName("");
+ }
+ if (assyPlan == null) {
+ result.setPlanId(null);
+ result.setPlanName("");
+ }
+ if (!hasNodeId) {
+ result.setNodeId(null);
+ result.setNodeName("");
+ }
+ 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(nodeInfo.get(0).getContent());
+ //鎵惧埌瀵瑰簲鐨勪骇鍝佷俊鎭�
+ PltProduct product = productDao.selectByPrimaryKey(assyPlan.getProId());
+ if (product != null) {
+ result.setProId(product.getId());
+ result.setProName(product.getName());
+ String devicePrefix = QrCodeConstant.TypeProduct + product.getCode() + assyPlan.getBatchNo();
+ result.setDevicePrefix(devicePrefix);
+ }
}
}
result.setStationId(stationInfo.getId());
@@ -233,7 +277,7 @@
param.setStatus(STATUS_NORMAL);
List<StaAssemblyWorkLast> workLasts = assemblyWorkLastDao.selectList(param);
if (workLasts.size() > 0) {
- result = getWorkLast(workLasts.get(0).getId().toString());
+ result = getWorkLast(workLasts.get(0).getId().toString());
}
result.setStationId(stationInfo.getId());
result.setStationName(stationInfo.getName());
@@ -247,57 +291,56 @@
//鍏坈heck
StaAssemblyWorkLast checkResult = checkUserAndStationUsed(vo);
//鏍￠獙planId processId nodeId
- PrAssemblyPlan assyPlan = assemblyDao.selectByPrimaryKey(vo.getPlanId());
- if (assyPlan == null) {
- throw new RuntimeException("缁勮浠诲姟宸茬粡鍦ㄧ郴缁熶腑鍒犻櫎璇锋鏌�,鍒锋柊骞堕噸鏂伴�夋嫨浠诲姟");
+ PrAssemblyPlan assyPlan = null;
+ if (vo.getPlanId() != null) {
+ assyPlan = assemblyDao.selectByPrimaryKey(vo.getPlanId());
+ if (assyPlan == null) {
+ throw new RuntimeException("缁勮浠诲姟宸茬粡鍦ㄧ郴缁熶腑鍒犻櫎璇锋鏌�,鍒锋柊骞堕噸鏂伴�夋嫨浠诲姟");
+ }
+ boolean hasNodeId = assyPlan.getProcess().getNodes().stream()
+ .anyMatch(node -> node.id.equals(vo.getNodeId()));
+ if (!hasNodeId) {
+ throw new RuntimeException("鑺傜偣淇℃伅鏈夎鎴栬鍏朵粬浜哄憳淇敼,璇烽噸鏂伴�夋嫨鑺傜偣淇℃伅");
+ }
}
- boolean hasNodeId = assyPlan.getProcess().getNodes().stream()
- .anyMatch(node -> node.id.equals(vo.getNodeId()));
- if (!hasNodeId) {
- throw new RuntimeException("鑺傜偣淇℃伅鏈夎鎴栬鍏朵粬浜哄憳淇敼,璇烽噸鏂伴�夋嫨鑺傜偣淇℃伅");
+ StaAssemblyWorkLast result = new StaAssemblyWorkLast();
+ //鏌ヨ鍒板綋鍓嶇殑淇℃伅 濡傛灉鐧诲綍淇℃伅涓�妯′竴鏍�,涓嶄細鏇存柊
+ if (checkResult.getId() != null) {
+ BeanUtils.copyProperties(checkResult, result);//checkResult鎷疯礉鍒皉esult
+ }else{
+ //閫愪釜灏佽淇濆瓨
+ BeanUtils.copyProperties(vo, result);//vo鎷疯礉鍒皉esult
+ result.setUserId(checkResult.getUserId());
+ result.setStationId(checkResult.getStationId());
+ result.setLineId(checkResult.getLineId());
+ result.setStatus(STATUS_NORMAL);
+ result.setStartTime(new Date());
+ if (vo.getPlanId() != null) {
+ result.setPlanId(assyPlan.getId());
+ result.setProcessId(assyPlan.getProcess().getId());
+ result.setNodeId(vo.getNodeId());
+ }
+ int count = assemblyWorkLastDao.insertSelective(result);
+ if (count <= 0) {
+ throw new RuntimeException("鏁版嵁搴撳瓨鍌ㄥけ璐�");
+ }
}
-
- //鏁版嵁閫愪釜灏佽杩斿洖
- vo.setLineId(checkResult.getLineId());
- StaAssemblyWorkLast staLast = new StaAssemblyWorkLast();
- BeanUtils.copyProperties(vo, staLast);
- staLast.setUserId(checkResult.getUserId());
- staLast.setStationId(checkResult.getStationId());
- int count = 0;
- if (checkResult.getId() == null) {
- BeanUtils.copyProperties(vo, staLast);//vo鎷疯礉鍒皊taLast
- staLast.setUserId(checkResult.getUserId());
- staLast.setStationId(checkResult.getStationId());
- staLast.setStatus(STATUS_NORMAL);
- staLast.setStartTime(new Date());
- count = assemblyWorkLastDao.insertSelective(staLast);
- } else {
- //淇濆瓨涓�鏉istory?
- BeanUtils.copyProperties(checkResult, staLast);
- staLast.setPlanId(assyPlan.getId());
- staLast.setProcessId(assyPlan.getProcess().getId());
- staLast.setNodeId(vo.getNodeId());
- staLast.setStatus(STATUS_NORMAL);
- staLast.setStartTime(new Date());
- count = assemblyWorkLastDao.updateByPrimaryKeySelective(staLast);
+ if (assyPlan != null) {
+ List<PrProductionNode> nodeInfo = assyPlan.getProcess().getNodes().stream()
+ .filter(node -> node.id.equals(vo.getNodeId())).collect(Collectors.toList());
+ result.setPlanName(assyPlan.getName());
+ result.setProcessName(assyPlan.getProcessName());
+ result.setNodeName(nodeInfo.get(0).getContent());
+ //鎵惧埌瀵瑰簲鐨勪骇鍝佷俊鎭�
+ PltProduct product = productDao.selectByPrimaryKey(assyPlan.getProId());
+ if (product == null) {
+ throw new RuntimeException("浜у搧淇℃伅鏈夎鎴栬鍏朵粬浜哄憳淇敼,璇风櫥褰曠鐞嗙郴缁熸煡鐪嬩换鍔″叧鑱斾骇鍝両D涓�:" + assyPlan.getProId());
+ }
+ result.setProId(product.getId());
+ result.setProName(product.getName());
+ String devicePrefix = QrCodeConstant.TypeProduct + product.getCode() + assyPlan.getBatchNo();
+ result.setDevicePrefix(devicePrefix);
}
- if (count <= 0) {
- throw new RuntimeException("鏁版嵁搴撳瓨鍌ㄥけ璐�");
- }
- StaAssemblyWorkLast result = assemblyWorkLastDao.selectByPrimaryKey(staLast.getId());
- List<PrProductionNode> nodeInfo = assyPlan.getProcess().getNodes().stream()
- .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());
- //鎵惧埌瀵瑰簲鐨勪骇鍝佷俊鎭�
- PltProduct product = productDao.selectByPrimaryKey(assyPlan.getProId());
- if (product == null) {
- throw new RuntimeException("浜у搧淇℃伅鏈夎鎴栬鍏朵粬浜哄憳淇敼,璇风櫥褰曠鐞嗙郴缁熸煡鐪嬩换鍔″叧鑱斾骇鍝両D涓�:" + assyPlan.getProId());
- }
- result.setProName(product.getName());
- String devicePrefix = "110" + product.getCode() + assyPlan.getBatchNo();
- result.setDevicePrefix(devicePrefix);
return result;
}
@@ -314,6 +357,7 @@
// 淇濆瓨history
StaAssemblyWorkHistory history = new StaAssemblyWorkHistory();
BeanUtils.copyProperties(workLast, history);
+ history.setWorkId(workLast.getId());
//history.setId(null);
int count = assemblyWorkHistoryDao.insertSelective(history);
//鍒犻櫎last
@@ -331,28 +375,6 @@
});
});*/
return planList;
- }
-
- //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(USER_PREFIX)) {
- 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) {
@@ -417,6 +439,4 @@
List<BaUser> assistantList = baUserDao.selectByAssistants(workLast.getAssistants());
return assistantList;
}
-
-
}
\ No newline at end of file
--
Gitblit v1.8.0