From 64fa99b6e5197fd2b15d80e0327fb58c32b232b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E5=93=B2=E5=A5=87?= <13840175730@139.com>
Date: Thu, 15 May 2025 14:48:44 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81,?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/dsic/gj_erp/bean/zyjh/DmYlInfo.java   |  2 +-
 .../gj_erp/controller/zyjh/YlController.java  | 21 ++++++++++++-------
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/dsic/gj_erp/bean/zyjh/DmYlInfo.java b/src/main/java/com/dsic/gj_erp/bean/zyjh/DmYlInfo.java
index e72e4d4..4e257c4 100644
--- a/src/main/java/com/dsic/gj_erp/bean/zyjh/DmYlInfo.java
+++ b/src/main/java/com/dsic/gj_erp/bean/zyjh/DmYlInfo.java
@@ -67,7 +67,7 @@ public class DmYlInfo {
         return StrUtil.isNotEmpty(this.余料编号) &&this.余料编号.equals(余料编号);
     }
 
-    public boolean 不指定余料编号的上料匹配(DmYdjh ydjh){
+    public boolean 上料匹配(DmYdjh ydjh){
         if (使用状态>0){
             return false;
         }
diff --git a/src/main/java/com/dsic/gj_erp/controller/zyjh/YlController.java b/src/main/java/com/dsic/gj_erp/controller/zyjh/YlController.java
index 97f0012..e7f7e89 100644
--- a/src/main/java/com/dsic/gj_erp/controller/zyjh/YlController.java
+++ b/src/main/java/com/dsic/gj_erp/controller/zyjh/YlController.java
@@ -17,6 +17,7 @@ import org.springframework.web.bind.annotation.*;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
@@ -99,22 +100,28 @@ public class YlController {
                 .eq(DmYdjh::getDcPl, dto.getDcPl())
                 .eq(StrUtil.isNotEmpty(dto.getTzbh()),DmYdjh::getTzbh,dto.getTzbh())
         );
-
         List<DmYlInfo> 匹配成功的余料信息=new ArrayList<>();
+
+        out:
         for (DmYdjh ydjh:list){
-            for (DmYlInfo ylInfo:dto.getYlList()){
-                if (ylInfo.指定余料编号的上料匹配("")){//暂时不支持,仅保留分支流程
-                    break;
+            for(DmYlInfo ylInfo:dto.getYlList()){
+                if (ylInfo.指定余料编号的上料匹配(ydjh.getYlbhgg())&&ylInfo.上料匹配(ydjh)){//暂时不支持,仅保留分支流程
+                    ylInfo.修正上料信息(ydjh);
+                    匹配成功的余料信息.add(ylInfo);
+                    continue out;
                 }
-
-                if (ylInfo.不指定余料编号的上料匹配(ydjh)){
+            }
+            for (DmYlInfo ylInfo:dto.getYlList()){
+                if (ylInfo.上料匹配(ydjh)){
                     ylInfo.修正上料信息(ydjh);
                     匹配成功的余料信息.add(ylInfo);
-                    break;
+                    continue out;
                 }
             }
         }
 
+
+
         return new ResultBean<>(匹配成功的余料信息);
     }
 }