From af69f416ff531ea7fd7a22e02885bf9d78536f41 Mon Sep 17 00:00:00 2001
From: Fancy <Fancy.fx@outlook.com>
Date: 星期五, 05 七月 2024 08:38:31 +0800
Subject: [PATCH] add plan
---
pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/workOrder/WorkOrderSv.java | 20 +++++++++++---------
1 files changed, 11 insertions(+), 9 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 43f84fd..b01da47 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
@@ -135,22 +135,24 @@
if (workLasts.size() > 0) {
BeanUtils.copyProperties(workLasts.get(0), result);
//鏍￠獙planId processId nodeId
- /*PrAssemblyPlan assyPlan = assemblyDao.selectByPrimaryKey(workLasts.get(0).getPlanId());
+ PrAssemblyPlan assyPlan = assemblyDao.selectByPrimaryKey(workLasts.get(0).getPlanId());
if (assyPlan == null) {
- throw new RuntimeException("缁勮浠诲姟宸茬粡鍦ㄧ郴缁熶腑鍒犻櫎璇锋鏌�,璇峰厛鍒扮櫥鍑虹晫闈㈣В闄ゅ伐绔欏崰鐢� ,鍐嶉噸鏂版壂鎻�");
+ //鐩存帴鍒犻櫎璁板綍
+ logout(workLasts.get(0).getId().toString());
}
boolean hasNodeId = assyPlan.getProcess().getNodes().stream()
.anyMatch(node -> node.id.equals(workLasts.get(0).getNodeId()));
if (!hasNodeId) {
- throw new RuntimeException("鑺傜偣淇℃伅鏈夎鎴栬鍏朵粬浜哄憳淇敼,,璇峰厛鍒扮櫥鍑虹晫闈㈣В闄ゅ伐绔欏崰鐢� ,鍐嶉噸鏂版壂鎻�");
+ //鐩存帴鍒犻櫎璁板綍
+ logout(workLasts.get(0).getId().toString());
+ } else {
+ result.setPlan(assyPlan);
}
- result.setPlan(assyPlan);*/
- } else {
- result.setStationId(stationInfo.getId());
- result.setStationName(stationInfo.getName());
- result.setLineId(stationInfo.getLineId());
- result.setLineName(stationInfo.getLineName());
}
+ result.setStationId(stationInfo.getId());
+ result.setStationName(stationInfo.getName());
+ result.setLineId(stationInfo.getLineId());
+ result.setLineName(stationInfo.getLineName());
return result;
}
--
Gitblit v1.8.0