From e0f95175eedba97650eab2221ea7fe1c4d4b78f9 Mon Sep 17 00:00:00 2001
From: xhj <xhjzrq@163.com>
Date: Sat, 14 Sep 2024 11:25:38 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/pgd/PgdSljhController.java       | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/dsic/gj_erp/controller/pgd/PgdSljhController.java b/src/main/java/com/dsic/gj_erp/controller/pgd/PgdSljhController.java
index 360733a..c85224e 100644
--- a/src/main/java/com/dsic/gj_erp/controller/pgd/PgdSljhController.java
+++ b/src/main/java/com/dsic/gj_erp/controller/pgd/PgdSljhController.java
@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.dsic.gj_erp.annotation.AuthFunction;
 import com.dsic.gj_erp.bean.ResultBean;
 import com.dsic.gj_erp.bean.fd.DmCzjbb;
+import com.dsic.gj_erp.bean.jcsj.DmCbxxp;
 import com.dsic.gj_erp.bean.jhgk.DmYdjh;
 import com.dsic.gj_erp.bean.kc.ImCkwpkwp;
 import com.dsic.gj_erp.bean.kc.SlKc;
@@ -20,6 +21,7 @@ import com.dsic.gj_erp.dao.sy.Dm_zhbmpRepository;
 import com.dsic.gj_erp.exception.CustomException;
 import com.dsic.gj_erp.mapper.kc.ImCkwpkwpMapper;
 import com.dsic.gj_erp.service.fd.DmCzjbbService;
+import com.dsic.gj_erp.service.jcsj.DmCbxxpService;
 import com.dsic.gj_erp.service.jhgk.DmYdjhService;
 import com.dsic.gj_erp.service.kc.ImCkwpkwpService;
 import com.dsic.gj_erp.service.pgd.PgdSljhService;
@@ -60,8 +62,13 @@ public class PgdSljhController {
     @Autowired
     ImCkwpkwpService  imCkwpkwpService;
 
+//    @Autowired
+//    DmCzjbbService dmCzjbbService;
     @Autowired
-    DmCzjbbService dmCzjbbService;
+    DmCbxxpService dmCbxxpService;
+
+
+
 
     @Autowired
     SYService syService;
@@ -210,10 +217,10 @@ public class PgdSljhController {
 
          List<DmYdjh> ydjhs = dmYdjhService.list(qw);
         // 查询上料计划
-        List<DmCzjbb> czList = dmCzjbbService.list();
+        List<DmCbxxp> czList = dmCbxxpService.list();
         for(DmYdjh dmYdjh :ydjhs){
             String cjs="";
-            DmCzjbb dmCzjbb = czList.stream().filter(fst -> fst.getCzbh().equalsIgnoreCase(dmYdjh.getDcCh())).findFirst().orElse(null);
+            DmCbxxp dmCzjbb = czList.stream().filter(fst -> fst.getCbbm().equalsIgnoreCase(dmYdjh.getDcCh())).findFirst().orElse(null);
 
             if(null!=dmCzjbb){
                 cjs=dmCzjbb.getCjs();
@@ -247,14 +254,14 @@ public class PgdSljhController {
         String str1= JSON.toJSONString(map.get("data2"));
         List<DmYdjh>ydjhs= JSONObject.parseArray(str1, DmYdjh.class);
 
-        List<DmCzjbb> czList = dmCzjbbService.list();
+        List<DmCbxxp> czList = dmCbxxpService.list();
         List<DmYdjh>ydupList=new ArrayList<>();
         List<SlKc>ckupList=new ArrayList<>();
         // 进行比对
         for(SlKc slKc :slKcs){
             // 获取船级社
             String cjs="";
-            DmCzjbb dmCzjbb = czList.stream().filter(fst -> fst.getCzbh().equalsIgnoreCase(slKc.getDCCH())).findFirst().orElse(null);
+            DmCbxxp dmCzjbb = czList.stream().filter(fst -> fst.getCbbm().equalsIgnoreCase(slKc.getDCCH())).findFirst().orElse(null);
 
             if(null!=dmCzjbb){
                 cjs=dmCzjbb.getCjs();