From 2a3f0c85d1d9a2977fb60b90938234179d600560 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, 12 Sep 2024 10:47:29 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E5=88=92=E7=BA=BF=E5=88=87?=
 =?UTF-8?q?=E5=89=B2=E7=95=8C=E9=9D=A2=E6=93=8D=E4=BD=9C=E6=97=B6=E6=9D=BF?=
 =?UTF-8?q?=E6=9D=90=E5=9B=BE=E7=89=87=E9=94=99=E4=BD=8D=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=202.=E4=B8=8A=E6=96=99=E7=90=86=E6=96=99=E5=8F=8D=E9=A6=88?=
 =?UTF-8?q?=E6=97=B6=E5=A2=9E=E5=8A=A0=E4=BD=9C=E4=B8=9A=E8=AE=A1=E5=88=92?=
 =?UTF-8?q?id=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/dsic/gj_erp/bean/zyjh/YcldwInfo.java    | 2 ++
 .../com/dsic/gj_erp/controller/zyjh/dto/ShangLiao.java    | 1 +
 .../dsic/gj_erp/service/jhgk/impl/DmYdjhServiceImpl.java  | 8 --------
 3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/dsic/gj_erp/bean/zyjh/YcldwInfo.java b/src/main/java/com/dsic/gj_erp/bean/zyjh/YcldwInfo.java
index ae5f25f..b08bb4f 100644
--- a/src/main/java/com/dsic/gj_erp/bean/zyjh/YcldwInfo.java
+++ b/src/main/java/com/dsic/gj_erp/bean/zyjh/YcldwInfo.java
@@ -20,6 +20,8 @@ public class YcldwInfo {
 
     private Integer dwId;
     private Integer ceng;
+
+    private String ydid;
     private String czbh;
     private String pl;
     private String fd;
diff --git a/src/main/java/com/dsic/gj_erp/controller/zyjh/dto/ShangLiao.java b/src/main/java/com/dsic/gj_erp/controller/zyjh/dto/ShangLiao.java
index 2eab0ac..f26b074 100644
--- a/src/main/java/com/dsic/gj_erp/controller/zyjh/dto/ShangLiao.java
+++ b/src/main/java/com/dsic/gj_erp/controller/zyjh/dto/ShangLiao.java
@@ -17,6 +17,7 @@ public class ShangLiao {
     private String pgdId;//只完成即可
 
     private Integer dwId;
+    private String ydid;
     private Integer ceng;
     private String czbh;
     private String pl;
diff --git a/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmYdjhServiceImpl.java b/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmYdjhServiceImpl.java
index a72d26d..ee125b0 100644
--- a/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmYdjhServiceImpl.java
+++ b/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmYdjhServiceImpl.java
@@ -248,11 +248,7 @@ public class DmYdjhServiceImpl extends ServiceImpl<DmYdjhMapper, DmYdjh> impleme
             );
 
             // 生成 数据
-//            baseMapper.xfbc(list);
             baseMapper.getTzjh(list,bzry,bzrq);
-            baseMapper.getSljh(list,bzry,bzrq);
-            baseMapper.getPwjh(list,bzry,bzrq);
-            baseMapper.getQgjh(list,bzry,bzrq);
 
             baseMapper.tqlj(list);
             do {
@@ -261,11 +257,7 @@ public class DmYdjhServiceImpl extends ServiceImpl<DmYdjhMapper, DmYdjh> impleme
                 this.update(new UpdateWrapper<DmYdjh>().set("zt", "2")
                         .in("id", list1)
                 );
-//                baseMapper.xfbc(list1);
                 baseMapper.getTzjh(list1,bzry,bzrq);
-                baseMapper.getSljh(list1,bzry,bzrq);
-                baseMapper.getPwjh(list1,bzry,bzrq);
-                baseMapper.getQgjh(list1,bzry,bzrq);
 
                 baseMapper.tqlj(list1);
             }while (index.get()>1);