2025-10-10

物料sop，生产订单列表优化

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 {

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

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