From ed4c3e432ca0cbde4f945c8490c717c74b4e89a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E5=93=B2=E5=A5=87?= <13840175730@139.com>
Date: Wed, 19 Feb 2025 14:09:14 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../gj_erp/service/jcsj/impl/BomUploadServiceImpl.java    | 2 +-
 src/main/resources/mappers/jcsj/DmBomMapper.xml           | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/dsic/gj_erp/service/jcsj/impl/BomUploadServiceImpl.java b/src/main/java/com/dsic/gj_erp/service/jcsj/impl/BomUploadServiceImpl.java
index d2447ec..6ea4df7 100644
--- a/src/main/java/com/dsic/gj_erp/service/jcsj/impl/BomUploadServiceImpl.java
+++ b/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(
diff --git a/src/main/resources/mappers/jcsj/DmBomMapper.xml b/src/main/resources/mappers/jcsj/DmBomMapper.xml
index 9f99670..9773e15 100644
--- a/src/main/resources/mappers/jcsj/DmBomMapper.xml
+++ b/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>