Merge remote-tracking branch 'origin/master'

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

@@ -111,6 +111,8 @@ public class PgdSljhController {
                     ydjh.setId(slKc.getYdid());
                     ydjh.setZt("11");
                     ydjh.setSllsh(id);
+                    ydjh.setNbsbm(slKc.getNBSBM());
+                    ydjh.setSllph(slKc.getLPH());
                     ydjh.setSldrrq(DateUtil.format(DateUtil.date(), "yyyy/MM/dd HH:mm"));
                     ydjh.setSldrry((String) req.getAttribute("yhms"));
                     ydupList.add(ydjh);

src/main/java/com/dsic/gj_erp/service/jcsj/impl/BomUploadServiceImpl.java

@@ -472,8 +472,11 @@ public class BomUploadServiceImpl {
 
                 UpdateWrapper<PgdTzjh> qw1 = new UpdateWrapper<>();
                 qw1.set("lqbjsrq", DateUtil.format(DateUtil.date(), "yyyy/MM/dd"));
+                qw1.set("fkrq", DateUtil.format(DateUtil.date(), "yyyy/MM/dd"));
+                qw1.set("fkry", (String) req.getAttribute("yhms"));
                 qw1.eq("czbh", e.getDcChZ());
                 qw1.eq("pl", e.getDcPlZ());
+
 //                qw1.eq("dc_fd", fd);
                 pgdTzjhService.update(qw1);
 
@@ -1155,8 +1158,11 @@ public class BomUploadServiceImpl {
 
             UpdateWrapper<PgdTzjh> qw1 = new UpdateWrapper<>();
             qw1.set("tltjsrq", DateUtil.format(DateUtil.date(), "yyyy/MM/dd"));
+            qw1.set("fkrq", DateUtil.format(DateUtil.date(), "yyyy/MM/dd"));
+            qw1.set("fkry", (String) req.getAttribute("yhms"));
             qw1.eq("czbh", e.getDcChZ());
             qw1.eq("pl", e.getDcPlZ());
+
 //                qw1.eq("dc_fd", fd);
             pgdTzjhService.update(qw1);
         });