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 5b0d5d1..5eec5b2 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 @@ -23,7 +23,7 @@ public class MpDhsj { private Double dhsl; - private String cpxql; + private Double cpxql; private String gysbh; @@ -62,13 +62,22 @@ public class MpDhsj { mp.setDcCh(lj.getCzbh()); mp.setDcPl(lj.getPl()); mp.setDcFd(lj.getCzbh()+"="+lj.getFd()); + mp.setDcZl(lj.getZl()); mp.setDcTh(lj.getTlth()); mp.setWph(lj.getLjbh()); mp.setDcTpbh(lj.getLjcz()); mp.setDcTpmc(lj.getLjgg()); mp.setSjksrqg(qgrq); mp.setDhsl(lj.getSl()); + mp.setCpxql(lj.getSl()); mp.setDcLph(lph); + mp.setWpjb("L"); + mp.setGzlx("M"); + mp.setGzbm("3K"); + mp.setZt("1"); + mp.setXdtz("0"); + mp.setHxfl("B"); + mp.setDhsl1("0"); return mp; } } 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 fc4e385..6814e36 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 @@ -272,6 +272,8 @@ public class ZyjhController { //生成零件信息 for (DmYdjh item : list) { + List ljList = zyjhService.createLj(item.getDcCh(), item.getDcPl(), item.getTzbh()); + //兼容老系统回报的数据 int count = mpDhsjServcie.count(Wrappers.lambdaQuery() .eq(MpDhsj::getDcCh,item.getDcCh()) @@ -283,7 +285,6 @@ public class ZyjhController { continue; } - List ljList = zyjhService.createLj(item.getDcCh(), item.getDcPl(), item.getTzbh()); //质量跟踪数据 List collect = new ArrayList<>(); String date = DateUtil.date().toString("yyyy/MM/dd");