From 288cd0dc916ceddd5b50d360fd3b6629fe4caea8 Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Fri, 7 Nov 2025 09:42:34 +0800
Subject: [PATCH] =?UTF-8?q?2025-11-06=20=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../boxManage/data/SoReceiveCasesData.java    |  2 ++
 .../boxManage/entity/SoReceiveCases.java      |  2 ++
 .../service/impl/IssureNotifyServiceImpl.java |  4 +--
 src/main/resources/mapper/base/BaseMapper.xml | 26 +++++++++++++++----
 .../mapper/orderIssure/IssureNotifyMapper.xml | 21 ++++++++++++---
 5 files changed, 44 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/gaotao/modules/boxManage/data/SoReceiveCasesData.java b/src/main/java/com/gaotao/modules/boxManage/data/SoReceiveCasesData.java
index 75aa1fb..16bdf3e 100644
--- a/src/main/java/com/gaotao/modules/boxManage/data/SoReceiveCasesData.java
+++ b/src/main/java/com/gaotao/modules/boxManage/data/SoReceiveCasesData.java
@@ -47,6 +47,8 @@ public class SoReceiveCasesData extends SoReceiveCases {
 
 
 
+
+
 
 
 
diff --git a/src/main/java/com/gaotao/modules/boxManage/entity/SoReceiveCases.java b/src/main/java/com/gaotao/modules/boxManage/entity/SoReceiveCases.java
index c38edc1..e948f52 100644
--- a/src/main/java/com/gaotao/modules/boxManage/entity/SoReceiveCases.java
+++ b/src/main/java/com/gaotao/modules/boxManage/entity/SoReceiveCases.java
@@ -190,6 +190,8 @@ public class SoReceiveCases {
 
 
 
+
+
 
 
 
diff --git a/src/main/java/com/gaotao/modules/orderIssure/service/impl/IssureNotifyServiceImpl.java b/src/main/java/com/gaotao/modules/orderIssure/service/impl/IssureNotifyServiceImpl.java
index 81caae1..34b9155 100644
--- a/src/main/java/com/gaotao/modules/orderIssure/service/impl/IssureNotifyServiceImpl.java
+++ b/src/main/java/com/gaotao/modules/orderIssure/service/impl/IssureNotifyServiceImpl.java
@@ -144,8 +144,8 @@ public class IssureNotifyServiceImpl implements IssureNotifyService {
     @Override
     public void deleteNotifyHeader(SOIssueNotifyHeaderData data){
         //判断是否有明细记录
-        List<SOIssueNotifyOrderListData> checkList=issureNotifyMapper.getNotifyNoDetail(data);
-        if (checkList.size()>0){
+        List<SOIssueNotifyOrderListData> checkList = issureNotifyMapper.getNotifyNoDetail(data);
+        if (!checkList.isEmpty()){
             throw new RuntimeException("该申请单有工单明细记录,请先清除明细再删除工单!");
         }
         issureNotifyMapper.deleteNotifyHeader(data);
diff --git a/src/main/resources/mapper/base/BaseMapper.xml b/src/main/resources/mapper/base/BaseMapper.xml
index 458a7fe..2a30cc3 100644
--- a/src/main/resources/mapper/base/BaseMapper.xml
+++ b/src/main/resources/mapper/base/BaseMapper.xml
@@ -927,22 +927,38 @@
     </select>
     <!--=================维护工艺路线信息===================-->
     <select id="searchRoutingWithPartNo" resultType="com.gaotao.modules.base.entity.RoutingHeaderData">
-        Select top 1000
+        SELECT
         r.Site,r.PartNo,r.RevNo,r.PhaseInDate,r.PhaseOutDate,r.RoutingType_DB,r.RoutingType,r.Status,r.Status_DB,
         r.Defaultflag,r.Remark,r.RepairFlag,p.PartDescription+' / '+isnull(p.Spec,'') as spec,p.umid
-        from RoutingHeader r
-        LEFT JOIN Part p on p.partNo=r.partNo and p.site=r.site
+        FROM RoutingHeader r WITH(NOLOCK)
+        LEFT JOIN Part p WITH(NOLOCK) on p.partNo=r.partNo and p.site=r.site
         <where>
             <if test="partNo != null and partNo != ''">
-                and r.partNo like #{partNo}
+                and r.partNo like '%'+#{partNo}+'%'
+            </if>
+            <if test="spec != null and spec != ''">
+                and (p.PartDescription like '%'+#{spec}+'%' OR p.Spec like '%'+#{spec}+'%')
             </if>
             <if test="site != null and site != ''">
                 and r.site = #{site}
             </if>
+            <if test="status != null and status != ''">
+                and r.Status = #{status}
+            </if>
+            <if test="routingType != null and routingType != ''">
+                and r.RoutingType like '%'+#{routingType}+'%'
+            </if>
             <if test="revNo != null and revNo != ''">
-                and r.revNo = #{revNo}
+                and r.revNo like '%'+#{revNo}+'%'
+            </if>
+            <if test="umid != null and umid != ''">
+                and p.umid like '%'+#{umid}+'%'
+            </if>
+            <if test="phaseInDate != null and phaseInDate != ''">
+                and r.PhaseInDate &gt;= #{phaseInDate}
             </if>
         </where>
+        ORDER BY r.PartNo, r.RevNo DESC
     </select>
 
     <select id="searchBomWithPartNo" resultType="BOMHeader">
diff --git a/src/main/resources/mapper/orderIssure/IssureNotifyMapper.xml b/src/main/resources/mapper/orderIssure/IssureNotifyMapper.xml
index c454fae..6a63e8f 100644
--- a/src/main/resources/mapper/orderIssure/IssureNotifyMapper.xml
+++ b/src/main/resources/mapper/orderIssure/IssureNotifyMapper.xml
@@ -25,11 +25,24 @@ RecordVersion,OutWorkOrderFlag,ProjectID,OrderType,AuthRuleID,bu)
     </update>
 
     <select id="getNotifyNoDetail" resultType="SOIssueNotifyOrderListData">
-        select a.NotifyNo,a.Site,a.ItemNo,a.FGPartNo,a.SOOrderNo,a.OpsItemNo,a.SeqNo,a.IssureQty,a.OutWorkOrderFlag,a.locationNo,a.needDate
-        ,b.operation_desc itemDesc,a.aps_resource_total,a.not_yet_started_resource_total
+        select
+            a.NotifyNo,
+            a.Site,
+            a.ItemNo,
+            a.FGPartNo,
+            a.SOOrderNo,
+            a.OpsItemNo,
+            a.SeqNo,
+            a.IssureQty,
+            a.OutWorkOrderFlag,
+            a.locationNo,
+            a.needDate,
+            b.OperationDesc itemDesc,
+            a.aps_resource_total,
+            a.not_yet_started_resource_total
         from SOIssueNotifyOrderList a
-        left join so_routing b on a.site=b.site and a.SOOrderNo=b.order_no and b.item_no=a.OpsItemNo
-        where a.site=#{site} and a.NotifyNo=#{notifyNo}
+        left join sorouting b on a.site = b.site and a.SOOrderNo = b.OrderNo and b.ItemNo = a.OpsItemNo
+        where a.site = #{site} and a.NotifyNo = #{notifyNo}
     </select>
 
     <select id="getSOScheduledRoutingListForIssure" resultType="SOScheduledRoutingEntity">