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 66e48f8..1b80c5f 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 @@ -109,11 +109,13 @@ public class PgdSljhController { 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")); } + if(StringUtils.isNotBlank(slKc.getYdid())){ DmYdjh ydjh =new DmYdjh(); // 库存主键 没存 @@ -164,9 +166,10 @@ public class PgdSljhController { } ydupList.add(ydjh); } - if(StringUtils.isBlank(slKc.getDCTH())){ + if(StringUtils.isBlank(slKc.getYdid()) || StringUtils.isBlank(slKc.getDCTH()) ){ DmYdjh ydjh =new DmYdjh(); ydjh.setId(idd); + ydjh.setSlkcdw(slKc.getKWH()); ydjh.setSlcs(slKc.getCFCS1()); ydjh.setSlxhth(slKc.getGCDDH()); @@ -177,7 +180,9 @@ public class PgdSljhController { ydjh.setKcch(slKc.getDCCH()); ydjh.setDcCh(slKc.getZYCH()); ydjh.setDcPl(slKc.getZYPL()); + ydjh.setTzbh(StringUtils.isBlank(slKc.getDCTH())?"":slKc.getDCTH()); ydjh.setWpgg(slKc.getWPGG()); + ydjh.setKw(slKc.getSLDW()); ydjh.setWpxh(slKc.getWPXH()); ydjh.setZylx(slKc.getZYLX()); ydjh.setSlbz(slKc.getBZ());