From 398007a3e6815bd9543a22fbfe53b1db882abbe9 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 27 五月 2025 11:02:44 +0800
Subject: [PATCH] 排班设置时，关联查询生产任务，修改其中的排序算法，任务是倒序，流程结点是升序
---
pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoPr/PrProductionNode.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
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..497b981 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;
/**
@@ -75,11 +75,11 @@
/**
* 璁板綍璁惧鍛ㄦ湡鍐呭
*/
- public String equipCycleContent;
+ public String deviceCycleContent;
@AssertTrue(message = "璇疯緭鍏ヨ褰曡澶囧懆鏈熷唴瀹�")
- public boolean isEquipCycleContentValid() {
- return !isRecord || (isRecord && StringUtils.isNotBlank(equipCycleContent));
+ public boolean isDeviceCycleContentValid() {
+ return !isRecord || (isRecord && StringUtils.isNotBlank(deviceCycleContent));
}
/**
@@ -94,5 +94,7 @@
@TableField(exist = false)
public PrWorkingInstruction instruction;
+ @TableField(exist = false)
+ public PrBillOfMaterial bill;
}
\ No newline at end of file
--
Gitblit v1.8.0