From 03ec5826348fe924243eb797559aef91afa98086 Mon Sep 17 00:00:00 2001
From: 刘小明 <liuxm_a@163.com>
Date: 星期一, 24 六月 2024 17:29:23 +0800
Subject: [PATCH] 记录组装各步骤
---
pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/workOrder/WorkOrderSv.java | 248 +++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 219 insertions(+), 29 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 da4baf5..00d92c1 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
@@ -2,57 +2,247 @@
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.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.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;
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 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 ;
@Autowired
public void setAssemblyDao(PrAssemblyPlanMapper assemblyDao) {
this.assemblyDao = assemblyDao;
}
+ @Autowired
+ private void setBaUserDao(BaUserMapper baUserDao){
+ this.baUserDao = baUserDao;
+ }
+ @Autowired
+ private void setPltStationDao(PltStationMapper pltStationDao){
+ this.pltStationDao = pltStationDao;
+ }
+ @Autowired
+ private void setStaAssemblyWorkHistoryDao(StaAssemblyWorkHistoryMapper assemblyWorkHistoryDao){
+ this.assemblyWorkHistoryDao = assemblyWorkHistoryDao;
+ }
+ @Autowired
+ 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 String isStationUsed(StaAssemblyWorkLast last){
- String stationId = "";
- String userId = "";
- //鍒ゆ柇鍝釜鏄汉鍛�, 鍝釜鏄伐绔欎俊鎭�
- /* if(last.getStationId() != null && last.getStationId().toString().startsWith("103")){
-
+ public BaUser getUserInfo(String id){
+ Long userId = null;
+ if(StringUtils.isBlank(id)){
+ throw new RuntimeException("鍛樺伐缂栫爜涓嶈兘涓虹┖");
}
- if(last.getUserId() != null && last.getStationId().toString().startsWith("103")){
-
+ //鐢ㄦ埛101
+ if(id.startsWith("101")){
+ userId = Long.parseLong(id.toString().substring(3));
+ }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 +"鍦ㄧ郴缁熷凡绂佺敤,璇峰厛鍚敤鍛樺伐");
+ }
+ return userInfo;
+ }
+
+ public PltStation getStationInfo(String id){
+ Long stationId = null;
+ if(StringUtils.isBlank(id)){
+ throw new RuntimeException("宸ョ珯缂栫爜涓嶈兘涓虹┖");
+ }
+ //宸ョ珯103
+ if(id.startsWith("103")){
+ stationId = Long.parseLong(id.toString().substring(3));
+ }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 +"鍦ㄧ郴缁熷凡绂佺敤,璇峰厛鍚敤宸ョ珯");
+ }
+ return stationInfo;
+ }
+ 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")){
+ stationInfo = getStationInfo(last.getUserId());
+ }else{
+ userInfo = getUserInfo(last.getUserId());
+ }
+ 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{
+ result.setUserId(userInfo.getId());
+ result.setUserName(userInfo.getName());
+ result.setStationId(stationInfo.getId());
+ result.setStationName(stationInfo.getName());
+ result.setLineId(stationInfo.getLineId());
+ }
+ return result;
+ }
+ @Transactional
+ public StaAssemblyWorkLast save(QueryVo last) {
+ //鍏坈heck
+ StaAssemblyWorkLast checkResult = checkStationUsed(last);
+ //鏍￠獙planId processId nodeId
PrAssemblyPlan params = new PrAssemblyPlan();
params.setStatus(1);
- List<PrAssemblyPlan> list = sv.selectList(params);
- return BaseResponseUtils.buildSuccess(list);
-
-
- log.info("鑾峰彇宸ョ珯缂栧彿");
- String maxCode = dao.selectMaxCode();
- if (StringUtils.isBlank(maxCode)) {
- return DEFAULT_CODE;
- } else {
- int nextCode = Integer.parseInt(maxCode) + 1;
- // 妫�鏌ユ孩鍑�
- if (nextCode > 9999) {
- throw new RuntimeException("宸ョ珯缂栧彿婧㈠嚭");
- }
- return String.format(CODE_FORMAT, nextCode);
- }*/
- return "OK";
+ 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("鑺傜偣淇℃伅鏈夎鎴栬鍏朵粬浜哄憳淇敼,璇烽噸鏂伴�夋嫨鑺傜偣淇℃伅");
+ }
+ 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{
+ //淇濆瓨涓�鏉istory?
+ 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);
+ }
+ if (count <= 0) {
+ throw new RuntimeException("鏁版嵁搴撳瓨鍌ㄥけ璐�");
+ }
+ StaAssemblyWorkLast result = assemblyWorkLastDao.selectList(staLast).get(0);
+ return result;
}
-
- public List<PrAssemblyPlan> selectList(PrAssemblyPlan params){
- List<PrAssemblyPlan> planList = assemblyDao.selectList(params);
+ @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 -> {
+ 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;
+ }
+}
\ No newline at end of file
--
Gitblit v1.8.0