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 | 429 ++++++++++++++++++++++++++++++++---------------------
1 files changed, 259 insertions(+), 170 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 7686640..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
@@ -1,177 +1,198 @@
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.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;
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.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.pojoPr.PrWorkingInstruction;
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;
-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
public class WorkOrderSv {
+ private static final int STATUS_NORMAL = 1;
+ private static final int STATUS_WORK_LAST_LOGOUT = 2;
+ 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";
+
private PrAssemblyPlanMapper assemblyDao;
private BaUserMapper baUserDao;
private PltStationMapper pltStationDao;
private StaAssemblyWorkLastMapper assemblyWorkLastDao;
private StaAssemblyWorkHistoryMapper assemblyWorkHistoryDao;
- private FileOperate fileOperate;
- private OthFileMapper othFileMapper;
- @Value("${dy.webFile.fmUrl}")
- private String fmUrl ;
+ private PrProductionNodeMapper nodeDao;
+ private PltProductMapper productDao;
+ private PltProductionLineMapper lineDao;
+
@Autowired
public void setAssemblyDao(PrAssemblyPlanMapper assemblyDao) {
this.assemblyDao = assemblyDao;
}
+
@Autowired
- private void setBaUserDao(BaUserMapper baUserDao){
+ private void setBaUserDao(BaUserMapper baUserDao) {
this.baUserDao = baUserDao;
}
+
@Autowired
- private void setPltStationDao(PltStationMapper pltStationDao){
+ private void setPltStationDao(PltStationMapper pltStationDao) {
this.pltStationDao = pltStationDao;
}
+
@Autowired
- private void setStaAssemblyWorkHistoryDao(StaAssemblyWorkHistoryMapper assemblyWorkHistoryDao){
+ private void setStaAssemblyWorkHistoryDao(StaAssemblyWorkHistoryMapper assemblyWorkHistoryDao) {
this.assemblyWorkHistoryDao = assemblyWorkHistoryDao;
}
+
@Autowired
- private void setStaAssemblyWorkLastDao(StaAssemblyWorkLastMapper assemblyWorkLastDao){
+ private void setStaAssemblyWorkLastDao(StaAssemblyWorkLastMapper assemblyWorkLastDao) {
this.assemblyWorkLastDao = assemblyWorkLastDao;
}
+
@Autowired
- public void setFileOperate(FileOperate fileOperate){
- this.fileOperate = fileOperate;
- }
- @Autowired
- public void setOthFileMapper(OthFileMapper othFileMapper){
- this.othFileMapper = othFileMapper;
+ public void setNodeDao(PrProductionNodeMapper nodeDao) {
+ this.nodeDao = nodeDao;
}
- public BaUser getUserInfo(String id){
+ @Autowired
+ public void setPltProductDao(PltProductMapper productDao) {
+ this.productDao = productDao;
+ }
+
+ @Autowired
+ public void setLineDao(PltProductionLineMapper lineDao) {
+ this.lineDao = lineDao;
+ }
+
+ public BaUser getUserInfo(String id) {
Long userId = null;
- if(StringUtils.isBlank(id)){
+ if (StringUtils.isBlank(id)) {
throw new RuntimeException("鍛樺伐缂栫爜涓嶈兘涓虹┖");
}
//鐢ㄦ埛101
- if(id.startsWith("101")){
+ if (id.startsWith(QrCodeConstant.TypeWorker)) {
userId = Long.parseLong(id.toString().substring(3));
- }else{
+ } else {
userId = Long.parseLong(id.toString());
}
BaUser userInfo = baUserDao.selectByPrimaryKey(userId);
- if(userInfo == null){
- throw new RuntimeException("鍛樺伐缂栫爜:"+ userId +"涓嶅湪绯荤粺涓�,璇峰厛缁存姢鍛樺伐淇℃伅");
- }else if(userInfo.getDisabled()){
- throw new RuntimeException("鍛樺伐("+userInfo.getName()+")缂栫爜:"+ userId +"鍦ㄧ郴缁熷凡绂佺敤,璇峰厛鍚敤鍛樺伐");
+ if (userInfo == null) {
+ throw new RuntimeException("鍛樺伐缂栫爜:" + userId + "涓嶅湪绯荤粺涓�,璇峰厛缁存姢鍛樺伐淇℃伅");
+ } else if (userInfo.getDisabled()) {
+ throw new RuntimeException("鍛樺伐(" + userInfo.getName() + ")缂栫爜:" + userId + "鍦ㄧ郴缁熷凡绂佺敤,璇峰厛鍚敤鍛樺伐");
}
return userInfo;
}
- public PltStation getStationInfo(String id){
+
+ public PltStation getStationInfo(String id) {
//浠呮鏌ュ伐绔欎俊鎭互鍙婂伐绔欏崰鐢ㄦ儏鍐�
Long stationId = null;
- if(StringUtils.isBlank(id)){
+ if (StringUtils.isBlank(id)) {
throw new RuntimeException("宸ョ珯缂栫爜涓嶈兘涓虹┖");
}
//宸ョ珯103
- if(id.startsWith("103")){
+ if (id.startsWith(QrCodeConstant.TypeStation)) {
stationId = Long.parseLong(id.toString().substring(3));
- }else{
+ } else {
stationId = Long.parseLong(id.toString());
}
PltStation stationInfo = pltStationDao.selectByPrimaryKey(stationId);
- if(stationInfo == null){
- throw new RuntimeException("宸ョ珯缂栫爜:"+ stationId +"涓嶅湪绯荤粺涓�,璇峰厛缁存姢宸ョ珯淇℃伅");
- }else if(stationInfo.getDisabled()){
- throw new RuntimeException("宸ョ珯("+stationInfo.getName()+")缂栫爜:"+ stationId +"鍦ㄧ郴缁熷凡绂佺敤,璇峰厛鍚敤宸ョ珯");
+ if (stationInfo == null) {
+ 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;
}
- 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){
+ public StaAssemblyWorkLast checkUserAndStationUsed(QueryVo vo) {
StaAssemblyWorkLast result = new StaAssemblyWorkLast();
PltStation stationInfo = null;
BaUser userInfo = null;
- if(StringUtils.isBlank(vo.getStationId()) || StringUtils.isBlank(vo.getUserId())){
+ if (StringUtils.isBlank(vo.getStationId()) || StringUtils.isBlank(vo.getUserId())) {
throw new RuntimeException("宸ョ珯缂栫爜鎴栧憳宸ョ紪鐮佸潎涓嶈兘涓虹┖,璇锋鏌�");
}
//宸ョ珯103
- if(vo.getStationId().startsWith("101")){
+ if (vo.getStationId().startsWith(QrCodeConstant.TypeWorker)) {
userInfo = getUserInfo(vo.getStationId());
- }else{
+ } else {
stationInfo = getStationInfo(vo.getStationId());
}
- if(vo.getUserId().startsWith("103")){
+ if (vo.getUserId().startsWith(QrCodeConstant.TypeStation)) {
stationInfo = getStationInfo(vo.getUserId());
- }else{
+ } else {
userInfo = getUserInfo(vo.getUserId());
}
- if(userInfo == null && stationInfo == null){
- throw new RuntimeException("鍛樺伐缂栫爜:"+ vo.getUserId() + "鍜屽伐绔欑紪鐮�:" + vo.getStationId() + "涓嶆纭�,璇锋鏌�");
- }else if(userInfo == null){
- throw new RuntimeException("鍛樺伐缂栫爜:"+ vo.getUserId() + "涓嶆纭�,璇锋鏌�");
- }else if(stationInfo == null){
+ if (userInfo == null && stationInfo == null) {
+ throw new RuntimeException("鍛樺伐缂栫爜:" + vo.getUserId() + "鍜屽伐绔欑紪鐮�:" + vo.getStationId() + "涓嶆纭�,璇锋鏌�");
+ } else if (userInfo == null) {
+ throw new RuntimeException("鍛樺伐缂栫爜:" + vo.getUserId() + "涓嶆纭�,璇锋鏌�");
+ } else if (stationInfo == null) {
throw new RuntimeException("宸ョ珯缂栫爜:" + vo.getStationId() + "涓嶆纭�,璇锋鏌�");
}
//妫�鏌ヨ〃涓璼tationId鏄惁宸茬粡瀛樺湪
StaAssemblyWorkLast param = new StaAssemblyWorkLast();
param.setStationId(stationInfo.getId());
- param.setStatus(1);
+ param.setStatus(STATUS_NORMAL);
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);
+ //long userId = userInfo.getId();
+ if (workLasts.size() > 0) {
+ 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(userStation, result);
}
- }else{
+ }
+ if (result.getId() == null) {
result.setUserId(userInfo.getId());
result.setUserName(userInfo.getName());
result.setStationId(stationInfo.getId());
@@ -180,158 +201,225 @@
}
return result;
}
+
+ public StaAssemblyWorkLast getWorkLast(String workId) {
+ if (StringUtils.isBlank(workId)) {
+ throw new RuntimeException("鐧诲綍ID涓虹┖,璇疯仈绯荤鐞嗗憳鏌ョ湅骞惰В鍐抽棶棰�.");
+ }
+ StaAssemblyWorkLast result = assemblyWorkLastDao.selectByPrimaryKey(Long.parseLong(workId));
+ if (result == null) {
+ throw new RuntimeException("绯荤粺涓病鏈夎鏉＄櫥褰曚俊鎭�");
+ //return null;
+ }
+ BaUser userInfo = getUserInfo(result.getUserId().toString());
+ PltStation stationInfo = getStationInfo(result.getStationId().toString());
+ //濡傛灉鏄棤浠诲姟璁″垝 濡傜淮淇畐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());
+ result.setStationName(stationInfo.getName());
+ result.setLineId(stationInfo.getLineId());
+ result.setLineName(stationInfo.getLineName());
+ return result;
+ }
+
+ public StaAssemblyWorkLast checkStationUsed(String stationId) {
+ StaAssemblyWorkLast result = new StaAssemblyWorkLast();
+ PltStation stationInfo = null;
+ if (StringUtils.isBlank(stationId)) {
+ throw new RuntimeException("宸ョ珯缂栫爜涓嶈兘涓虹┖,璇锋鏌�");
+ }
+ stationInfo = getStationInfo(stationId);
+ //妫�鏌ヨ〃涓璼tationId鏄惁宸茬粡瀛樺湪
+ StaAssemblyWorkLast param = new StaAssemblyWorkLast();
+ param.setStationId(stationInfo.getId());
+ param.setStatus(STATUS_NORMAL);
+ List<StaAssemblyWorkLast> workLasts = assemblyWorkLastDao.selectList(param);
+ if (workLasts.size() > 0) {
+ result = getWorkLast(workLasts.get(0).getId().toString());
+ }
+ result.setStationId(stationInfo.getId());
+ result.setStationName(stationInfo.getName());
+ result.setLineId(stationInfo.getLineId());
+ result.setLineName(stationInfo.getLineName());
+ return result;
+ }
+
@Transactional
public StaAssemblyWorkLast save(QueryVo vo) {
//鍏坈heck
StaAssemblyWorkLast checkResult = checkUserAndStationUsed(vo);
//鏍￠獙planId processId nodeId
- PrAssemblyPlan params = new PrAssemblyPlan();
- params.setStatus(1);
- params.setId(vo.getPlanId());
- params.setProcessId(vo.getProcessId());
- List<PrAssemblyPlan> planList = selectAssyPlanList(params);
- boolean hasNodeId= planList.stream()
- .flatMap(process -> process.getProcess().getNodes().stream())
- .anyMatch(node -> node.id.equals(vo.getNodeId()));
- if(!hasNodeId){
- 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("鑺傜偣淇℃伅鏈夎鎴栬鍏朵粬浜哄憳淇敼,璇烽噸鏂伴�夋嫨鑺傜偣淇℃伅");
+ }
}
- 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);
- staLast.setUserId(checkResult.getUserId());
- staLast.setStationId(checkResult.getStationId());
- staLast.setStatus(1);
- staLast.setStartTime(new Date());
- count = assemblyWorkLastDao.insertSelective(staLast);
+ StaAssemblyWorkLast result = new StaAssemblyWorkLast();
+ //鏌ヨ鍒板綋鍓嶇殑淇℃伅 濡傛灉鐧诲綍淇℃伅涓�妯′竴鏍�,涓嶄細鏇存柊
+ if (checkResult.getId() != null) {
+ BeanUtils.copyProperties(checkResult, result);//checkResult鎷疯礉鍒皉esult
}else{
- //淇濆瓨涓�鏉istory?
- BeanUtils.copyProperties(checkResult,staLast);
- staLast.setPlanId(vo.getPlanId());
- staLast.setProcessId(vo.getProcessId());
- staLast.setNodeId(vo.getNodeId());
- staLast.setStatus(1);
- staLast.setStartTime(new Date());
- count = assemblyWorkLastDao.updateByPrimaryKeySelective(staLast);
+ //閫愪釜灏佽淇濆瓨
+ 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("鏁版嵁搴撳瓨鍌ㄥけ璐�");
+ }
}
- if (count <= 0) {
- throw new RuntimeException("鏁版嵁搴撳瓨鍌ㄥけ璐�");
+ 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);
}
- StaAssemblyWorkLast result = assemblyWorkLastDao.selectByPrimaryKey(staLast.getId());
return result;
}
+
@Transactional
public int logout(String id) {
//鎵惧埌鐧诲綍璁板綍
StaAssemblyWorkLast workLast = assemblyWorkLastDao.selectByPrimaryKey(Long.parseLong(id));
- if(workLast == null){
+ if (workLast == null) {
throw new RuntimeException("绯荤粺涓病鏈夎鏉＄櫥褰曚俊鎭�");
}
//鏇存柊鐧诲綍璁板綍
- workLast.setStatus(2);
+ workLast.setStatus(STATUS_WORK_LAST_LOGOUT);
workLast.setEndTime(new Date());
// 淇濆瓨history
StaAssemblyWorkHistory history = new StaAssemblyWorkHistory();
- BeanUtils.copyProperties(workLast,history);
+ BeanUtils.copyProperties(workLast, history);
+ history.setWorkId(workLast.getId());
//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 -> {
+
+ public List<PrAssemblyPlan> selectAssyPlanList(PrAssemblyPlan params) {
+ List<PrAssemblyPlan> planList = assemblyDao.selectAssyPlanSimplify(params);
+ /* planList.stream().forEach(process -> {
process.getProcess().getNodes().forEach(node -> {
if(node.instruction != null){
addUrl(node.instruction);
}
});
- });
+ });*/
return planList;
}
- private void addUrl(PrWorkingInstruction ins){
- if (ins == null || ins.fileId == null) {
- return;
- }
- OthFile file = othFileMapper.selectByPrimaryKey(ins.fileId);
- if (file == null) {
- return;
- }
- FileRestVo fileRestVo = fileOperate.parseHashcode(fmUrl, file.hash);
- ins.webUrl = fileRestVo.fileSysRestUrl + fileRestVo.fileWebDownloadPath + ins.fileId;
- 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) {
+ public int addAssistant(String workId, String assistant) {
//鎵惧埌workId
StaAssemblyWorkLast workLast = assemblyWorkLastDao.selectByPrimaryKey(Long.parseLong(workId));
- if(workLast == null){
+ if (workLast == null) {
throw new RuntimeException("绯荤粺涓病鏈夊綋鍓嶇櫥褰曚俊鎭�,璇锋鏌ユ垨閲嶆柊鐧诲綍");
}
BaUser userInfo = getUserInfo(assistant);
//褰撳墠鐧诲綍浜轰笉鑳芥槸杈呭姪浜哄憳
- if(workLast.getUserId() == userInfo.getId()){
- throw new RuntimeException(userInfo.getName() +"鏄綋鍓嶇櫥褰曚汉鍛�,涓嶅繀娣诲姞涓鸿緟鍔╀汉鍛�.");
+ if (workLast.getUserId() == userInfo.getId()) {
+ throw new RuntimeException(userInfo.getName() + "鏄綋鍓嶇櫥褰曚汉鍛�,涓嶅繀娣诲姞涓鸿緟鍔╀汉鍛�.");
}
String userId = userInfo.getId().toString();
- if(StringUtils.isBlank(workLast.getAssistants())){
+ if (StringUtils.isBlank(workLast.getAssistants())) {
workLast.setAssistants(userId);
- }else{
+ } else {
//宸茬粡娣诲姞鐨勮緟鍔╀汉鍛� 涓嶅繀閲嶅娣诲姞
String assistants = workLast.getAssistants();
String[] assistantArr = assistants.split(",");
for (String item : assistantArr) {
- if(userId.equals(item)){
- throw new RuntimeException(userInfo.getName() +"宸茬粡娣诲姞涓鸿緟鍔╀汉鍛�,涓嶅繀閲嶅娣诲姞.");
+ if (userId.equals(item)) {
+ throw new RuntimeException(userInfo.getName() + "宸茬粡娣诲姞涓鸿緟鍔╀汉鍛�,涓嶅繀閲嶅娣诲姞.");
}
}
- workLast.setAssistants(assistants +","+ userId);
+ workLast.setAssistants(assistants + "," + userId);
}
int count = assemblyWorkLastDao.updateByPrimaryKey(workLast);
return count;
}
- public int removeAssistant(String workId ,String assistant) {
+
+ public int removeAssistant(String workId, String assistant) {
//鎵惧埌workId
StaAssemblyWorkLast workLast = assemblyWorkLastDao.selectByPrimaryKey(Long.parseLong(workId));
- if(workLast == null){
+ if (workLast == null) {
throw new RuntimeException("绯荤粺涓病鏈夊綋鍓嶇櫥褰曚俊鎭�,璇锋鏌ユ垨閲嶆柊鐧诲綍");
}
- if((!StringUtils.isBlank(assistant)) && assistant.startsWith("101")){
+ if ((!StringUtils.isBlank(assistant)) && assistant.startsWith(QrCodeConstant.TypeWorker)) {
assistant = assistant.substring(3);
}
- if(!StringUtils.isBlank(workLast.getAssistants())){
+ 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))){
+ if ((!StringUtils.isBlank(assistant)) && (!assistant.equals(item))) {
sb.append(item).append(",");
}
}
@@ -341,10 +429,11 @@
int count = assemblyWorkLastDao.updateByPrimaryKey(workLast);
return count;
}
+
public List<BaUser> getAssistantList(String workId) {
//鎵惧埌workId
StaAssemblyWorkLast workLast = assemblyWorkLastDao.selectByPrimaryKey(Long.parseLong(workId));
- if(workLast == null){
+ if (workLast == null) {
throw new RuntimeException("绯荤粺涓病鏈夊綋鍓嶇櫥褰曚俊鎭�,璇锋鏌ユ垨閲嶆柊鐧诲綍");
}
List<BaUser> assistantList = baUserDao.selectByAssistants(workLast.getAssistants());
--
Gitblit v1.8.0