From 3fd8d1f2e73a843acd330e8e8b84f5800f858407 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期二, 10 十一月 2026 11:42:21 +0800
Subject: [PATCH] feat(seal): 印章详情视图与编辑删除接口

---
 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/materialstock/MesWmMaterialStockServiceImpl.java |   61 +++++++++++++++++++++++-------
 1 files changed, 46 insertions(+), 15 deletions(-)

diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/materialstock/MesWmMaterialStockServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/materialstock/MesWmMaterialStockServiceImpl.java
index cccd0c3..3987dda 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/materialstock/MesWmMaterialStockServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/materialstock/MesWmMaterialStockServiceImpl.java
@@ -8,6 +8,7 @@
 import cn.iocoder.yudao.framework.common.exception.ServiceException;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.util.collection.SetUtils;
+import cn.iocoder.yudao.framework.operatelog.core.util.OperateLogUtils;
 import cn.iocoder.yudao.module.mes.controller.admin.wm.materialstock.vo.MesWmMaterialStockAdjustReqVO;
 import cn.iocoder.yudao.module.mes.controller.admin.wm.materialstock.vo.MesWmMaterialStockFreezeReqVO;
 import cn.iocoder.yudao.module.mes.controller.admin.wm.materialstock.vo.MesWmMaterialStockImportExcelVO;
@@ -19,6 +20,7 @@
 import cn.iocoder.yudao.module.mes.dal.dataobject.mdm.MesMdmItemDO;
 import cn.iocoder.yudao.module.mes.dal.dataobject.md.item.MesMdItemTypeDO;
 import cn.iocoder.yudao.module.mes.dal.dataobject.wm.materialstock.MesWmMaterialStockDO;
+import cn.iocoder.yudao.module.mes.dal.mysql.wm.materialstock.MesWmMaterialStockFreezeClaimMapper;
 import cn.iocoder.yudao.module.mes.dal.dataobject.wm.warehouse.MesWmWarehouseAreaDO;
 import cn.iocoder.yudao.module.mes.dal.dataobject.wm.warehouse.MesWmWarehouseDO;
 import cn.iocoder.yudao.module.mes.dal.dataobject.wm.warehouse.MesWmWarehouseLocationDO;
@@ -40,6 +42,7 @@
 import cn.iocoder.yudao.module.mes.service.wm.warehouse.MesWmWarehouseAreaService;
 import cn.iocoder.yudao.module.mes.service.wm.warehouse.MesWmWarehouseLocationService;
 import cn.iocoder.yudao.module.mes.service.wm.warehouse.MesWmWarehouseService;
+import com.mzt.logapi.starter.annotation.LogRecord;
 import jakarta.annotation.Resource;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
@@ -57,6 +60,7 @@
 import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet;
 import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.filterList;
 import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.*;
