From 3a22992d086421cf5880854bf6d0016f631c6ec7 Mon Sep 17 00:00:00 2001
From: shenzhouyu <zhouyu.shen@xujiesoft.com>
Date: Tue, 20 Jan 2026 17:25:58 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=B7=BB=E5=8A=A0=E8=BD=A6?=
 =?UTF-8?q?=E9=97=B4=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/SOIssueNotifyOrderMaterialListData.java  |  4 ++++
 .../mapper/orderIssure/IssureNotifyMapper.xml       | 13 +++++++++++++
 2 files changed, 17 insertions(+)

diff --git a/src/main/java/com/xujie/sys/modules/orderIssure/entity/SOIssueNotifyOrderMaterialListData.java b/src/main/java/com/xujie/sys/modules/orderIssure/entity/SOIssueNotifyOrderMaterialListData.java
index c36ab9c8..89490e2b 100644
--- a/src/main/java/com/xujie/sys/modules/orderIssure/entity/SOIssueNotifyOrderMaterialListData.java
+++ b/src/main/java/com/xujie/sys/modules/orderIssure/entity/SOIssueNotifyOrderMaterialListData.java
@@ -9,6 +9,7 @@ import org.springframework.format.annotation.DateTimeFormat;
 
 import java.math.BigDecimal;
 import java.util.Date;
+import java.util.List;
 
 @EqualsAndHashCode(callSuper = true)
 @Data
@@ -48,6 +49,8 @@ public class SOIssueNotifyOrderMaterialListData extends SOIssueNotifyOrderMateri
     private String userName;
     private String userDisplay;
     // 申请日期
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date notifyDate;
     // 车间
     private String workShopName;
@@ -55,6 +58,7 @@ public class SOIssueNotifyOrderMaterialListData extends SOIssueNotifyOrderMateri
     private String endDate;
 
     // 分页参数
+    List<String> workShopList;
 
     private Integer page = 1;
     private Integer limit = 100;
diff --git a/src/main/resources/mapper/orderIssure/IssureNotifyMapper.xml b/src/main/resources/mapper/orderIssure/IssureNotifyMapper.xml
index 0c748e84..19f6a48f 100644
--- a/src/main/resources/mapper/orderIssure/IssureNotifyMapper.xml
+++ b/src/main/resources/mapper/orderIssure/IssureNotifyMapper.xml
@@ -445,6 +445,18 @@ RecordVersion,OutWorkOrderFlag,ProjectID,OrderType,AuthRuleID,bu)
             <if test="query.endDate != null">
                 AND #{query.endDate} <![CDATA[>=]]> h.NotifyDate
             </if>
+            <choose>
+                <when test="query.workShopList != null and query.workShopList.size >0">
+                    AND w.WorkShopId IN (
+                    <foreach collection="query.workShopList" item="item" separator=",">
+                        #{item}
+                    </foreach>
+                )
+                </when>
+                <otherwise>
+                        AND w.WorkShopId in ('WS005','WS006')
+                </otherwise>
+            </choose>
         </where>
         ORDER BY m.NotifyNo, o.needDate, m.ItemNo
     </select>
@@ -497,6 +509,7 @@ RecordVersion,OutWorkOrderFlag,ProjectID,OrderType,AuthRuleID,bu)
             AND m.timeout_reason is null
                 AND h.Status = '已下达'
                 AND (h.confirm_status = '未确认' OR h.confirm_status IS NULL)
+            AND w.WorkShopId in ('WS005','WS006')
 
         </where>
         ORDER BY m.NotifyNo, o.needDate, m.ItemNo