From 5d7abb78a5990cc43b336e82724c8946de99d95d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E5=93=B2=E5=A5=87?= <13840175730@139.com>
Date: Mon, 16 Dec 2024 21:14:41 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8Dbug=202.=E4=B8=8A=E6=96=99?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=AF=AD=E9=9F=B3=E6=8A=A5=E5=B7=A5=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/jhgk/impl/DmSygdMxServiceImpl.java     | 14 +++++++-------
 .../service/jhgk/impl/YdjhImportService.java       | 14 +++++++-------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmSygdMxServiceImpl.java b/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmSygdMxServiceImpl.java
index c80b737..bb08547 100644
--- a/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmSygdMxServiceImpl.java
+++ b/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmSygdMxServiceImpl.java
@@ -101,13 +101,13 @@ public class DmSygdMxServiceImpl extends ServiceImpl<DmSygdMxMapper, DmSygdMx> i
                 .between(DmSygdMx::getJssj, from, to)
         );
         if (ObjectUtil.isNotEmpty(sygdMxes)){
-            List<DmSygdMx> collect = sygdMxes.stream().map(dmSygd -> {
-                DmSygdMx dmSygdMx = new DmSygdMx();
-                dmSygdMx.setId(dmSygd.getId());
-                dmSygdMx.setZt("2");
-                return dmSygdMx;
-            }).collect(Collectors.toList());
-            this.updateBatchById(collect);
+//            List<DmSygdMx> collect = sygdMxes.stream().map(dmSygd -> {
+//                DmSygdMx dmSygdMx = new DmSygdMx();
+//                dmSygdMx.setId(dmSygd.getId());
+//                dmSygdMx.setZt("2");
+//                return dmSygdMx;
+//            }).collect(Collectors.toList());
+//            this.updateBatchById(collect);
 
             //生成作业计划
             List<DmYdjh> dmYdjhs = this.generateYdjh(sygdMxes);
diff --git a/src/main/java/com/dsic/gj_erp/service/jhgk/impl/YdjhImportService.java b/src/main/java/com/dsic/gj_erp/service/jhgk/impl/YdjhImportService.java
index fd986c1..6a1986c 100644
--- a/src/main/java/com/dsic/gj_erp/service/jhgk/impl/YdjhImportService.java
+++ b/src/main/java/com/dsic/gj_erp/service/jhgk/impl/YdjhImportService.java
@@ -68,13 +68,13 @@ public class YdjhImportService extends ServiceImpl<DmSygdMxMapper, DmSygdMx> {
 //                    .eq("pl", dcPl)
 //            );
         });
-//        List<YdjhImport> qwb = ydjhImports.stream()
-//                .filter(YdjhImport::isAvailable)
-//                .filter(item -> !item.getDcPl().contains("-"))//去除T型材
-//                .filter(item -> !item.getDcPl().contains("/"))//去除T型材
-//                .filter(item -> StrUtil.isNotEmpty(item.getDcFd()))
-//                .filter(item -> item.getDcPl().contains("Q")).collect(Collectors.toList());
-//        this.execute(qwb);
+        List<YdjhImport> qwb = ydjhImports.stream()
+                .filter(YdjhImport::isAvailable)
+                .filter(item -> !item.getDcPl().contains("-"))//去除T型材
+                .filter(item -> !item.getDcPl().contains("/"))//去除T型材
+                .filter(item -> StrUtil.isNotEmpty(item.getDcFd()))
+                .filter(item -> item.getDcPl().contains("Q")).collect(Collectors.toList());
+        this.execute(qwb);
 
         List<YdjhImport> list = ydjhImports.stream()
                 .filter(YdjhImport::isAvailable)