Merge remote-tracking branch 'origin/master'

src/main/java/com/dsic/gj_erp/controller/pgd/PgdSljhController.java

@@ -121,6 +121,8 @@ public class PgdSljhController {
                     ydjh.setNbsbm(slKc.getNBSBM());
                     ydjh.setSllph(slKc.getLPH());
                     ydjh.setSldrrq(DateUtil.format(DateUtil.date(), "yyyy/MM/dd HH:mm"));
+                    ydjh.setZylx(slKc.getZYLX());
+                    ydjh.setSlbz(slKc.getBZ());
                     ydjh.setSldrry((String) req.getAttribute("yhms"));
                     ydupList.add(ydjh);
                 }
@@ -139,6 +141,8 @@ public class PgdSljhController {
                     ydjh.setDcPl(slKc.getZYPL());
                     ydjh.setWpgg(slKc.getWPGG());
                     ydjh.setWpxh(slKc.getWPXH());
+                    ydjh.setZylx(slKc.getZYLX());
+                    ydjh.setSlbz(slKc.getBZ());
                     ydjh.setZt("11");
                     ydjh.setJhlx("99");
                     ydjh.setSllsh(id);