diff --git a/src/main/java/com/dsic/gj_erp/bean/czzj/MpDhsj.java b/src/main/java/com/dsic/gj_erp/bean/czzj/MpDhsj.java index 5eec5b2..53727d7 100644 --- a/src/main/java/com/dsic/gj_erp/bean/czzj/MpDhsj.java +++ b/src/main/java/com/dsic/gj_erp/bean/czzj/MpDhsj.java @@ -74,7 +74,7 @@ public class MpDhsj { mp.setWpjb("L"); mp.setGzlx("M"); mp.setGzbm("3K"); - mp.setZt("1"); + mp.setZt("0"); mp.setXdtz("0"); mp.setHxfl("B"); mp.setDhsl1("0"); diff --git a/src/main/java/com/dsic/gj_erp/controller/zyjh/ZyjhController.java b/src/main/java/com/dsic/gj_erp/controller/zyjh/ZyjhController.java index 6814e36..5c8ec52 100644 --- a/src/main/java/com/dsic/gj_erp/controller/zyjh/ZyjhController.java +++ b/src/main/java/com/dsic/gj_erp/controller/zyjh/ZyjhController.java @@ -285,6 +285,7 @@ public class ZyjhController { continue; } + Map mpsycljljbp = zyjhService.getMPSYCLJLJBP(item.getDcCh(), item.getTzbh()); //质量跟踪数据 List collect = new ArrayList<>(); String date = DateUtil.date().toString("yyyy/MM/dd"); @@ -295,6 +296,9 @@ public class ZyjhController { MpDhsj mpDhsj = MpDhsj.of(item2, date, item.getSllph()); String xh = StrUtil.padPre(j + 1 + "", 3, "0"); mpDhsj.setDhh(mpDhsjDhh+"-"+xh); + if (ObjUtil.isNotEmpty(mpsycljljbp)) { + mpDhsj.setGysbh("BZGY-"+mpsycljljbp.get("gzzx3")); + } collect.add(mpDhsj); } } diff --git a/src/main/java/com/dsic/gj_erp/mapper/jhgk/DmYdjhMapper.java b/src/main/java/com/dsic/gj_erp/mapper/jhgk/DmYdjhMapper.java index 30bdde7..858b28c 100644 --- a/src/main/java/com/dsic/gj_erp/mapper/jhgk/DmYdjhMapper.java +++ b/src/main/java/com/dsic/gj_erp/mapper/jhgk/DmYdjhMapper.java @@ -72,4 +72,6 @@ public interface DmYdjhMapper extends BaseMapper { void xzylbs(String dcch,String dcpl); void updatezyq(String dcch,String dcpl); + + Map getMPSYCLJLJBP(String dcCh,String tzbh); } diff --git a/src/main/java/com/dsic/gj_erp/service/zyjh/ZyjhService.java b/src/main/java/com/dsic/gj_erp/service/zyjh/ZyjhService.java index 8277a7e..6949f86 100644 --- a/src/main/java/com/dsic/gj_erp/service/zyjh/ZyjhService.java +++ b/src/main/java/com/dsic/gj_erp/service/zyjh/ZyjhService.java @@ -40,6 +40,10 @@ public class ZyjhService extends ServiceImpl { private static final String MPDHSJ_KEY="MPDHSJ"; + public Map getMPSYCLJLJBP(String dcCh,String tzbh){ + return baseMapper.getMPSYCLJLJBP(dcCh,tzbh); + } + public String getMpDhsjDhh(){ String date=DateUtil.date().toString("yyyyMMdd"); Object xh = redisTemplate.opsForHash().get(MPDHSJ_KEY, date); diff --git a/src/main/resources/mappers/jhgk/DmYdjhMapper.xml b/src/main/resources/mappers/jhgk/DmYdjhMapper.xml index 7fa4fb0..fdf4fdb 100644 --- a/src/main/resources/mappers/jhgk/DmYdjhMapper.xml +++ b/src/main/resources/mappers/jhgk/DmYdjhMapper.xml @@ -1062,6 +1062,87 @@ where dc_ch=#{dcch} and dc_pl =#{dcpl} order by dc_ch,dc_pl + + UPDATE dm_ydjh set dm_ydjh.ylbs=dm_bchxylp.sfyl