From c0196699feecdf24e4364df05b312658c23da1ea Mon Sep 17 00:00:00 2001
From: Fancy <Fancy.fx@outlook.com>
Date: 星期二, 09 七月 2024 14:42:56 +0800
Subject: [PATCH] AssemblyStepSv save edit
---
pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/assemblyStep/QueryVo.java | 7 -------
pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/assemblyStep/AssemblyStepSv.java | 4 ++--
2 files changed, 2 insertions(+), 9 deletions(-)
diff --git a/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/assemblyStep/AssemblyStepSv.java b/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/assemblyStep/AssemblyStepSv.java
index bc5a943..f7d2c49 100644
--- a/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/assemblyStep/AssemblyStepSv.java
+++ b/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/assemblyStep/AssemblyStepSv.java
@@ -207,7 +207,7 @@
record.currNode = workLast.nodeId;
record.updatedBy = workLast.userId;
- record.assistants = params.assistants;
+ record.assistants = workLast.assistants;
record.errorMsg = params.errorMsg;
PrProductionNode node = nodeDao.selectByPrimaryKey(workLast.nodeId);
@@ -215,7 +215,7 @@
if (node.isRecord) {
record.deviceCycleContent = node.deviceCycleContent;
}
- record.status = getStatus(params.status, node.isEnd,params.workType);
+ record.status = getStatus(params.status, node.isEnd,workLast.workType.toString());
return record;
}
diff --git a/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/assemblyStep/QueryVo.java b/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/assemblyStep/QueryVo.java
index 9e8e56b..cf50dc4 100644
--- a/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/assemblyStep/QueryVo.java
+++ b/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/assemblyStep/QueryVo.java
@@ -21,11 +21,4 @@
* 娴嬭瘯鎴栧搧妫�杩斿洖鐨勯敊璇俊鎭�
*/
public String errorMsg;
- /**
- * 杈呭姪浜哄憳
- */
- public String assistants;
- @NotNull(message = "宸ヤ綔绫诲瀷涓嶈兘涓虹┖")
- public String workType;
-
}
--
Gitblit v1.8.0