From eead3af59c94c35422463fbbd19d26dffcbacc06 Mon Sep 17 00:00:00 2001
From: Fancy <Fancy.fx@outlook.com>
Date: 星期五, 05 七月 2024 09:35:28 +0800
Subject: [PATCH] edit work last
---
pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/workOrder/WorkOrderSv.java | 96 +++++++++++++++++++++++++++--------------------
1 files changed, 55 insertions(+), 41 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 e75269d..feabcb0 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,25 +2,22 @@
import com.alibaba.excel.util.StringUtils;
import com.dy.pmsGlobal.daoBa.BaUserMapper;
-import com.dy.pmsGlobal.daoOth.OthFileMapper;
+import com.dy.pmsGlobal.daoPlt.PltProductMapper;
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.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;
@@ -44,10 +41,8 @@
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;
@Autowired
public void setAssemblyDao(PrAssemblyPlanMapper assemblyDao) {
@@ -75,14 +70,15 @@
}
@Autowired
- public void setFileOperate(FileOperate fileOperate) {
- this.fileOperate = fileOperate;
+ public void setNodeDao(PrProductionNodeMapper nodeDao) {
+ this.nodeDao = nodeDao;
}
@Autowired
- public void setOthFileMapper(OthFileMapper othFileMapper) {
- this.othFileMapper = othFileMapper;
+ public void setPltProductDao(PltProductMapper productDao) {
+ this.productDao = productDao;
}
+
public BaUser getUserInfo(String id) {
Long userId = null;
@@ -139,12 +135,35 @@
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());
+ //鏍￠獙planId processId nodeId
+ PrAssemblyPlan assyPlan = assemblyDao.selectByPrimaryKey(workLasts.get(0).getPlanId());
+ if (assyPlan == null) {
+ //鐩存帴鍒犻櫎璁板綍
+ logout(workLasts.get(0).getId().toString());
+ }
+ boolean hasNodeId = assyPlan.getProcess().getNodes().stream()
+ .anyMatch(node -> node.id.equals(workLasts.get(0).getNodeId()));
+ if (!hasNodeId) {
+ //鐩存帴鍒犻櫎璁板綍
+ logout(workLasts.get(0).getId().toString());
+ } 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) {
+ throw new RuntimeException("浜у搧淇℃伅鏈夎鎴栬鍏朵粬浜哄憳淇敼,璇风櫥褰曠鐞嗙郴缁熸煡鐪嬩换鍔″叧鑱斾骇鍝両D涓�:" + assyPlan.getProId());
+ }
+ result.setProName(product.getName());
+ String devicePrefix = "110" + 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;
}
@@ -202,7 +221,7 @@
StaAssemblyWorkLast checkResult = checkUserAndStationUsed(vo);
//鏍￠獙planId processId nodeId
PrAssemblyPlan assyPlan = assemblyDao.selectByPrimaryKey(vo.getPlanId());
- if(assyPlan == null){
+ if (assyPlan == null) {
throw new RuntimeException("缁勮浠诲姟宸茬粡鍦ㄧ郴缁熶腑鍒犻櫎璇锋鏌�,鍒锋柊骞堕噸鏂伴�夋嫨浠诲姟");
}
boolean hasNodeId = assyPlan.getProcess().getNodes().stream()
@@ -210,6 +229,7 @@
if (!hasNodeId) {
throw new RuntimeException("鑺傜偣淇℃伅鏈夎鎴栬鍏朵粬浜哄憳淇敼,璇烽噸鏂伴�夋嫨鑺傜偣淇℃伅");
}
+
//鎬庝箞灏嗗彧鍖呭惈杩欎釜鑺傜偣鐨勪俊鎭叏閮ㄥ洖浼犲憿
vo.setLineId(checkResult.getLineId());
StaAssemblyWorkLast staLast = new StaAssemblyWorkLast();
@@ -227,8 +247,8 @@
} else {
//淇濆瓨涓�鏉istory?
BeanUtils.copyProperties(checkResult, staLast);
- staLast.setPlanId(vo.getPlanId());
- staLast.setProcessId(vo.getProcessId());
+ staLast.setPlanId(assyPlan.getId());
+ staLast.setProcessId(assyPlan.getProcess().getId());
staLast.setNodeId(vo.getNodeId());
staLast.setStatus(STATUS_NORMAL);
staLast.setStartTime(new Date());
@@ -238,10 +258,19 @@
throw new RuntimeException("鏁版嵁搴撳瓨鍌ㄥけ璐�");
}
StaAssemblyWorkLast result = assemblyWorkLastDao.selectByPrimaryKey(staLast.getId());
- List<PrProductionNode> nodeInfo =assyPlan.getProcess().getNodes().stream()
+ List<PrProductionNode> nodeInfo = assyPlan.getProcess().getNodes().stream()
.filter(node -> node.id.equals(vo.getNodeId())).collect(Collectors.toList());
- assyPlan.getProcess().setNodes(nodeInfo);
- result.setPlan(assyPlan);
+ 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;
}
@@ -275,20 +304,6 @@
});
});*/
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 蹇呬紶鍙傛暟
@@ -375,7 +390,6 @@
List<BaUser> assistantList = baUserDao.selectByAssistants(workLast.getAssistants());
return assistantList;
}
- //鏍规嵁鑺傜偣鐨勬煡鍑鸿妭鐐逛綔涓氭寚瀵间功
- // 鏍规嵁浜у搧鏌ュ嚭浜у搧鏂囦欢 涓昏鎶�鏈弬鏁�
+
}
\ No newline at end of file
--
Gitblit v1.8.0