+import static cn.iocoder.yudao.module.mes.enums.LogRecordConstants.*;
 
 /**
  * MES 搴撳瓨鍙拌处 Service 瀹炵幇绫�
@@ -67,6 +71,8 @@
 
     @Resource
     private MesWmMaterialStockMapper materialStockMapper;
+    @Resource
+    private MesWmMaterialStockFreezeClaimMapper freezeClaimMapper;
 
     @Resource
     private MesMdmItemService mdmItemService;
@@ -129,6 +135,8 @@
             MesMdItemDO item = mdItemService.getItem(pageReqVO.getItemId());
             if (item != null && item.getMdmItemId() != null) {
                 itemIds = SetUtils.asSet(item.getMdmItemId());
+            } else {
+                return PageResult.empty();
             }
         }
         // 1.3 瑙f瀽 virtualFilter锛氳浆鎹负铏氭嫙浠� warehouseId
@@ -147,21 +155,34 @@
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public void updateMaterialStockFrozen(MesWmMaterialStockFreezeReqVO updateReqVO) {
-        // 鏍¢獙瀛樺湪
-        validateMaterialStockExists(updateReqVO.getId());
-
-        // 鏇存柊鍐荤粨鐘舵��
-        materialStockMapper.updateById(new MesWmMaterialStockDO()
-                .setId(updateReqVO.getId()).setFrozen(updateReqVO.getFrozen()));
+        setMaterialStockFreeze(List.of(updateReqVO.getId()), "MANUAL", 0L, updateReqVO.getFrozen());
     }
 
     @Override
-    public void updateMaterialStockFrozen(Collection<Long> ids, boolean frozen) {
+    @Transactional(rollbackFor = Exception.class)
+    public void setMaterialStockFreeze(Collection<Long> ids, String sourceType, Long sourceId, boolean frozen) {
         if (CollUtil.isEmpty(ids)) {
             return;
         }
-        materialStockMapper.updateByIds(ids, new MesWmMaterialStockDO().setFrozen(frozen));
+        // 鎸� ID 鍥哄畾椤哄簭鍔犻攣锛岄伩鍏嶄袱涓换鍔″悓鏃跺喕缁撶浉鍚屽簱瀛樻椂浜х敓閿侀『搴忓弽杞��
+        for (Long stockId : ids.stream().filter(Objects::nonNull).distinct().sorted().toList()) {
+            MesWmMaterialStockDO stock = materialStockMapper.lockById(stockId);
+            if (stock == null) {
+                throw exception(WM_MATERIAL_STOCK_NOT_EXISTS);
+            }
+            if (frozen) {
+                freezeClaimMapper.acquire(stockId, sourceType, sourceId);
+            } else {
+                freezeClaimMapper.release(stockId, sourceType, sourceId);
+            }
+            boolean effectiveFrozen = freezeClaimMapper.countByStockId(stockId) > 0;
+            if (!Objects.equals(stock.getFrozen(), effectiveFrozen)) {
+                materialStockMapper.updateById(new MesWmMaterialStockDO()
+                        .setId(stockId).setFrozen(effectiveFrozen));
+            }
+        }
     }
 
     @Override
@@ -396,7 +417,7 @@
         } else {
             // 鍑哄簱鏃舵牎楠屾壒娆″瓨鍦�
             if (batchId != null) {
-                batchService.validateBatchExists(batchId, reqVO.getItemId());
+                batchCode = batchService.validateBatchExists(batchId, reqVO.getItemId()).getCode();
             }
         }
 
@@ -454,20 +475,26 @@
      * @return 鎵规璁板綍锛堢墿鏂欐湭鍚敤鎵规绠$悊鏃惰繑鍥� null锛�
      */
     private MesWmBatchDO resolveBatch(MesWmMaterialStockAdjustReqVO reqVO, MesMdmItemDO item) {
-        // 1. 鐗╂枡鏈惎鐢ㄦ壒娆$鐞嗭紝杩斿洖 null
-        if (Boolean.FALSE.equals(item.getIsBatchManaged())) {
-            return null;
+        // 鍗充娇鐗╂枡鏈惎鐢ㄦ櫘閫氭壒娆$鐞嗭紝涔熻淇濈暀骞舵牎楠岀洏鍙疯拷婧壒娆°��
+        if (reqVO.getBatchId() != null) {
+            MesWmBatchDO existing = batchService.validateBatchExists(reqVO.getBatchId(), reqVO.getItemId());
+            if (StrUtil.isNotBlank(reqVO.getReelNo())
+                    && !Objects.equals(StrUtil.trim(reqVO.getReelNo()), StrUtil.trim(existing.getReelNo()))) {
+                throw exception(WM_BATCH_REEL_MISMATCH);
+            }
+            return existing;
         }
 
-        // 2. 浼犲叆 batchId锛屾牎楠屽苟杩斿洖宸叉湁鎵规
-        if (reqVO.getBatchId() != null) {
-            return batchService.validateBatchExists(reqVO.getBatchId(), reqVO.getItemId());
+        // 1. 鏈寚瀹氳拷婧壒娆′笖鐗╂枡鏈惎鐢ㄦ壒娆$鐞嗭紝杩斿洖 null
+        if (Boolean.FALSE.equals(item.getIsBatchManaged()) && StrUtil.isBlank(reqVO.getReelNo())) {
+            return null;
         }
 
         // 3. 鏈紶 batchId锛岃嚜鍔ㄥ垱寤烘壒娆�
         MesWmBatchGenerateReqVO batchReqVO = new MesWmBatchGenerateReqVO()
                 .setItemId(reqVO.getItemId())
                 .setBatchCode(reqVO.getBatchCode())
+                .setReelNo(StrUtil.trimToNull(reqVO.getReelNo()))
                 .setVendorId(reqVO.getVendorId())
                 .setProduceDate(reqVO.getProduceDate() != null ? reqVO.getProduceDate().atStartOfDay() : null)
                 .setExpireDate(reqVO.getExpireDate() != null ? reqVO.getExpireDate().atStartOfDay() : null)
@@ -593,6 +620,8 @@
     }
 
     @Override
+    @LogRecord(type = MES_WM_MATERIAL_STOCK_TYPE, subType = MES_WM_MATERIAL_STOCK_IMPORT_SUB_TYPE, bizNo = "0",
+            success = MES_WM_MATERIAL_STOCK_IMPORT_SUCCESS)
     public MesWmMaterialStockImportRespVO importMaterialStockList(List<MesWmMaterialStockImportExcelVO> importList) {
         // 鎿嶄綔绫诲瀷鍙栧�硷細澧炲姞 / 鍑忓皯 / 瑕嗙洊
         final String OP_ADD = "澧炲姞";
@@ -755,6 +784,8 @@
                 respVO.getFailureNames().put(key, ex.getMessage());
             }
         }
+        // 璁板綍瀵煎叆缁撴灉姹囨�伙紝渚� @LogRecord 鐨� success 鏂囨寮曠敤
+        OperateLogUtils.putImportSummary(respVO.getCreateNames(), respVO.getUpdateNames(), respVO.getFailureNames());
         return respVO;
     }
 

--
Gitblit v1.9.3