From 3d97f80caafeccac05e3c1c3d3f45e83ee966055 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B8=B8=E7=86=9F=E5=90=B4=E5=BD=A6=E7=A5=96?=
 <qi.ruan@xujiesoft.com>
Date: Sun, 21 Sep 2025 18:44:08 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/NewIssureController.java       | 153 ++++++++++++++++--
 .../SOIssueNotifyOrderMaterialListData.java   |   2 +
 .../notify/mapper/NewIssureMapper.java        |  41 ++++-
 .../notify/service/NewIssureService.java      |  77 ++++++++-
 .../service/impl/NewIssureServiceImpl.java    | 138 ++++++++++++++++
 .../mapper/notify/IssureNotifyMapper.xml      |  17 +-
 .../mapper/notify/NewIssureMapper.xml         |  80 +++++++++
 7 files changed, 478 insertions(+), 30 deletions(-)

diff --git a/src/main/java/com/gaotao/modules/notify/controller/NewIssureController.java b/src/main/java/com/gaotao/modules/notify/controller/NewIssureController.java
index fb48de3..2160b9a 100644
--- a/src/main/java/com/gaotao/modules/notify/controller/NewIssureController.java
+++ b/src/main/java/com/gaotao/modules/notify/controller/NewIssureController.java
@@ -1,12 +1,11 @@
 package com.gaotao.modules.notify.controller;
 
+import com.gaotao.common.utils.PageUtils;
 import com.gaotao.common.utils.R;
 import com.gaotao.modules.api.entity.IfsShopOrder;
 import com.gaotao.modules.api.service.IfsApiService;
 import com.gaotao.modules.base.entity.SOScheduledRoutingData;
-import com.gaotao.modules.notify.entity.NotifyExcelData;
-import com.gaotao.modules.notify.entity.SOIssueNotifyOrderMaterialList;
-import com.gaotao.modules.notify.entity.SOIssueNotifyOrderMaterialListData;
+import com.gaotao.modules.notify.entity.*;
 import com.gaotao.modules.notify.entity.vo.ShopOrderMaterialVo;
 import com.gaotao.modules.notify.service.NewIssureService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -41,26 +40,150 @@ public class NewIssureController {
     }
 
     /**
-     * @Description Excel文件上传并解析
+     * @Description Excel文件上传并解析 - AI制作
      * @Title uploadNotifyExcel
      * @param file Excel文件
-     * @author system
-     * @date 2024/12/19
+     * @param site 工厂编码  
+     * @param notifyNo 申请单号
      * @return R
-     * @throws Exception
+     * @author AI制作
+     * @date 2024/12/19
      */
     @PostMapping(value="/uploadNotifyExcel")
