From e6ed49b6eeb12aa7ead06898bb0a2851248e4e6a Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Fri, 10 Oct 2025 15:00:15 +0800
Subject: [PATCH] =?UTF-8?q?2025-10-10=20=E7=89=A9=E6=96=99sop=EF=BC=8C?=
 =?UTF-8?q?=E7=94=9F=E4=BA=A7=E8=AE=A2=E5=8D=95=E5=88=97=E8=A1=A8=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../shopOrder/controller/ShopOrderController.java      |  1 -
 src/main/resources/mapper/pms/QcMapper.xml             |  2 +-
 .../resources/mapper/shopOrder/ShopOrderMapper.xml     | 10 +++++++---
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/gaotao/modules/shopOrder/controller/ShopOrderController.java b/src/main/java/com/gaotao/modules/shopOrder/controller/ShopOrderController.java
index 6b1bc7c..307dd5a 100644
--- a/src/main/java/com/gaotao/modules/shopOrder/controller/ShopOrderController.java
+++ b/src/main/java/com/gaotao/modules/shopOrder/controller/ShopOrderController.java
@@ -269,7 +269,6 @@ public class ShopOrderController extends AbstractController {
      * @return
      */
     @PostMapping(value = "/getShopOrderData")
-
     public Object getShopOrderData(@RequestBody ShopOrderData indata) {
         Map<String, Object> map = new HashMap<>();
         try {
diff --git a/src/main/resources/mapper/pms/QcMapper.xml b/src/main/resources/mapper/pms/QcMapper.xml
index 4aeb7d1..595b2a2 100644
--- a/src/main/resources/mapper/pms/QcMapper.xml
+++ b/src/main/resources/mapper/pms/QcMapper.xml
@@ -3160,7 +3160,7 @@
             A.sop_type as sopType,
             A.source_system as sourceSystem
         FROM file_management A
-        LEFT JOIN part_sop B ON A.SITE = B.SITE AND A.BU_NO = B.BU_NO AND A.FILE_NO = B.sop_no
+        LEFT JOIN part_sop B ON A.SITE = B.SITE AND A.BU_NO = B.BU_NO AND A.FILE_NO = B.sop_no and b.part_no = #{params.partNo}
         <where>
             B.SITE IS NULL
             AND A.status_tb = 0
diff --git a/src/main/resources/mapper/shopOrder/ShopOrderMapper.xml b/src/main/resources/mapper/shopOrder/ShopOrderMapper.xml
index 64ec281..c5d56c8 100644
--- a/src/main/resources/mapper/shopOrder/ShopOrderMapper.xml
+++ b/src/main/resources/mapper/shopOrder/ShopOrderMapper.xml
@@ -298,7 +298,7 @@
         from Part as p,ShopOrder as T
         left join Project as pr on pr.Site=T.Site and pr.Projectid=T.ProjectID
         <where>
-            AND T.Site=p.Site and T.PartNo=p.PartNo
+            AND T.Site = p.Site and T.PartNo = p.PartNo
             and T.site in (Select Site from AccessSite where upper(UserID)=#{query.user})
             <if test=" query.orderType != null and query.orderType != ''">
                 AND T.OrderType like #{query.orderType}
@@ -365,8 +365,12 @@
     </select>
     <select id="getShopOrderData" resultType="com.gaotao.modules.shopOrder.entity.ShopOrderData">
         SELECT
-        T.*,dbo.Get_ProjectDesc(T.Site,T.ProjectID) as ProjectIDName,P.Remark as PartRemark,P.ConfigurationTemplateID,
-        P.UMID,p.PartDescription+' / '+isnull(p.Spec,'') as PartDesc
+        T.*,
+        dbo.Get_ProjectDesc(T.Site,T.ProjectID) as ProjectIDName,
+        P.Remark as PartRemark,
+        P.ConfigurationTemplateID,
+        P.UMID,
+        p.PartDescription + ' / ' + isnull(p.Spec,'') as PartDesc
         FROM
         ShopOrder AS T
         LEFT JOIN