From 98d977d95614c1687e53ad118f3dbcfd3a6fda79 Mon Sep 17 00:00:00 2001
From: sunhao <479527147@qq.com>
Date: Tue, 14 Jan 2025 09:13:15 +0800
Subject: [PATCH] 1

---
 .../net/xdclass/shopmanager/controller/SubController.java  | 2 +-
 .../main/java/net/xdclass/shopmanager/model/GCalGrp.java   | 7 +++++++
 .../java/net/xdclass/shopmanager/model/GGrpCalRslt.java    | 5 +++++
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/1024shop-manager/1024shop-manager/src/main/java/net/xdclass/shopmanager/controller/SubController.java b/1024shop-manager/1024shop-manager/src/main/java/net/xdclass/shopmanager/controller/SubController.java
index f30e680..0a30f9e 100644
--- a/1024shop-manager/1024shop-manager/src/main/java/net/xdclass/shopmanager/controller/SubController.java
+++ b/1024shop-manager/1024shop-manager/src/main/java/net/xdclass/shopmanager/controller/SubController.java
@@ -480,7 +480,7 @@ public class SubController {
 
         //炉次化学成分
 
-        if (plistQeTqHeatcheStandResultDO.stream().anyMatch(p -> p.getPono().equals(SInfo.getPono()))) {
+        if (!plistQeTqHeatcheStandResultDO.stream().anyMatch(p -> p.getPono().equals(SInfo.getPono()))) {
             //ltQthsr=plistQeTqHeatcheStandResultDO.stream().filter(p->p.getPono().equals(SInfo.getPono())).collect(Collectors.toList());
             return false;
         }
diff --git a/1024shop-manager/1024shop-manager/src/main/java/net/xdclass/shopmanager/model/GCalGrp.java b/1024shop-manager/1024shop-manager/src/main/java/net/xdclass/shopmanager/model/GCalGrp.java
index c21becb..aee4377 100644
--- a/1024shop-manager/1024shop-manager/src/main/java/net/xdclass/shopmanager/model/GCalGrp.java
+++ b/1024shop-manager/1024shop-manager/src/main/java/net/xdclass/shopmanager/model/GCalGrp.java
@@ -10,6 +10,13 @@ import java.util.List;
 @Data
 @EqualsAndHashCode(callSuper = false)
 public class GCalGrp {
+
+    //板坯号
+    private String SlabNo;
+
+    //虚拟号
+    private String VirtualSlabNo;
+
     //合同号
     private int IDValue;
     //宽度
diff --git a/1024shop-manager/1024shop-manager/src/main/java/net/xdclass/shopmanager/model/GGrpCalRslt.java b/1024shop-manager/1024shop-manager/src/main/java/net/xdclass/shopmanager/model/GGrpCalRslt.java
index e3ce0c8..dad09b1 100644
--- a/1024shop-manager/1024shop-manager/src/main/java/net/xdclass/shopmanager/model/GGrpCalRslt.java
+++ b/1024shop-manager/1024shop-manager/src/main/java/net/xdclass/shopmanager/model/GGrpCalRslt.java
@@ -11,6 +11,11 @@ import java.util.List;
 @EqualsAndHashCode(callSuper = false)
 public class GGrpCalRslt {
 
+    //板坯号
+    private String SlabNo;
+    //虚拟号
+    private String VirtualSlabNo;
+
     //宽度
     private int Cal_Wid;
     //厚度