From 956bd911fd4f519e268779f8d6179f7186c27098 Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Tue, 11 Nov 2025 10:58:29 +0800
Subject: [PATCH] =?UTF-8?q?2025-11-11=20=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ScheduleServiceImpl.java     |  8 +++---
 .../mapper/schedule/ScheduleMapper.xml        | 28 +++++++++----------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java b/src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java
index e2cc9f1..00937ca 100644
--- a/src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java
+++ b/src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java
@@ -282,10 +282,10 @@ public class ScheduleServiceImpl implements ScheduleService {
 
     @Override
     public List<OrderBomData> getOrderBomByCon(SearchScheduleData inData) {
-        String site = inData.getSite();
-        //首先查询referenceCustomerId
-        String referenceCustomerId = scheduleMapper.getReferenceCustomerId(site);
-        inData.setReferenceCustomerId(referenceCustomerId);
+//        String site = inData.getSite();
+//        //首先查询referenceCustomerId
+//        String referenceCustomerId = scheduleMapper.getReferenceCustomerId(site);
+//        inData.setReferenceCustomerId(referenceCustomerId);
         //判断是否查询当前卷的
         boolean currentRollFlag = inData.isCurrentRollFlag();
         if (!currentRollFlag) {
diff --git a/src/main/resources/mapper/schedule/ScheduleMapper.xml b/src/main/resources/mapper/schedule/ScheduleMapper.xml
index fe506ca..c327457 100644
--- a/src/main/resources/mapper/schedule/ScheduleMapper.xml
+++ b/src/main/resources/mapper/schedule/ScheduleMapper.xml
@@ -747,27 +747,27 @@
     <select id="getOrderBomByCon" parameterType="SearchScheduleData" resultType="OrderBomData">
         SELECT vss.Site site, vss.OrderNo orderNo, vss.ItemNo itemNo, vss.ComponentPartNo componentPartNo,
         /*动态sql语句*/
-        <if test="referenceCustomerId != null and referenceCustomerId != ''">
-            <choose>
-                <when test="referenceCustomerId != null and referenceCustomerId != ''">
-                    ISNULL(rpi.ReferencePartDesc, P.PartDescription) partDesc, '' partSpec,
-                </when>
-                <otherwise>
+<!--        <if test="referenceCustomerId != null and referenceCustomerId != ''">-->
+<!--            <choose>-->
+<!--                <when test="referenceCustomerId != null and referenceCustomerId != ''">-->
+<!--                    ISNULL(rpi.ReferencePartDesc, P.PartDescription) partDesc, '' partSpec,-->
+<!--                </when>-->
+<!--                <otherwise>-->
                     P.PartDescription partDesc, P.Spec partSpec,
-                </otherwise>
-            </choose>
-        </if>
+<!--                </otherwise>-->
+<!--            </choose>-->
+<!--        </if>-->
         P.UMid partUm, vss.QtyAssembly qtyAssembly, vss.QtyFixedScrapt qtyFixedScrapt, vss.ScraptFactor scraptFactor,
         vss.Remark remark,
         vss.QtyRequired qtyRequired, vss.QtyIssue qtyIssue, vss.IssueDate issueDate, vss.QtyReserved qtyReserved,
         vss.MatGroup matGroup, vss.RMType_DB rmTypeDb
         FROM dbo.view_SAP_SOBOM vss
         /*动态sql语句*/
-        <if test="referenceCustomerId != null and referenceCustomerId != ''">
-            LEFT JOIN ReferencePartInfo rpi ON vss.Site = rpi.Site AND vss.ComponentPartNo = rpi.PartNo AND
-            rpi.CustomerID = #{referenceCustomerId}
-            AND (rpi.FGPartNo = #{partNo} OR rpi.FGPartNo = '全部')
-        </if>
+<!--        <if test="referenceCustomerId != null and referenceCustomerId != ''">-->
+<!--            LEFT JOIN ReferencePartInfo rpi ON vss.Site = rpi.Site AND vss.ComponentPartNo = rpi.PartNo AND-->
+<!--            rpi.CustomerID = #{referenceCustomerId}-->
+<!--            AND (rpi.FGPartNo = #{partNo} OR rpi.FGPartNo = '全部')-->
+<!--        </if>-->
         LEFT JOIN Part P ON vss.Site = P.Site AND vss.ComponentPartNo = P.PartNo
         <where>
             vss.Site = P.Site AND vss.ComponentPartNo = P.PartNo