1.修复bug

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

@@ -1555,7 +1555,7 @@ public class BomUploadServiceImpl {
         Map<String, String> qgKwMap = qgkws.stream().collect(Collectors.toMap(Dm_zhbmp::getBmsm, Dm_zhbmp::getBM));
         List<DmBom> adds = new ArrayList<>();
         int cs = list.get(0).getCs();
-        if (2 == cs) {
+        if (2 == cs || 4==cs) {
             ArrayList<BomVO> collect = list.stream().collect(
                 Collectors.collectingAndThen(
                     Collectors.toCollection(

src/main/resources/mappers/jcsj/DmBomMapper.xml

@@ -278,7 +278,13 @@
     </select>
 
     <select id="getBomUni" resultType="com.dsic.gj_erp.bean.jcsj.DmBom">
-        SELECT DISTINCT dcch ,pl,tzbh  from dm_bom WHERE dcch =#{dcCh} and pl =#{dcPl} and type='b'
+        SELECT
+            DISTINCT dcch ,pl,tzbh,lqlb,wpgg,wpcz,hxcd,dmcd,qgcd,qbs,pklx,pkcd,ljsl,zl,
+                     xcshms,kw,bclqzl,bcshzl,bcylzl,bcljtlzl,bcqpyld,ylbhgg
+        from
+            dm_bom
+        WHERE
+            dcch =#{dcCh} and pl =#{dcPl} and type='b'
     </select>