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 8652d30..417318c 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 @@ -97,6 +97,7 @@ public class PgdSljhController { ListydupList=new ArrayList<>(); ListckupList=new ArrayList<>(); for(SlKc slKc: list){ + String idd=IdWorker.get32UUID(); if(StringUtils.isBlank(slKc.getSllsh())){ ImCkwpkwp imCkwpkwp = new ImCkwpkwp(); imCkwpkwp.setCkh(slKc.getCKH()); @@ -106,6 +107,10 @@ public class PgdSljhController { imCkwpkwp.setSllsh(id); imCkwpkwp.setDyrq(DateUtil.format(DateUtil.date(), "yyyy/MM/dd HH:mm")); imCkwpkwp.setDyry((String) req.getAttribute("yhms")); + if(StringUtils.isBlank(slKc.getYdid())){ + imCkwpkwp.setYdid(idd); + } + ckupList.add(imCkwpkwp); // slKc.setDyrq(DateUtil.format(DateUtil.date(), "yyyy/MM/dd")); } @@ -129,7 +134,7 @@ public class PgdSljhController { } if(StringUtils.isBlank(slKc.getDCTH())){ DmYdjh ydjh =new DmYdjh(); - ydjh.setId(IdWorker.get32UUID()); + ydjh.setId(idd); ydjh.setSlkcdw(slKc.getKWH()); ydjh.setSlcs(slKc.getCFCS1()); ydjh.setSlxhth(slKc.getGCDDH()); @@ -319,7 +324,13 @@ public class PgdSljhController { imCkwpkwp.setSllsh(""); imCkwpkwp.setDyrq(""); imCkwpkwp.setDyry(""); + +// if(StringUtils.isBlank(slKc.getDCTH())){ +// imCkwpkwp.setYdid(""); +// } + ckupList.add(imCkwpkwp); + // slKc.setDyrq(DateUtil.format(DateUtil.date(), "yyyy/MM/dd")); } if(StringUtils.isNotBlank(slKc.getYdid())){