-    @ResponseBody
-    public R uploadNotifyExcel(@RequestParam("file") MultipartFile file,
-                             @RequestParam("site") String site,
-                             @RequestParam("notifyNo") String notifyNo) throws Exception {
+    public R uploadNotifyExcel(@RequestParam("file") MultipartFile file, 
+                              @RequestParam("site") String site, 
+                              @RequestParam("notifyNo") String notifyNo) {
         try {
             newIssureService.uploadNotifyExcel(file, site, notifyNo);
-            return R.ok("Excel文件上传并处理成功");
+            return R.ok();
+        } catch (Exception e) {
+            return R.error("Excel导入失败: " + e.getMessage());
+        }
+    }
+
+    /**
+     * @Description 查询申请单主表 - AI制作
+     * @Title searchNotifyHeaderNew
+     * @param data 查询条件
+     * @return R
+     * @author AI制作
+     * @date 2024/12/19
+     */
+    @PostMapping(value="/searchNotifyHeaderNew")
+    public R searchNotifyHeaderNew(@RequestBody SOIssueNotifyHeaderData data) {
+        try {
+            PageUtils page = newIssureService.searchNotifyHeaderNew(data);
+            return R.ok().put("page", page);
+        } catch (Exception e) {
+            return R.error("查询申请单主表失败: " + e.getMessage());
+        }
+    }
+
+    /**
+     * @Description 查询申请单明细 - AI制作
+     * @Title searchNotifyOrderListNew
+     * @param data 查询条件
+     * @return R
+     * @author AI制作
+     * @date 2024/12/19
+     */
+    @PostMapping(value="/searchNotifyOrderListNew")
+    public R searchNotifyOrderListNew(@RequestBody SOIssueNotifyHeaderData data) {
+        try {
+            List<SOIssueNotifyOrderListData> rows = newIssureService.searchNotifyOrderListNew(data);
+            return R.ok().put("rows", rows);
+        } catch (Exception e) {
+            return R.error("查询申请单明细失败: " + e.getMessage());
+        }
+    }
+
+    /**
+     * @Description 查询材料明细 - AI制作
+     * @Title searchNotifyMaterialListNew
+     * @param data 查询条件
+     * @return R
+     * @author AI制作
+     * @date 2024/12/19
+     */
+    @PostMapping(value="/searchNotifyMaterialListNew")
+    public R searchNotifyMaterialListNew(@RequestBody SOIssueNotifyHeaderData data) {
+        try {
+            List<SOIssueNotifyOrderMaterialListData> rows = newIssureService.searchNotifyMaterialListNew(data);
+            return R.ok().put("rows", rows);
+        } catch (Exception e) {
+            return R.error("查询材料明细失败: " + e.getMessage());
+        }
+    }
+
+    /**
+     * @Description 查询材料汇总 - AI制作
+     * @Title searchSumNotifyMaterialListNew
+     * @param data 查询条件
+     * @return R
+     * @author AI制作
+     * @date 2024/12/19
+     */
+    @PostMapping(value="/searchSumNotifyMaterialListNew")
+    public R searchSumNotifyMaterialListNew(@RequestBody SOIssueNotifyHeaderData data) {
+        try {
+            List<SOIssueNotifyOrderMaterialListData> rows = newIssureService.searchSumNotifyMaterialListNew(data);
+            return R.ok().put("rows", rows);
+        } catch (Exception e) {
+            return R.error("查询材料汇总失败: " + e.getMessage());
+        }
+    }
+
+    /**
+     * @Description 更新申请单状态为关闭 - AI制作
+     * @Title updateNotifyStatusNew
+     * @param data 更新条件
+     * @return R
+     * @author AI制作
+     * @date 2024/12/19
+     */
+    @PostMapping(value="/updateNotifyStatusNew")
+    public R updateNotifyStatusNew(@RequestBody SOIssueNotifyHeaderData data) {
+        try {
+            newIssureService.updateNotifyStatusNew(data);
+            return R.ok();
+        } catch (Exception e) {
+            return R.error("更新申请单状态失败: " + e.getMessage());
+        }
+    }
+
+    /**
+     * @Description 查询申请单日志 - AI制作
+     * @Title searchNotifyLogNew
+     * @param data 查询条件
+     * @return R
+     * @author AI制作
+     * @date 2024/12/19
+     */
+    @PostMapping(value="/searchNotifyLogNew")
+    public R searchNotifyLogNew(@RequestBody SOIssueNotifyHeaderData data) {
+        try {
+            List<Object> rows = newIssureService.searchNotifyLogNew(data);
+            return R.ok().put("rows", rows);
+        } catch (Exception e) {
+            return R.error("查询申请单日志失败: " + e.getMessage());
+        }
+    }
+
+    /**
+     * @Description 查询申请单关闭日志 - AI制作
+     * @Title searchNotifyLogCloseNew
+     * @param data 查询条件
+     * @return R
+     * @author AI制作
+     * @date 2024/12/19
+     */
+    @PostMapping(value="/searchNotifyLogCloseNew")
+    public R searchNotifyLogCloseNew(@RequestBody SOIssueNotifyHeaderData data) {
+        try {
+            List<Object> rows = newIssureService.searchNotifyLogCloseNew(data);
+            return R.ok().put("rows", rows);
         } catch (Exception e) {
-            System.err.println("Excel文件处理异常: " + e.getMessage());
-            e.printStackTrace();
-            return R.error("Excel文件处理失败: " + e.getMessage());
+            return R.error("查询申请单关闭日志失败: " + e.getMessage());
         }
     }
 }
