From 554525fd2df23a5b01b4f5188ad8b7a294860cd5 Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Thu, 16 Oct 2025 14:49:34 +0800
Subject: [PATCH] =?UTF-8?q?2025-10-16=20=E9=A2=86=E6=96=99=E7=94=B3?=
 =?UTF-8?q?=E8=AF=B7=E7=AE=A1=E7=90=86=20=E6=9D=90=E6=96=99=E6=98=8E?=
 =?UTF-8?q?=E7=BB=86=E9=A1=B5=E7=AD=BE=E5=A2=9E=E5=8A=A0=E8=A1=8C=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/IssureNotifyMapper.java            |  2 +
 .../service/impl/IssureNotifyServiceImpl.java | 40 +++++++++----------
 .../mapper/orderIssure/IssureNotifyMapper.xml | 12 +++++-
 3 files changed, 32 insertions(+), 22 deletions(-)

diff --git a/src/main/java/com/gaotao/modules/orderIssure/mapper/IssureNotifyMapper.java b/src/main/java/com/gaotao/modules/orderIssure/mapper/IssureNotifyMapper.java
index 9c10979..35b8531 100644
--- a/src/main/java/com/gaotao/modules/orderIssure/mapper/IssureNotifyMapper.java
+++ b/src/main/java/com/gaotao/modules/orderIssure/mapper/IssureNotifyMapper.java
@@ -182,4 +182,6 @@ public interface IssureNotifyMapper extends BaseMapper<SOIssueNotifyHeader> {
      * @return 替代料列表
      */
     List<BomAlternativePartsData> getBomAlternativeParts(BomAlternativePartsData data);
+
+    void deleteNotifyMaterial2(SOIssueNotifyOrderMaterialListData data);
 }
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 29902d8..81caae1 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
@@ -253,31 +253,31 @@ public class IssureNotifyServiceImpl implements IssureNotifyService {
     @Transactional
     public void deleteNotifyMaterial(SOIssueNotifyOrderMaterialListData data){
         List<SOIssueNotifyOrderMaterialListData> checkDeleteMaterial=issureNotifyMapper.checkDeleteMaterial(data);
-        if(checkDeleteMaterial.size()==0){
+        if(checkDeleteMaterial.isEmpty()){
             throw new RuntimeException("该记录已不存在!");
         }
         if(BigDecimalUtils.compareToZero(checkDeleteMaterial.get(0).getQtyToIssueOriginal())>0){
             throw new RuntimeException("该记录已有领料记录无法删除!");
         }
-        issureNotifyMapper.deleteNotifyMaterial(data);
-
-        IssueNotifyChangeLog issueNotifyChangeLog=new IssueNotifyChangeLog();
-        List<SOIssueNotifyOrderList> checkList=issureNotifyMapper.getSOIssueNotifyOrderListData(data);
-        if(checkList.size()>0){
-            issueNotifyChangeLog.setsOOrderNo(checkList.get(0).getsOOrderNo());
-            issueNotifyChangeLog.setSeqNo(checkList.get(0).getSeqNo());
-
-        }
-        issueNotifyChangeLog.setSite(data.getSite());
-        issueNotifyChangeLog.setNotifyNo(data.getNotifyNo());
-        issueNotifyChangeLog.setItemNo(data.getItemNo());
-        issueNotifyChangeLog.setComponentPartNo(data.getComponentPartNo());
-        issueNotifyChangeLog.setQtyToIssue(data.getQtyToIssue());
-        issueNotifyChangeLog.setUpdateBy(String.valueOf(((SysUserEntity) SecurityUtils.getSubject().getPrincipal()).getUsername()));
-        issueNotifyChangeLog.setUpdateType("删除申请单材料明细");
-        issueNotifyChangeLog.setUpdateDate(new Date());
-        issueNotifyChangeLog.setIssueType(data.getIssueType());
-        issureNotifyMapper.saveIssueNotifyChangeLog(issueNotifyChangeLog);
+        issureNotifyMapper.deleteNotifyMaterial2(data);
+
+//        IssueNotifyChangeLog issueNotifyChangeLog=new IssueNotifyChangeLog();
+//        List<SOIssueNotifyOrderList> checkList=issureNotifyMapper.getSOIssueNotifyOrderListData(data);
+//        if(!checkList.isEmpty()){
+//            issueNotifyChangeLog.setsOOrderNo(checkList.get(0).getsOOrderNo());
+//            issueNotifyChangeLog.setSeqNo(checkList.get(0).getSeqNo());
+//
+//        }
+//        issueNotifyChangeLog.setSite(data.getSite());
+//        issueNotifyChangeLog.setNotifyNo(data.getNotifyNo());
+//        issueNotifyChangeLog.setItemNo(data.getItemNo());
+//        issueNotifyChangeLog.setComponentPartNo(data.getComponentPartNo());
+//        issueNotifyChangeLog.setQtyToIssue(data.getQtyToIssue());
+//        issueNotifyChangeLog.setUpdateBy(String.valueOf(((SysUserEntity) SecurityUtils.getSubject().getPrincipal()).getUsername()));
+//        issueNotifyChangeLog.setUpdateType("删除申请单材料明细");
+//        issueNotifyChangeLog.setUpdateDate(new Date());
+//        issueNotifyChangeLog.setIssueType(data.getIssueType());
+//        issureNotifyMapper.saveIssueNotifyChangeLog(issueNotifyChangeLog);
     }
     @Override
     @Transactional
diff --git a/src/main/resources/mapper/orderIssure/IssureNotifyMapper.xml b/src/main/resources/mapper/orderIssure/IssureNotifyMapper.xml
index d905d6c..17e9262 100644
--- a/src/main/resources/mapper/orderIssure/IssureNotifyMapper.xml
+++ b/src/main/resources/mapper/orderIssure/IssureNotifyMapper.xml
@@ -442,9 +442,17 @@ RecordVersion,OutWorkOrderFlag,ProjectID,OrderType,AuthRuleID,bu)
         and ItemNo=#{itemNo}
     </select>
     <select id="deleteNotifyMaterial">
-        delete from SOIssueNotifyOrderMaterialList  where Site=#{site} and NotifyNo=#{notifyNo}
-        and ItemNo=#{itemNo}
+        delete from SOIssueNotifyOrderMaterialList
+        where Site = #{site} and NotifyNo = #{notifyNo}
+        and ItemNo = #{itemNo}
     </select>
+
+    <delete id="deleteNotifyMaterial2">
+        delete from SOIssueNotifyOrderMaterialList
+        where Site=#{site} and NotifyNo=#{notifyNo}
+          and BOMItemNo=#{bOMItemNo}
+    </delete>
+
     <insert id="saveIssueNotifyChangeLog">
         insert into IssueNotifyChangeLog (Site,NotifyNo,ItemNo,SOOrderNo,SeqNo,ComponentPartNo,QtyToIssue,updateType,updateBy,updateDate,issueType)
         values (#{site},#{notifyNo},#{itemNo},#{sOOrderNo},#{seqNo},#{componentPartNo},#{qtyToIssue,jdbcType=DOUBLE},#{updateType},#{updateBy},#{updateDate},#{issueType})