From ee673c3e71b28598d45074a9df2a93ea057b6b65 Mon Sep 17 00:00:00 2001
From: Fancy <Fancy.fx@outlook.com>
Date: 星期一, 24 六月 2024 14:41:29 +0800
Subject: [PATCH] debug edit
---
pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/workOrder/WorkOrderSv.java | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 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 503fef2..2168a9a 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
@@ -5,17 +5,14 @@
import com.dy.pmsGlobal.daoOth.OthFileMapper;
import com.dy.pmsGlobal.daoPlt.PltStationMapper;
import com.dy.pmsGlobal.daoPr.PrAssemblyPlanMapper;
-import com.dy.pmsGlobal.daoPr.PrProductionNodeMapper;
-import com.dy.pmsGlobal.daoPr.PrProductionProcessMapper;
-import com.dy.pmsGlobal.daoPr.PrWorkingInstructionMapper;
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.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.StaAssemblyWorkLast;
import lombok.extern.slf4j.Slf4j;
@@ -27,6 +24,7 @@
import java.util.Date;
import java.util.List;
+import java.util.concurrent.atomic.AtomicLong;
import java.util.stream.Collectors;
@Slf4j
@@ -143,6 +141,8 @@
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());
@@ -159,9 +159,12 @@
params.setId(last.getPlanId());
params.setProcessId(last.getProcessId());
List<PrAssemblyPlan> planList = selectAssyPlanList(params);
- planList.stream().forEach(process -> {
- process.nodes.stream().filter(node -> node.id == last.getNodeId());
- });
+ 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);
--
Gitblit v1.8.0