diff --git a/src/main/java/com/gaotao/modules/notify/entity/SOIssueNotifyOrderMaterialListData.java b/src/main/java/com/gaotao/modules/notify/entity/SOIssueNotifyOrderMaterialListData.java
index 19b5e0b..3b15a08 100644
--- a/src/main/java/com/gaotao/modules/notify/entity/SOIssueNotifyOrderMaterialListData.java
+++ b/src/main/java/com/gaotao/modules/notify/entity/SOIssueNotifyOrderMaterialListData.java
@@ -18,6 +18,8 @@ public class SOIssueNotifyOrderMaterialListData extends SOIssueNotifyOrderMateri
     private Double qtyOnHand;
     private Double qtyAvailable;
     private String orderNo;
+    private String soorderNo;
+    private String fgpartNo;
     private String locationNo;
     private String str;
     private Double stockQty;
diff --git a/src/main/java/com/gaotao/modules/notify/mapper/NewIssureMapper.java b/src/main/java/com/gaotao/modules/notify/mapper/NewIssureMapper.java
index c52f156..68279a4 100644
--- a/src/main/java/com/gaotao/modules/notify/mapper/NewIssureMapper.java
+++ b/src/main/java/com/gaotao/modules/notify/mapper/NewIssureMapper.java
@@ -2,7 +2,11 @@ package com.gaotao.modules.notify.mapper;
 
 import com.gaotao.modules.base.entity.SOScheduledRoutingData;
 import com.gaotao.modules.notify.entity.SOIssueNotifyOrderList;
+import com.gaotao.modules.notify.entity.SOIssueNotifyHeaderData;
+import com.gaotao.modules.notify.entity.SOIssueNotifyOrderListData;
 import com.gaotao.modules.notify.entity.SOIssueNotifyOrderMaterialListData;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -28,7 +32,42 @@ public interface NewIssureMapper {
     void deleteSOIssueNotifyOrderMaterialListDataForExcel(SOIssueNotifyOrderMaterialListData data);
 
     /**
-     * 获取已保存的申请单物料明细（用于回显）
+     * 获取已保存的申请单物料明细（用于回显） - AI制作
      */
     List<SOIssueNotifyOrderMaterialListData> getSOSBOMForIssureNew(SOScheduledRoutingData data);
+
+    /**
+     * 查询申请单主表 - AI制作
+     */
+    IPage<SOIssueNotifyHeaderData> searchNotifyHeaderNew(Page<SOIssueNotifyHeaderData> page, @Param("query") SOIssueNotifyHeaderData data);
+
+    /**
+     * 查询申请单明细 - AI制作
+     */
+    List<SOIssueNotifyOrderListData> searchNotifyOrderListNew(SOIssueNotifyHeaderData data);
+
+    /**
+     * 查询材料明细 - AI制作
+     */
+    List<SOIssueNotifyOrderMaterialListData> searchNotifyMaterialListNew(SOIssueNotifyHeaderData data);
+
+    /**
+     * 查询材料汇总 - AI制作
+     */
+    List<SOIssueNotifyOrderMaterialListData> searchSumNotifyMaterialListNew(SOIssueNotifyHeaderData data);
+
+    /**
+     * 更新申请单状态为关闭 - AI制作
+     */
+    void updateNotifyStatusNew(SOIssueNotifyHeaderData data);
+
+    /**
+     * 查询申请单日志 - AI制作
+     */
+    List<Object> searchNotifyLogNew(SOIssueNotifyHeaderData data);
+
+    /**
+     * 查询申请单关闭日志 - AI制作
+     */
+    List<Object> searchNotifyLogCloseNew(SOIssueNotifyHeaderData data);
 }
