From af0ee4d30ae6cb2eee76ed9da7aad007edd4113f Mon Sep 17 00:00:00 2001
From: Fancy <Fancy.fx@outlook.com>
Date: 星期四, 27 六月 2024 11:12:32 +0800
Subject: [PATCH] some NotNull error
---
pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoPr/PrAssemblyPlan.java | 4 +---
pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/workOrder/WorkOrderSv.java | 4 ++--
pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoPr/PrProductionNode.java | 2 +-
3 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoPr/PrAssemblyPlan.java b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoPr/PrAssemblyPlan.java
index e654366..a98a9e2 100644
--- a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoPr/PrAssemblyPlan.java
+++ b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoPr/PrAssemblyPlan.java
@@ -53,9 +53,7 @@
public Long processId;
@TableField(exist = false)
- @Valid
- @NotEmpty(message = "娴佺▼鑺傜偣涓嶈兘涓虹┖")
- public List<PrProductionNode> nodes;
+ public PrProductionProcess process;
/**
* 鍚嶇О
diff --git a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoPr/PrProductionNode.java b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoPr/PrProductionNode.java
index 9a282c4..659f77c 100644
--- a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoPr/PrProductionNode.java
+++ b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoPr/PrProductionNode.java
@@ -51,7 +51,7 @@
/**
* 鎺掑簭
*/
- @NotNull(message = "鑺傜偣绫诲瀷涓嶈兘涓虹┖")
+ //@NotNull(message = "鑺傜偣绫诲瀷涓嶈兘涓虹┖")
public Integer nodeType;
/**
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 7f9c863..e0fc39b 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
@@ -191,7 +191,7 @@
params.setProcessId(vo.getProcessId());
List<PrAssemblyPlan> planList = selectAssyPlanList(params);
boolean hasNodeId= planList.stream()
- .flatMap(process -> process.nodes.stream())
+ .flatMap(process -> process.getProcess().getNodes().stream())
.anyMatch(node -> node.id.equals(vo.getNodeId()));
if(!hasNodeId){
throw new RuntimeException("鑺傜偣淇℃伅鏈夎鎴栬鍏朵粬浜哄憳淇敼,璇烽噸鏂伴�夋嫨鑺傜偣淇℃伅");
@@ -247,7 +247,7 @@
public List<PrAssemblyPlan> selectAssyPlanList(PrAssemblyPlan params){
List<PrAssemblyPlan> planList = assemblyDao.selectAssyPlanList(params);
planList.stream().forEach(process -> {
- process.nodes.forEach(node -> {
+ process.getProcess().getNodes().forEach(node -> {
if(node.instruction != null){
addUrl(node.instruction);
}
--
Gitblit v1.8.0