From ddd56a8f37eb47d933a7064be9341feb8dbd8165 Mon Sep 17 00:00:00 2001
From: Fancy <Fancy.fx@outlook.com>
Date: 星期四, 04 七月 2024 16:51:34 +0800
Subject: [PATCH] edit params and file Api
---
pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/workOrder/WorkOrderSv.java | 102 +++++++--------------------------------------------
1 files changed, 14 insertions(+), 88 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 908012b..43f84fd 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,28 +2,21 @@
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;
@@ -49,10 +42,6 @@
private StaAssemblyWorkHistoryMapper assemblyWorkHistoryDao;
private PrProductionNodeMapper nodeDao;
private PltProductMapper productDao;
- private FileOperate fileOperate;
- private OthFileMapper othFileMapper;
- @Value("${dy.webFile.fmUrl}")
- private String fmUrl;
@Autowired
public void setAssemblyDao(PrAssemblyPlanMapper assemblyDao) {
@@ -89,15 +78,6 @@
this.productDao = productDao;
}
- @Autowired
- public void setFileOperate(FileOperate fileOperate) {
- this.fileOperate = fileOperate;
- }
-
- @Autowired
- public void setOthFileMapper(OthFileMapper othFileMapper) {
- this.othFileMapper = othFileMapper;
- }
public BaUser getUserInfo(String id) {
Long userId = null;
@@ -154,6 +134,17 @@
List<StaAssemblyWorkLast> workLasts = assemblyWorkLastDao.selectList(param);
if (workLasts.size() > 0) {
BeanUtils.copyProperties(workLasts.get(0), result);
+ //鏍￠獙planId processId nodeId
+ /*PrAssemblyPlan assyPlan = assemblyDao.selectByPrimaryKey(workLasts.get(0).getPlanId());
+ if (assyPlan == null) {
+ throw new RuntimeException("缁勮浠诲姟宸茬粡鍦ㄧ郴缁熶腑鍒犻櫎璇锋鏌�,璇峰厛鍒扮櫥鍑虹晫闈㈣В闄ゅ伐绔欏崰鐢� ,鍐嶉噸鏂版壂鎻�");
+ }
+ boolean hasNodeId = assyPlan.getProcess().getNodes().stream()
+ .anyMatch(node -> node.id.equals(workLasts.get(0).getNodeId()));
+ if (!hasNodeId) {
+ throw new RuntimeException("鑺傜偣淇℃伅鏈夎鎴栬鍏朵粬浜哄憳淇敼,,璇峰厛鍒扮櫥鍑虹晫闈㈣В闄ゅ伐绔欏崰鐢� ,鍐嶉噸鏂版壂鎻�");
+ }
+ result.setPlan(assyPlan);*/
} else {
result.setStationId(stationInfo.getId());
result.setStationName(stationInfo.getName());
@@ -225,6 +216,7 @@
if (!hasNodeId) {
throw new RuntimeException("鑺傜偣淇℃伅鏈夎鎴栬鍏朵粬浜哄憳淇敼,璇烽噸鏂伴�夋嫨鑺傜偣淇℃伅");
}
+
//鎬庝箞灏嗗彧鍖呭惈杩欎釜鑺傜偣鐨勪俊鎭叏閮ㄥ洖浼犲憿
vo.setLineId(checkResult.getLineId());
StaAssemblyWorkLast staLast = new StaAssemblyWorkLast();
@@ -242,8 +234,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());
@@ -290,20 +282,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 蹇呬紶鍙傛暟
@@ -391,57 +369,5 @@
return assistantList;
}
- //鏍规嵁鑺傜偣鏌ュ嚭鑺傜偣浣滀笟鎸囧涔�
- public PrProductionNode getSopByNodeId(String nodeId) {
- if(StringUtils.isBlank(nodeId)){
- throw new RuntimeException("鑺傜偣ID涓嶈兘涓虹┖");
- }
- PrProductionNode node = nodeDao.selectByPrimaryKey(Long.parseLong(nodeId));
- if(node == null){
- throw new RuntimeException("鑺傜偣ID涓嶅瓨鍦�,璇锋鏌�");
- }
- if(node.instruction != null){
- addUrl(node.instruction);
- }
- return node;
- }
- // 鏍规嵁浜у搧鏌ュ嚭浜у搧鏂囦欢 涓昏鎶�鏈弬鏁� 鍚� platform-->product-->productSv
- public PltProduct getFileByProId(String proId) {
- if(StringUtils.isBlank(proId)){
- throw new RuntimeException("浜у搧ID涓嶈兘涓虹┖");
- }
- PltProduct product = productDao.selectByPrimaryKey(Long.parseLong(proId));
- if(product == null){
- throw new RuntimeException("浜у搧ID涓嶅瓨鍦�,璇锋鏌�");
- }
- product = addWebUrl(product);
- return product;
- }
- private PltProduct addWebUrl(PltProduct pro) {
- if (pro != null) {
- if (pro.image != null) {
- String filePathWithWebUrl = getFilePathWithWebUrl(pro.image);
- pro.imageWebPath = filePathWithWebUrl;
- pro.imageWebPathZip = fileOperate.getImgFileZipPath(filePathWithWebUrl);
- }
-
- pro.proFiles.stream().forEach(doc -> {
- OthFile file = othFileMapper.selectByPrimaryKey(doc.fileId);
- if (file == null) {
- return;
- }
- FileRestVo fileRestVo = fileOperate.parseHashcode(fmUrl, file.hash);
- doc.webUrl = fileRestVo.fileSysRestUrl + fileRestVo.fileWebDownloadPath + doc.fileId;
- doc.orgName = file.orgName;
- doc.extName = file.extName;
- });
- }
- return pro;
- }
- private String getFilePathWithWebUrl(Long fileId) {
- OthFile file = othFileMapper.selectByPrimaryKey(fileId);
- FileRestVo fileRestVo = fileOperate.parseHashcode(fmUrl, file.hash);
- return fileRestVo.fileWebUrl + file.filePath;
- }
}
\ No newline at end of file
--
Gitblit v1.8.0