diff --git a/src/main/java/com/gaotao/modules/notify/service/NewIssureService.java b/src/main/java/com/gaotao/modules/notify/service/NewIssureService.java
index 06ac47b..7a9eb32 100644
--- a/src/main/java/com/gaotao/modules/notify/service/NewIssureService.java
+++ b/src/main/java/com/gaotao/modules/notify/service/NewIssureService.java
@@ -1,9 +1,13 @@
 package com.gaotao.modules.notify.service;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
+import com.gaotao.common.utils.PageUtils;
 import com.gaotao.modules.base.entity.SOScheduledRoutingData;
 import com.gaotao.modules.notify.entity.NotifyExcelData;
+import com.gaotao.modules.notify.entity.SOIssueNotifyHeaderData;
+import com.gaotao.modules.notify.entity.SOIssueNotifyOrderListData;
 import com.gaotao.modules.notify.entity.SOIssueNotifyOrderMaterialListData;
+import com.gaotao.common.utils.R;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;
@@ -13,15 +17,84 @@ public interface NewIssureService {
     List<SOIssueNotifyOrderMaterialListData> getSOSBOMForIssureNew(SOScheduledRoutingData data) throws JsonProcessingException;
 
     /**
-     * @Description Excel文件上传并解析
+     * @Description Excel文件上传并解析 - AI制作
      * @Title uploadNotifyExcel
      * @param file Excel文件
      * @param site 工厂编码
      * @param notifyNo 申请单号
-     * @author system
+     * @author AI制作
      * @date 2024/12/19
      * @return void
      * @throws Exception
      */
      void uploadNotifyExcel(MultipartFile file, String site, String notifyNo) throws Exception;
+
+    /**
+     * @Description 查询申请单主表 - AI制作
+     * @Title searchNotifyHeaderNew
+     * @param data 查询条件
+     * @return PageUtils
+     * @author AI制作
+     * @date 2024/12/19
+     */
+    PageUtils searchNotifyHeaderNew(SOIssueNotifyHeaderData data);
+
+    /**
+     * @Description 查询申请单明细 - AI制作
+     * @Title searchNotifyOrderListNew
+     * @param data 查询条件
+     * @return List<SOIssueNotifyOrderListData>
+     * @author AI制作
+     * @date 2024/12/19
+     */
+    List<SOIssueNotifyOrderListData> searchNotifyOrderListNew(SOIssueNotifyHeaderData data);
+
+    /**
+     * @Description 查询材料明细 - AI制作
+     * @Title searchNotifyMaterialListNew
+     * @param data 查询条件
+     * @return List<SOIssueNotifyOrderMaterialListData>
+     * @author AI制作
+     * @date 2024/12/19
+     */
+    List<SOIssueNotifyOrderMaterialListData> searchNotifyMaterialListNew(SOIssueNotifyHeaderData data);
+
+    /**
+     * @Description 查询材料汇总 - AI制作
+     * @Title searchSumNotifyMaterialListNew
+     * @param data 查询条件
+     * @return List<SOIssueNotifyOrderMaterialListData>
+     * @author AI制作
+     * @date 2024/12/19
+     */
+    List<SOIssueNotifyOrderMaterialListData> searchSumNotifyMaterialListNew(SOIssueNotifyHeaderData data);
+
+    /**
+     * @Description 更新申请单状态为关闭 - AI制作
+     * @Title updateNotifyStatusNew
+     * @param data 更新条件
+     * @author AI制作
+     * @date 2024/12/19
+     */
+    void updateNotifyStatusNew(SOIssueNotifyHeaderData data);
+
+    /**
+     * @Description 查询申请单日志 - AI制作
+     * @Title searchNotifyLogNew
+     * @param data 查询条件
+     * @return List<Object>
+     * @author AI制作
+     * @date 2024/12/19
+     */
+    List<Object> searchNotifyLogNew(SOIssueNotifyHeaderData data);
+
+    /**
+     * @Description 查询申请单关闭日志 - AI制作
+     * @Title searchNotifyLogCloseNew
+     * @param data 查询条件
+     * @return List<Object>
+     * @author AI制作
+     * @date 2024/12/19
+     */
+    List<Object> searchNotifyLogCloseNew(SOIssueNotifyHeaderData data);
 }
