Merge branch 'master' of https://www.sanduolantoyoga.com/xiaoning/gj_erp

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

@@ -2074,7 +2074,7 @@ public class BomUploadServiceImpl {
                     dmYdjhadd.setLjsl(dmBchxjbp.getLjsl().doubleValue());
                     dmYdjhadd.setZl(dmBchxjbp.getDcZl());
                     String b = (String) kwmcMap.get(tzbh.substring(4, 7));
-                    dmYdjh.setKwmc(b);
+                    dmYdjhadd.setKwmc(b);
                     String s = (String) kwxxMap.get(tzbh.substring(4, 7));
                     String zzcj = (String) qgKwMap.get(s); //xhj
                     dmYdjhadd.setKw(zzcj);