From bd2de27a5d0dbc8938856ba2cc9fd33a0dd170d7 Mon Sep 17 00:00:00 2001
From: Fancy <Fancy.fx@outlook.com>
Date: 星期二, 25 六月 2024 10:28:46 +0800
Subject: [PATCH] Station check
---
pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/workOrder/WorkOrderSv.java | 29 ++++++++++++++++++++++++++---
1 files changed, 26 insertions(+), 3 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 4cae111..cc7d0e4 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
@@ -90,8 +90,8 @@
}
return userInfo;
}
-
public PltStation getStationInfo(String id){
+ //浠呮鏌ュ伐绔欎俊鎭互鍙婂伐绔欏崰鐢ㄦ儏鍐�
Long stationId = null;
if(StringUtils.isBlank(id)){
throw new RuntimeException("宸ョ珯缂栫爜涓嶈兘涓虹┖");
@@ -110,7 +110,30 @@
}
return stationInfo;
}
- public StaAssemblyWorkLast checkStationUsed(QueryVo last){
+ public StaAssemblyWorkLast checkStationUsed(String id){
+ StaAssemblyWorkLast result = new StaAssemblyWorkLast();
+ PltStation stationInfo = null;
+ if(StringUtils.isBlank(id)){
+ throw new RuntimeException("宸ョ珯缂栫爜涓嶈兘涓虹┖,璇锋鏌�");
+ }
+ stationInfo = getStationInfo(id);
+ //妫�鏌ヨ〃涓璼tationId鏄惁宸茬粡瀛樺湪
+ StaAssemblyWorkLast param = new StaAssemblyWorkLast();
+ param.setStationId(stationInfo.getId());
+ param.setStatus(1);
+ 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());
+ }
+ return result;
+ }
+
+ public StaAssemblyWorkLast checkUserAndStationUsed(QueryVo last){
StaAssemblyWorkLast result = new StaAssemblyWorkLast();
PltStation stationInfo = null;
BaUser userInfo = null;
@@ -160,7 +183,7 @@
@Transactional
public StaAssemblyWorkLast save(QueryVo last) {
//鍏坈heck
- StaAssemblyWorkLast checkResult = checkStationUsed(last);
+ StaAssemblyWorkLast checkResult = checkUserAndStationUsed(last);
//鏍￠獙planId processId nodeId
PrAssemblyPlan params = new PrAssemblyPlan();
params.setStatus(1);
--
Gitblit v1.8.0