diff --git a/src/main/java/com/gaotao/modules/notify/service/impl/NewIssureServiceImpl.java b/src/main/java/com/gaotao/modules/notify/service/impl/NewIssureServiceImpl.java
index 059bc60..d2e7419 100644
--- a/src/main/java/com/gaotao/modules/notify/service/impl/NewIssureServiceImpl.java
+++ b/src/main/java/com/gaotao/modules/notify/service/impl/NewIssureServiceImpl.java
@@ -1,12 +1,19 @@
 package com.gaotao.modules.notify.service.impl;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.gaotao.common.utils.ExcelUtil;
+import com.gaotao.common.utils.R;
+import com.gaotao.common.utils.PageUtils;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.gaotao.modules.api.entity.IfsShopOrder;
 import com.gaotao.modules.api.service.IfsApiService;
 import com.gaotao.modules.base.entity.SOScheduledRoutingData;
 import com.gaotao.modules.notify.entity.NotifyExcelData;
+import com.gaotao.modules.notify.entity.SOIssueNotifyHeaderData;
 import com.gaotao.modules.notify.entity.SOIssueNotifyOrderList;
+import com.gaotao.modules.notify.entity.SOIssueNotifyOrderListData;
 import com.gaotao.modules.notify.entity.SOIssueNotifyOrderMaterialListData;
 import com.gaotao.modules.notify.entity.vo.ShopOrderMaterialVo;
 import com.gaotao.modules.notify.mapper.NewIssureMapper;
@@ -366,4 +373,135 @@ public class NewIssureServiceImpl implements NewIssureService {
             throw new RuntimeException("工单处理失败: " + orderNo + "-" + releaseNo + "-" + sequenceNo + ", 原因: " + e.getMessage(), e);
         }
     }
