From 493561770d72ea4726f42d7ee6db9e5e63ad4340 Mon Sep 17 00:00:00 2001
From: "han\\hanst" <songtao.han@xujiesoft.com>
Date: Thu, 25 Jun 2026 09:19:00 +0800
Subject: [PATCH] =?UTF-8?q?availability=20control=20id=20=E4=B8=8D?=
 =?UTF-8?q?=E5=85=81=E8=AE=B8=E5=85=B6=E4=BB=96=E5=87=BA=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../handlingunit/controller/HandlingUnitController.java  | 9 +++++++++
 .../handlingunit/service/HandlingUnitService.java        | 2 ++
 .../service/impl/HandlingUnitServiceImpl.java            | 8 ++++++++
 .../gaotao/modules/scrap/controller/ScrapController.java | 6 ++++++
 4 files changed, 25 insertions(+)

diff --git a/src/main/java/com/gaotao/modules/handlingunit/controller/HandlingUnitController.java b/src/main/java/com/gaotao/modules/handlingunit/controller/HandlingUnitController.java
index 1847b418..1dacb9ce 100644
--- a/src/main/java/com/gaotao/modules/handlingunit/controller/HandlingUnitController.java
+++ b/src/main/java/com/gaotao/modules/handlingunit/controller/HandlingUnitController.java
@@ -46,6 +46,15 @@ public class HandlingUnitController extends AbstractController {
         return R.ok().put("data", detail);
     }
 
+    /**
+     * 扫描处理单元标签（用于其他出库模块）
+     */
+    @PostMapping("scanHandlingUnitLabelForOther")
+    public R scanHandlingUnitLabelForOther(@RequestBody HandlingUnitDto dto) {
+        HandlingUnitDto detail = handlingUnitService.scanHandlingUnitLabelForOther(dto.getSite(), dto.getUnitId());
+        return R.ok().put("data", detail);
+    }
+
     /**
      * 装Handling Unit（托盘/箱）
      */
diff --git a/src/main/java/com/gaotao/modules/handlingunit/service/HandlingUnitService.java b/src/main/java/com/gaotao/modules/handlingunit/service/HandlingUnitService.java
index bea83797..3b7f97f7 100644
--- a/src/main/java/com/gaotao/modules/handlingunit/service/HandlingUnitService.java
+++ b/src/main/java/com/gaotao/modules/handlingunit/service/HandlingUnitService.java
@@ -24,6 +24,8 @@ public interface HandlingUnitService extends IService<HandlingUnit> {
      */
     HandlingUnitDto getHandlingUnitDetail(String site, String unitId);
     HandlingUnitDto scanHandlingUnitLabelForYiKu(String site, String unitId);
+
+    HandlingUnitDto scanHandlingUnitLabelForOther(String site, String unitId);
     /**
      * 装Handling Unit（托盘/箱）
      */
diff --git a/src/main/java/com/gaotao/modules/handlingunit/service/impl/HandlingUnitServiceImpl.java b/src/main/java/com/gaotao/modules/handlingunit/service/impl/HandlingUnitServiceImpl.java
index 09d6a12d..a4921e56 100644
--- a/src/main/java/com/gaotao/modules/handlingunit/service/impl/HandlingUnitServiceImpl.java
+++ b/src/main/java/com/gaotao/modules/handlingunit/service/impl/HandlingUnitServiceImpl.java
@@ -65,6 +65,14 @@ public class HandlingUnitServiceImpl extends ServiceImpl<HandlingUnitMapper, Han
         return baseMapper.selectHandlingUnitDetail(site, unitId);
     }
 
+    @Override
+    public HandlingUnitDto scanHandlingUnitLabelForOther(String site, String unitId) {
+        if(!wmsAvailabilityControlIdService.checkPartOperationAllowed(site,unitId,"part_non_order_issue_control")){
+            throw new RuntimeException("本标签的 availability control id 不允许其他出库！");
+        }
+        return baseMapper.selectHandlingUnitDetail(site, unitId);
+    }
+
     @Override
     @Transactional
     public String packHandlingUnit(HandlingUnitPackDto packDto) {
diff --git a/src/main/java/com/gaotao/modules/scrap/controller/ScrapController.java b/src/main/java/com/gaotao/modules/scrap/controller/ScrapController.java
index 0794ba12..d65ee4d1 100644
--- a/src/main/java/com/gaotao/modules/scrap/controller/ScrapController.java
+++ b/src/main/java/com/gaotao/modules/scrap/controller/ScrapController.java
@@ -5,6 +5,7 @@ import com.gaotao.modules.scrap.entity.ScrapLabelDto;
 import com.gaotao.modules.scrap.entity.ScrapConfirmDto;
 import com.gaotao.modules.scrap.service.ScrapService;
 import com.gaotao.modules.sys.controller.AbstractController;
+import com.gaotao.modules.warehouse.service.WmsAvailabilityControlIdService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -20,12 +21,17 @@ public class ScrapController extends AbstractController {
 
     @Autowired
     private ScrapService scrapService;
+    @Autowired
+    private WmsAvailabilityControlIdService wmsAvailabilityControlIdService;
 
     /**
      * 扫描报废标签
      */
     @PostMapping("scanScrapLabel")
     public R scanScrapLabel(@RequestBody ScrapLabelDto dto) {
+        if(!wmsAvailabilityControlIdService.checkPartOperationAllowed(dto.getSite(),dto.getLabelCode(),"part_scrap_control")){
+            throw new RuntimeException("本标签的 availability control id 不允许报废！");
+        }
         try {
             ScrapLabelDto labelInfo = scrapService.scanScrapLabel(dto);
             if (labelInfo != null) {