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 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 impleme this.update(new UpdateWrapper().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);