+
+    /**
+     * @Description 查询申请单主表 - AI制作
+     * @Title searchNotifyHeaderNew  
+     * @param data 查询条件
+     * @return PageUtils
+     * @author AI制作
+     * @date 2024/12/19
+     */
+    @Override
+    public PageUtils searchNotifyHeaderNew(SOIssueNotifyHeaderData data) {
+        System.out.println("开始查询申请单主表 - AI制作");
+        
+        // 按照原有模式进行分页查询
+        IPage<SOIssueNotifyHeaderData> resultList = newIssureMapper.searchNotifyHeaderNew(
+            new Page<SOIssueNotifyHeaderData>(data.getPage(), data.getLimit()), data);
+        PageUtils pageResult = new PageUtils(resultList);
+        
+        System.out.println("查询申请单主表完成，共" + resultList.getTotal() + "条记录");
+        
+        return pageResult;
+    }
+
+    /**
+     * @Description 查询申请单明细 - AI制作
+     * @Title searchNotifyOrderListNew
+     * @param data 查询条件  
+     * @return List<SOIssueNotifyOrderListData>
+     * @author AI制作
+     * @date 2024/12/19
+     */
+    @Override
+    public List<SOIssueNotifyOrderListData> searchNotifyOrderListNew(SOIssueNotifyHeaderData data) {
+        System.out.println("开始查询申请单明细 - AI制作，notifyNo=" + data.getNotifyNo() + ", site=" + data.getSite());
+        
+        List<SOIssueNotifyOrderListData> list = newIssureMapper.searchNotifyOrderListNew(data);
+        
+        System.out.println("查询申请单明细完成，共" + list.size() + "条记录");
+        return list;
+    }
+
+    /**
+     * @Description 查询材料明细 - AI制作
+     * @Title searchNotifyMaterialListNew
+     * @param data 查询条件
+     * @return List<SOIssueNotifyOrderMaterialListData>
+     * @author AI制作
+     * @date 2024/12/19
+     */
+    @Override
+    public List<SOIssueNotifyOrderMaterialListData> searchNotifyMaterialListNew(SOIssueNotifyHeaderData data) {
+        System.out.println("开始查询材料明细 - AI制作，notifyNo=" + data.getNotifyNo() + ", site=" + data.getSite());
+        
+        List<SOIssueNotifyOrderMaterialListData> list = newIssureMapper.searchNotifyMaterialListNew(data);
+        
+        System.out.println("查询材料明细完成，共" + list.size() + "条记录");
+        return list;
+    }
+
+    /**
+     * @Description 查询材料汇总 - AI制作
+     * @Title searchSumNotifyMaterialListNew
+     * @param data 查询条件
+     * @return List<SOIssueNotifyOrderMaterialListData>
+     * @author AI制作
+     * @date 2024/12/19
+     */
+    @Override
+    public List<SOIssueNotifyOrderMaterialListData> searchSumNotifyMaterialListNew(SOIssueNotifyHeaderData data) {
+        System.out.println("开始查询材料汇总 - AI制作，notifyNo=" + data.getNotifyNo() + ", site=" + data.getSite());
+        
+        List<SOIssueNotifyOrderMaterialListData> list = newIssureMapper.searchSumNotifyMaterialListNew(data);
+        
+        System.out.println("查询材料汇总完成，共" + list.size() + "条记录");
+        return list;
+    }
+
+    /**
+     * @Description 更新申请单状态为关闭 - AI制作
+     * @Title updateNotifyStatusNew
+     * @param data 更新条件
+     * @author AI制作
+     * @date 2024/12/19
+     */
+    @Override
+    @Transactional
+    public void updateNotifyStatusNew(SOIssueNotifyHeaderData data) {
+        System.out.println("开始更新申请单状态为关闭 - AI制作，notifyNo=" + data.getNotifyNo() + ", site=" + data.getSite());
+        
+        // 设置状态为CLOSED
+        // data.setStatus("CLOSED");
+        newIssureMapper.updateNotifyStatusNew(data);
+        
+        System.out.println("更新申请单状态为关闭完成");
+    }
+
+    /**
+     * @Description 查询申请单日志 - AI制作
+     * @Title searchNotifyLogNew
+     * @param data 查询条件
+     * @return List<Object>
+     * @author AI制作
+     * @date 2024/12/19
+     */
+    @Override
+    public List<Object> searchNotifyLogNew(SOIssueNotifyHeaderData data) {
+        System.out.println("开始查询申请单日志 - AI制作，notifyNo=" + data.getNotifyNo() + ", site=" + data.getSite());
+        
+        List<Object> list = newIssureMapper.searchNotifyLogNew(data);
+        
+        System.out.println("查询申请单日志完成，共" + list.size() + "条记录");
+        return list;
+    }
+
+    /**
+     * @Description 查询申请单关闭日志 - AI制作
+     * @Title searchNotifyLogCloseNew
+     * @param data 查询条件
+     * @return List<Object>
+     * @author AI制作
+     * @date 2024/12/19
+     */
+    @Override
+    public List<Object> searchNotifyLogCloseNew(SOIssueNotifyHeaderData data) {
+        System.out.println("开始查询申请单关闭日志 - AI制作，notifyNo=" + data.getNotifyNo() + ", site=" + data.getSite());
+        
+        List<Object> list = newIssureMapper.searchNotifyLogCloseNew(data);
+        
+        System.out.println("查询申请单关闭日志完成，共" + list.size() + "条记录");
+        return list;
+    }
 }
diff --git a/src/main/resources/mapper/notify/IssureNotifyMapper.xml b/src/main/resources/mapper/notify/IssureNotifyMapper.xml
index 8960d3f..7ed0b67 100644
--- a/src/main/resources/mapper/notify/IssureNotifyMapper.xml
+++ b/src/main/resources/mapper/notify/IssureNotifyMapper.xml
@@ -157,7 +157,7 @@ record_version,out_work_order_flag,project_id,order_type,auth_rule_id,bu)
     </delete>
 
     <update id="xiadaNotifyHeader">
-        update SOIssueNotifyHeader set plan_issue_date=#{planIssueDate},remark=#{remark} ,status='ISSUE' where site=#{site} and NotifyNo=#{notifyNo}
+        update SOIssueNotifyHeader set plan_issue_date=#{planIssueDate},remark=#{remark} ,status='ISSUE' where site=#{site} and notify_no=#{notifyNo}
     </update>
 
     <delete id="deleteNotifyHeader">
