From 9a325adb57fc92352a305673a86ec8040463a208 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: Thu, 3 Sep 2026 09:04:59 +0800
Subject: [PATCH] =?UTF-8?q?=E8=80=81=E9=A1=B5=E9=9D=A2=E5=A4=8D=E7=94=A8?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/HaiAnIssureNotifyServiceImpl.java    | 28 +++++++++++++++++--
 1 file changed, 26 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/gaotao/modules/autoWareHourceHaian/service/impl/HaiAnIssureNotifyServiceImpl.java b/src/main/java/com/gaotao/modules/autoWareHourceHaian/service/impl/HaiAnIssureNotifyServiceImpl.java
index c5cf64b2..98b1241e 100644
--- a/src/main/java/com/gaotao/modules/autoWareHourceHaian/service/impl/HaiAnIssureNotifyServiceImpl.java
+++ b/src/main/java/com/gaotao/modules/autoWareHourceHaian/service/impl/HaiAnIssureNotifyServiceImpl.java
@@ -10,6 +10,7 @@ import com.gaotao.modules.autoWareHourceHaian.entity.HaiAnSOIssueNotifyOrderList
 import com.gaotao.modules.autoWareHourceHaian.entity.HaiAnSOIssueNotifyOrderMaterialListAllocData;
 import com.gaotao.modules.autoWareHourceHaian.entity.HaiAnSOIssueNotifyOrderMaterialListData;
 import com.gaotao.modules.autoWareHourceHaian.entity.dto.HaiAnGroupKey;
+import com.gaotao.modules.autoWareHourceHaian.entity.dto.HaiAnNoOrderMaterialAllocRequestData;
 import com.gaotao.modules.autoWareHourceHaian.entity.dto.HaiAnNoOrderNotifyDto;
 import com.gaotao.modules.autoWareHourceHaian.entity.dto.HaiAnNewSoIssueNotifyDto;
 import com.gaotao.modules.autoWareHourceHaian.entity.dto.HaiAnShoporderAndMaterialDto;
@@ -17,8 +18,8 @@ import com.gaotao.modules.autoWareHourceHaian.entity.vo.HaiAnSOIssueNotifyOrderL
 import com.gaotao.modules.autoWareHourceHaian.entity.vo.HaiAnSOIssueNotifyOrderMaterialList;
 import com.gaotao.modules.customer.entity.dto.ShipmentIssueDto;
 import com.gaotao.modules.autoWareHourceHaian.mapper.HaiAnIssureNotifyMapper;
-import com.gaotao.modules.autoWareHourceHaian.mapper.HaiAnSOIssueNotifyOrderMaterialListAllocMapper;
 import com.gaotao.modules.autoWareHourceHaian.service.HaiAnIssureNotifyService;
+import com.gaotao.modules.autoWareHourceHaian.service.HaiAnSOIssueNotifyOrderMaterialListAllocService;
 import com.gaotao.modules.sys.entity.SysUserEntity;
 import com.gaotao.modules.trans.entity.TransNoControl;
 import com.gaotao.modules.trans.service.Consts;
@@ -49,7 +50,7 @@ public class HaiAnIssureNotifyServiceImpl implements HaiAnIssureNotifyService {
     private HaiAnIssureNotifyMapper haiAnIssureNotifyMapper;
 
     @Autowired
-    private HaiAnSOIssueNotifyOrderMaterialListAllocMapper allocMapper;
+    private HaiAnSOIssueNotifyOrderMaterialListAllocService allocService;
 
     @Autowired
     private IfsApiService ifsApiService;
@@ -564,6 +565,29 @@ public class HaiAnIssureNotifyServiceImpl implements HaiAnIssureNotifyService {
         }
     }
 
+    /**
+     * @author rqrq
+     * @Description 查询海安无单物料行指定分配列表，委托allocService按site+notifyNo+itemNo+BOM行号检索 - rqrq
+     */
+    @Override
+    public List<HaiAnSOIssueNotifyOrderMaterialListAllocData> haiAnQueryNoOrderMaterialAllocList(HaiAnNoOrderMaterialAllocRequestData data) {
+        validateSite(data.getSite());
+        // 调用指定分配服务查询当前物料行全量指定记录；失败直接抛出业务异常供前端提示 - rqrq
+        return allocService.queryAllocList(data);
+    }
+
+    /**
+     * @author rqrq
+     * @Description 全量保存海安无单物料行指定分配，委托allocService执行校验、排序与删后重存 - rqrq
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void haiAnSaveNoOrderMaterialAllocList(HaiAnNoOrderMaterialAllocRequestData data) {
+        validateSite(data.getSite());
+        // 调用指定分配服务全量重存；事务失败会回滚，避免删后残留空数据 - rqrq
+        allocService.saveAllocList(data);
+    }
+
     private HaiAnSOIssueNotifyOrderList buildParentSeed(HaiAnNewSoIssueNotifyDto data) {
         HaiAnSOIssueNotifyOrderList seed = new HaiAnSOIssueNotifyOrderList();
         seed.setSite(data.getSite());