@@ -169,10 +169,10 @@ record_version,out_work_order_flag,project_id,order_type,auth_rule_id,bu)
         a.issue_result,a.plan_issue_date,a.real_issue_date,a.status,a.have_issue_record_flag,a.calc_flag,a.need_approve_flag,a.approved_flag,
         a.approver,a.approve_date,a.warehouse_id,a.record_version,a.out_work_order_flag,a.project_id,a.order_type,a.auth_rule_id,(CASE WHEN a.confirm_status IS NULL THEN '未确认' ELSE a.confirm_status END) as confirm_status ,dbo.plm_get_user_display(a.site,a.username) userDisplay,
         a.confirm_user_id,a.confirm_username,a.confirm_user_display,a.confirm_date,
-        c.workShopName
+
        from SOIssueNotifyHeader a
        left join sys_user b on a.username=b.username
-       left join eam_WorkShop c on b.workShopId=c.workShopId
+
      <where>
 
             <if test="query.notifyNo != null and query.notifyNo != ''">
@@ -184,12 +184,7 @@ record_version,out_work_order_flag,project_id,order_type,auth_rule_id,bu)
             <if test = "query.username != null and query.username != ''">
                 AND a.username LIKE  #{query.username}
             </if>
-            <if test = "query.issueFlag != null and query.issueFlag != ''">
-                AND a.issueFlag LIKE  #{query.issueFlag}
-            </if>
-            <if test = "query.issueResult != null and query.issueResult != ''">
-                AND a.issueResult LIKE  #{query.issueResult}
-            </if>
+
             <if test = "query.startDate != null ">
                 AND a.notify_date >=  #{query.startDate}
             </if>
@@ -209,9 +204,7 @@ record_version,out_work_order_flag,project_id,order_type,auth_rule_id,bu)
             <if test = "query.sql != null and query.sql != ''">
                  ${query.sql}
             </if>
-            <if test = "query.workShopId != null and query.workShopId != ''">
-                AND b.workShopId in ${query.workShopId}
-            </if>
+
      </where>
      order by a.notify_no
     </select>
diff --git a/src/main/resources/mapper/notify/NewIssureMapper.xml b/src/main/resources/mapper/notify/NewIssureMapper.xml
index bb48771..b5ffe42 100644
--- a/src/main/resources/mapper/notify/NewIssureMapper.xml
+++ b/src/main/resources/mapper/notify/NewIssureMapper.xml
@@ -30,4 +30,84 @@
               and b.release_no=#{releaseNo} and b.sequence_no=#{sequenceNo}
     </select>
 
+    <!-- AI制作 - 查询申请单主表 -->
+    <select id="searchNotifyHeaderNew" parameterType="SOIssueNotifyHeaderData" resultType="SOIssueNotifyHeaderData">
+        select a.notify_no as notifyNo,a.site,a.notify_date as notifyDate,a.username,a.entered_date as enteredDate,a.receiver,a.department_id as departmentId,a.remark,a.credit_flag as creditFlag,a.issue_flag as issueFlag,
+               a.issue_result as issueResult,a.plan_issue_date as planIssueDate,a.real_issue_date as realIssueDate,a.status,a.have_issue_record_flag as haveIssueRecordFlag,a.calc_flag as calcFlag,a.need_approve_flag as needApproveFlag,a.approved_flag as approvedFlag,
+               a.approver,a.approve_date as approveDate,a.warehouse_id as warehouseId,a.record_version as recordVersion,a.out_work_order_flag as outWorkOrderFlag,a.project_id as projectId,a.order_type as orderType,a.auth_rule_id as authRuleId,
+              a.confirm_status ,
+               a.confirm_user_id as confirmUserId,a.confirm_username as confirmUsername,a.confirm_user_display as confirmUserDisplay,a.confirm_date as confirmDate,a.handler_username as handlerUsername,a.handler_display as handlerDisplay,a.push_wcs_flag as pushWcsFlag
+        from SOIssueNotifyHeader a
+        <where>
+            <if test="query.notifyNo != null and query.notifyNo != ''">
+                AND a.notify_no = #{query.notifyNo}
+            </if>
+            <if test="query.username != null and query.username != ''">
+                AND a.username LIKE '%' + #{query.username} + '%'
+            </if>
+            <if test="query.status != null and query.status != ''">
+                AND a.status = #{query.status}
+            </if>
+            <if test="query.startDate != null">
+                AND a.notify_date >= #{query.startDate}
+            </if>
+            <if test="query.endDate != null">
+                AND #{query.endDate} >= a.notify_date
+            </if>
+            <if test="query.site != null and query.site != ''">
+                AND a.site = #{query.site}
+            </if>
+        </where>
+        order by a.notify_no desc
+    </select>
+
+    <!-- AI制作 - 查询申请单明细 -->
+    <select id="searchNotifyOrderListNew" resultType="SOIssueNotifyOrderListData">
+        select a.notify_no as notifyNo,a.site,a.item_no as itemNo,a.fgpart_no as fgPartNo,a.soorder_no as soorderNo,a.ops_item_no as opsItemNo,a.seq_no as seqNo,
+               a.issure_qty as issureQty,a.location_no as locationNo,a.need_date as needDate,a.out_work_order_flag as outWorkOrderFlag,a.release_no as releaseNo,a.sequence_no as sequenceNo
+        from SOIssueNotifyOrderList a
+        where a.notify_no=#{notifyNo} and a.site=#{site}
+        order by a.item_no
+    </select>
+
+    <!-- AI制作 - 查询材料明细 -->
+    <select id="searchNotifyMaterialListNew" resultType="SOIssueNotifyOrderMaterialListData">
+        select a.notify_no as notifyNo,a.site,a.item_no as itemNo,a.BOM_item_no as bOMItemNo,a.component_part_no as componentPartNo,a.qty_to_issue as qtyToIssue,a.qty_to_issue_original as qtyToIssueOriginal,
+               b.fgpart_no as fgpartNo,b.ops_item_no as opsItemNo,b.soorder_no as soorderNo,b.seq_no as seqNo,
+               b.location_no as locationNo,a.issue_type as issueType,b.need_date as needDate,a.remark
+        from SOIssueNotifyOrderMaterialList a
+        left join SOIssueNotifyOrderList b on a.site=b.site and a.notify_no=b.notify_no and a.item_no=b.item_no
+        where a.notify_no=#{notifyNo} and a.site=#{site}
+        order by b.need_date,a.item_no
+    </select>
+
+    <!-- AI制作 - 查询材料汇总 -->
+    <select id="searchSumNotifyMaterialListNew" resultType="SOIssueNotifyOrderMaterialListData">
+        select a.component_part_no as componentPartNo,sum(a.qty_to_issue) as qtyToIssue,sum(isnull(a.qty_to_issue_original,0)) as qtyToIssueOriginal,
+               a.issue_type as issueType
+        from SOIssueNotifyOrderMaterialList a
+        where a.notify_no=#{notifyNo} and a.site=#{site}
+        group by a.site,a.component_part_no,a.issue_type
+        order by a.issue_type
+    </select>
+
+    <!-- AI制作 - 更新申请单状态为关闭 -->
+    <update id="updateNotifyStatusNew">
+        update SOIssueNotifyHeader 
+        set status=#{status}, remark=#{closeRemark}
+        where site=#{site} and notify_no=#{notifyNo}
+    </update>
+
+    <!-- AI制作 - 查询申请单日志 -->
+    <select id="searchNotifyLogNew" resultType="java.lang.Object">
+        select '暂无日志数据' as message
+        where 1=2
+    </select>
+
+    <!-- AI制作 - 查询申请单关闭日志 -->
+    <select id="searchNotifyLogCloseNew" resultType="java.lang.Object">
+        select '暂无关闭日志数据' as message  
+        where 1=2
+    </select>
+
 </mapper>
\ No newline at end of file