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/productsales/MesWmProductSalesServiceImpl.java |  179 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 169 insertions(+), 10 deletions(-)

diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productsales/MesWmProductSalesServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productsales/MesWmProductSalesServiceImpl.java
index a1cedf7..69d2d69 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productsales/MesWmProductSalesServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productsales/MesWmProductSalesServiceImpl.java
@@ -2,6 +2,8 @@
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.ObjUtil;
+import cn.hutool.core.util.StrUtil;
+import cn.iocoder.yudao.framework.common.exception.ServiceException;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
@@ -9,28 +11,40 @@
 import cn.iocoder.yudao.module.mes.controller.admin.wm.productsales.vo.MesWmProductSalesPageReqVO;
 import cn.iocoder.yudao.module.mes.controller.admin.wm.productsales.vo.MesWmProductSalesSaveReqVO;
 import cn.iocoder.yudao.module.mes.controller.admin.wm.productsales.vo.MesWmProductSalesShippingReqVO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.md.item.MesMdItemDO;
 import cn.iocoder.yudao.module.mes.dal.dataobject.wm.salesnotice.MesWmSalesNoticeDO;
 import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productsales.MesWmProductSalesDO;
 import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productsales.MesWmProductSalesDetailDO;
 import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productsales.MesWmProductSalesLineDO;
 import cn.iocoder.yudao.module.mes.dal.mysql.wm.productsales.MesWmProductSalesMapper;
+import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
+import cn.iocoder.yudao.module.mes.dal.mysql.wm.productsales.MesWmProductSalesLineMapper;
 import cn.iocoder.yudao.module.mes.enums.MesBizTypeConstants;
 import cn.iocoder.yudao.module.mes.enums.wm.MesWmProductSalesStatusEnum;
 import cn.iocoder.yudao.module.mes.enums.wm.MesWmQualityStatusEnum;
 import cn.iocoder.yudao.module.mes.enums.wm.MesWmSalesNoticeStatusEnum;
+import cn.iocoder.yudao.module.mes.enums.wm.MesWmStockReserveBizTypeEnum;
 import cn.iocoder.yudao.module.mes.enums.wm.MesWmTransactionTypeEnum;
-import cn.iocoder.yudao.module.mes.service.md.client.MesMdClientService;
+import cn.iocoder.yudao.module.crm.api.customer.CrmCustomerApi;
+import cn.iocoder.yudao.module.mes.service.md.item.MesMdItemService;
 import cn.iocoder.yudao.module.mes.service.wm.materialstock.MesWmMaterialStockService;
 import cn.iocoder.yudao.module.mes.service.wm.salesnotice.MesWmSalesNoticeService;
+import cn.iocoder.yudao.module.mes.service.wm.stockreserve.MesWmStockReserveService;
 import cn.iocoder.yudao.module.mes.service.wm.transaction.MesWmTransactionService;
 import cn.iocoder.yudao.module.mes.service.wm.transaction.dto.MesWmTransactionSaveReqDTO;
+import cn.iocoder.yudao.module.mes.service.qc.oqc.MesQcOqcService;
+import cn.iocoder.yudao.module.erp.api.sale.ErpSaleOrderApi;
+import cn.iocoder.yudao.module.erp.api.sale.enums.ErpSaleOrderOutStatusEnum;
 import jakarta.annotation.Resource;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.annotation.Validated;
 
 import java.math.BigDecimal;
 import java.util.List;
+import java.util.Objects;
 
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList;
@@ -39,27 +53,44 @@
 /**
  * MES 閿�鍞嚭搴撳崟 Service 瀹炵幇绫�
  *
- * @author 鑺嬮亾婧愮爜
+ * @author 瓒呯骇绠$悊鍛�
  */
 @Service
 @Validated
+@Slf4j
 public class MesWmProductSalesServiceImpl implements MesWmProductSalesService {
 
     @Resource
     private MesWmProductSalesMapper productSalesMapper;
+    @Resource
+    private MesWmProductSalesLineMapper productSalesLineMapper;
 
     @Resource
     private MesWmProductSalesLineService productSalesLineService;
     @Resource
     private MesWmProductSalesDetailService productSalesDetailService;
     @Resource
-    private MesMdClientService clientService;
+    private MesWmOqcConcessionGuard oqcConcessionGuard;
+    @Resource
+    private CrmCustomerApi customerApi;
     @Resource
     private MesWmSalesNoticeService salesNoticeService;
     @Resource
     private MesWmTransactionService wmTransactionService;
     @Resource
     private MesWmMaterialStockService materialStockService;
+    @Resource
+    private MesWmStockReserveService stockReserveService;
+    @Resource
+    @Lazy
+    private MesQcOqcService oqcService;
+
+    @Resource
+    private ErpSaleOrderApi saleOrderApi;
+    @Resource
+    private MesWmSalesReelGuard salesReelGuard;
+    @Resource
+    private MesMdItemService mdItemService;
 
     @Override
     public Long createProductSales(MesWmProductSalesSaveReqVO createReqVO) {
@@ -105,7 +136,7 @@
 
     @Override
     public PageResult<MesWmProductSalesDO> getProductSalesPage(MesWmProductSalesPageReqVO pageReqVO) {
-        return productSalesMapper.selectPage(pageReqVO);
+        return productSalesMapper.selectPage(pageReqVO, (List<Long>) null);
     }
 
     @Override
@@ -125,10 +156,14 @@
             }
         }
 
+        // 鑾峰彇鍑哄簱鍗曚俊鎭�
+        MesWmProductSalesDO sales = productSalesMapper.selectById(id);
+
         // 妫�鏌ユ墍鏈夎鐨� oqcCheckFlag锛氬鏋滄湁闇�瑕� OQC 妫�楠岀殑琛岋紝杩涘叆寰呮娴嬬姸鎬�
         boolean needOqc = CollectionUtils.anyMatch(lines,
                 line -> Boolean.TRUE.equals(line.getOqcCheckFlag()));
         if (needOqc) {
+            // 妫�楠屽崟鐢辫川妫�浜哄憳鍏堣褰曞叆锛屽緟妫�鏄庣粏閫氳繃鐩樺彿鍏宠仈宸插畬鎴愮殑妫�楠屽崟銆�
             // 鎵归噺鍒濆鍖� OQC 琛岀殑璐ㄩ噺鐘舵�佷负"寰呮楠�"
             List<Long> oqcLineIds = convertList(
                     CollectionUtils.filterList(lines, line -> Boolean.TRUE.equals(line.getOqcCheckFlag())),
@@ -166,7 +201,10 @@
     @Transactional(rollbackFor = Exception.class)
     public void stockProductSales(Long id) {
         // 鏍¢獙瀛樺湪
-        MesWmProductSalesDO sales = validateProductSalesExists(id);
+        validateProductSalesExists(id);
+        MesWmProductSalesDO sales = productSalesMapper.selectOne(new LambdaQueryWrapperX<MesWmProductSalesDO>()
+                .eq(MesWmProductSalesDO::getId, id).last("FOR UPDATE"));
+        if (sales == null) throw exception(WM_PRODUCT_SALES_NOT_EXISTS);
         if (ObjUtil.notEqual(MesWmProductSalesStatusEnum.APPROVING.getStatus(), sales.getStatus())) {
             throw exception(WM_PRODUCT_SALES_CANNOT_PICK);
         }
@@ -177,8 +215,12 @@
             if (CollUtil.isEmpty(details)) {
                 throw exception(WM_PRODUCT_SALES_DETAILS_EMPTY);
             }
-            // 鏍¢獙搴撳瓨鍏呰冻
+            oqcConcessionGuard.validateQuantity(line, CollectionUtils.getSumValue(details,
+                    MesWmProductSalesDetailDO::getQuantity, BigDecimal::add, BigDecimal.ZERO));
+            // 鏍¢獙搴撳瓨鍏呰冻骞跺垱寤哄崰鐢�
             for (MesWmProductSalesDetailDO detail : details) {
+                salesReelGuard.validate(line, detail.getBatchId());
+                oqcConcessionGuard.validate(line, detail.getMaterialStockId(), detail.getBatchCode(), detail.getQuantity());
                 materialStockService.validateSelectedStock(
                         detail.getMaterialStockId(),
                         detail.getItemId(),
@@ -189,12 +231,28 @@
                         detail.getAreaId(),
                         detail.getQuantity()
                 );
+                // 鍒涘缓搴撳瓨鍗犵敤
+                stockReserveService.createReserve(
+                        detail.getMaterialStockId(),
+                        MesWmStockReserveBizTypeEnum.PRODUCT_SALES.getType(),
+                        id,
+                        sales.getCode(),
+                        detail.getId(),
+                        detail.getItemId(),
+                        detail.getQuantity()
+                );
             }
         }
 
         // 鎵ц鎷h揣锛堝緟鎷h揣 鈫� 寰呭~鍐欒繍鍗曪級
         productSalesMapper.updateById(new MesWmProductSalesDO()
                 .setId(id).setStatus(MesWmProductSalesStatusEnum.SHIPPING.getStatus()));
+
+        // 鍥炲啓 ERP 閿�鍞鍗曞嚭搴撶姸鎬佷负"閮ㄥ垎鍑哄簱"锛堣〃绀哄凡鎷h揣/鍗犵敤锛�
+        if (sales.getSaleOrderId() != null) {
+            saleOrderApi.updateOrderOutStatusTo(sales.getSaleOrderId(),
+                    ErpSaleOrderOutStatusEnum.PART_OUT.getStatus());
+        }
     }
 
     @Override
@@ -223,23 +281,97 @@
             throw exception(WM_PRODUCT_SALES_CANNOT_FINISH);
         }
 
-        // 2. 閬嶅巻鎵�鏈夋槑缁嗭紝鍒涘缓搴撳瓨浜嬪姟锛堟墸鍑忓簱瀛� + 璁板綍娴佹按锛�
+        // 2. 纭鍗犵敤杞嚭搴擄紙閲婃斁鍗犵敤閲忥級
+        stockReserveService.confirmReserveToOutbound(MesWmStockReserveBizTypeEnum.PRODUCT_SALES.getType(), id);
+
+        // 3. 閬嶅巻鎵�鏈夋槑缁嗭紝鍒涘缓搴撳瓨浜嬪姟锛堟墸鍑忓簱瀛� + 璁板綍娴佹按锛�
         createTransactionList(sales);
 
-        // 3. 鏇存柊鍑哄簱鍗曠姸鎬�
+        // 4. 鏇存柊鍑哄簱鍗曠姸鎬�
         productSalesMapper.updateById(new MesWmProductSalesDO()
                 .setId(id).setStatus(MesWmProductSalesStatusEnum.FINISHED.getStatus()));
+
+        // 5. 鏇存柊鍏宠仈鐨勫彂璐ч�氱煡鍗曞嚭搴撴暟閲忓拰鐘舵��
+        if (sales.getNoticeId() != null) {
+            updateSalesNoticeOutCount(sales);
+        }
+
+        // 6. 鍥炲啓 ERP 閿�鍞鍗曠殑鍑哄簱鏁伴噺鍜岀姸鎬�
+        updateErpSaleOrderOutCount(sales);
+    }
+
+    /**
+     * 鏇存柊鍙戣揣閫氱煡鍗曠殑鍑哄簱鏁伴噺鍜岀姸鎬�
+     */
+    private void updateSalesNoticeOutCount(MesWmProductSalesDO sales) {
+        // 鑾峰彇鍑哄簱鍗曡
+        List<MesWmProductSalesLineDO> lines = productSalesLineService.getProductSalesLineListBySalesId(sales.getId());
+        if (CollUtil.isEmpty(lines)) {
+            return;
+        }
+        // 閬嶅巻琛岋紝鎸� noticeLineId 鏇存柊鍑哄簱鏁伴噺
+        for (MesWmProductSalesLineDO line : lines) {
+            if (line.getNoticeLineId() != null && line.getQuantity() != null) {
+                salesNoticeService.updateSalesNoticeLineOutCount(line.getNoticeLineId(), line.getQuantity());
+            }
+        }
+    }
+
+    /**
+     * 鍥炲啓 ERP 閿�鍞鍗曠殑鍑哄簱鏁伴噺鍜岀姸鎬�
+     */
+    private void updateErpSaleOrderOutCount(MesWmProductSalesDO sales) {
+        // 鑾峰彇鍑哄簱鍗曡
+        List<MesWmProductSalesLineDO> lines = productSalesLineService.getProductSalesLineListBySalesId(sales.getId());
+        if (CollUtil.isEmpty(lines)) {
+            return;
+        }
+        // 鐢ㄤ簬瀛樺偍閿�鍞鍗� ID锛岄伩鍏嶉噸澶嶆洿鏂�
+        Long saleOrderId = null;
+        // 閬嶅巻琛岋紝鎸� saleOrderItemId 鏇存柊鍑哄簱鏁伴噺
+        for (MesWmProductSalesLineDO line : lines) {
+            if (line.getSaleOrderItemId() != null && line.getQuantity() != null) {
+                saleOrderApi.updateOrderItemOutCount(line.getSaleOrderItemId(), line.getQuantity());
+                // 鑾峰彇閿�鍞鍗� ID锛堜粠绗竴涓湁鏁堢殑鏄庣粏椤硅幏鍙栵級
+                if (saleOrderId == null) {
+                    cn.iocoder.yudao.module.erp.api.sale.dto.ErpSaleOrderItemRespDTO itemDTO =
+                            saleOrderApi.getSaleOrderItem(line.getSaleOrderItemId()).getCheckedData();
+                    if (itemDTO != null && itemDTO.getOrderId() != null) {
+                        saleOrderId = itemDTO.getOrderId();
+                    }
+                }
+            }
+        }
+        // 鏇存柊閿�鍞鍗曠殑鍑哄簱鐘舵��
+        if (saleOrderId != null) {
+            saleOrderApi.updateOrderOutStatus(saleOrderId);
+        }
     }
 
     private void createTransactionList(MesWmProductSalesDO sales) {
         List<MesWmProductSalesDetailDO> details = productSalesDetailService.getProductSalesDetailListBySalesId(sales.getId());
+        for (MesWmProductSalesLineDO line : productSalesLineService.getProductSalesLineListBySalesId(sales.getId())) {
+            BigDecimal quantity = details.stream().filter(detail -> ObjUtil.equal(detail.getLineId(), line.getId()))
+                    .map(MesWmProductSalesDetailDO::getQuantity).filter(Objects::nonNull)
+                    .reduce(BigDecimal.ZERO, BigDecimal::add);
+            oqcConcessionGuard.validateQuantity(line, quantity);
+        }
+        for (MesWmProductSalesDetailDO detail : details) {
+            MesWmProductSalesLineDO line = productSalesLineService.getProductSalesLine(detail.getLineId());
+            if (line == null || !ObjUtil.equal(line.getSalesId(), sales.getId())) {
+                throw exception(WM_PRODUCT_SALES_DETAIL_LINE_NOT_MATCH);
+            }
+            salesReelGuard.validate(line, detail.getBatchId());
+            oqcConcessionGuard.validate(line, detail.getMaterialStockId(), detail.getBatchCode(), detail.getQuantity());
+        }
         wmTransactionService.createTransactionList(convertList(details, detail -> new MesWmTransactionSaveReqDTO()
                 .setType(MesWmTransactionTypeEnum.OUT.getType()).setItemId(detail.getItemId())
                 .setQuantity(detail.getQuantity().negate()) // 鍑哄簱鏁伴噺涓鸿礋鏁�
                 .setBatchId(detail.getBatchId()).setBatchCode(detail.getBatchCode())
                 .setWarehouseId(detail.getWarehouseId()).setLocationId(detail.getLocationId()).setAreaId(detail.getAreaId())
                 .setBizType(MesBizTypeConstants.WM_PRODUCT_SALES).setBizId(sales.getId())
-                .setBizCode(sales.getCode()).setBizLineId(detail.getLineId())));
+                .setBizCode(sales.getCode()).setBizLineId(detail.getLineId())
+                .setMaterialStockId(detail.getMaterialStockId()))); // 鎸囧畾搴撳瓨璁板綍ID锛岄伩鍏嶉噸鏂板尮閰�
     }
 
     @Override
@@ -253,6 +385,8 @@
                 MesWmProductSalesStatusEnum.CANCELED.getStatus())) {
             throw exception(WM_PRODUCT_SALES_CANNOT_CANCEL);
         }
+        // 閲婃斁搴撳瓨鍗犵敤
+        stockReserveService.releaseReserve(MesWmStockReserveBizTypeEnum.PRODUCT_SALES.getType(), id);
         // 鍙栨秷
         productSalesMapper.updateById(new MesWmProductSalesDO()
                 .setId(id).setStatus(MesWmProductSalesStatusEnum.CANCELED.getStatus()));
@@ -265,9 +399,34 @@
         if (ObjUtil.notEqual(MesWmProductSalesStatusEnum.CONFIRMED.getStatus(), sales.getStatus())) {
             throw exception(WM_PRODUCT_SALES_CANNOT_CONFIRM);
         }
+        // 鍑鸿揣妫�楠屼笉鍚堟牸鐨勫嚭搴撹蹇呴』鍏堝畬鎴愪笉鍚堟牸鍝佸缃紝绂佹鎵嬪伐纭缁曡繃杩斿伐/璁╂闂幆
+        List<MesWmProductSalesLineDO> lines = productSalesLineMapper.selectListBySalesId(id);
+        if (CollUtil.isNotEmpty(lines)) {
+            int rowNo = 0;
+            for (MesWmProductSalesLineDO line : lines) {
+                rowNo++;
+                if (Objects.equals(line.getQualityStatus(), MesWmQualityStatusEnum.FAIL.getStatus())
+                        || line.getNcrDispositionId() != null) {
+                    throw new ServiceException(400, String.format(
+                            "閿�鍞嚭搴撳崟[%s]绗琜%d]琛岀墿鏂橻%s]鍑鸿揣妫�楠屼笉鍚堟牸锛屽皻鏈畬鎴愪笉鍚堟牸鍝佸缃紱"
+                                    + "璇峰厛鍦ㄤ笉鍚堟牸鍝佸鐞嗗崟涓畬鎴愯繑宸�/杩斾慨/閲嶆柊鐢熶骇鎴栬姝ユ斁琛屽悗鍐嶇‘璁ゅ嚭搴�",
+                            sales.getCode(), rowNo, itemLabel(line.getItemId())));
+                }
+            }
+        }
         // OQC 妫�楠屽畬鎴愶紝娴佽浆鍒板緟鎷h揣
         productSalesMapper.updateById(new MesWmProductSalesDO()
                 .setId(id).setStatus(MesWmProductSalesStatusEnum.APPROVING.getStatus()));
+    }
+
+    private String itemLabel(Long itemId) {
+        MesMdItemDO item = itemId == null ? null : mdItemService.getItem(itemId);
+        if (item == null) {
+            return "ID=" + itemId;
+        }
+        String label = (StrUtil.blankToDefault(item.getCode(), "") + " "
+                + StrUtil.blankToDefault(item.getName(), "")).trim();
+        return label.isEmpty() ? "ID=" + itemId : label;
     }
 
     @Override
@@ -279,7 +438,7 @@
         // 鏍¢獙缂栫爜鍞竴
         validateCodeUnique(id, reqVO.getCode());
         // 鏍¢獙瀹㈡埛瀛樺湪
-        clientService.validateClientExistsAndEnable(reqVO.getClientId());
+        customerApi.validateCustomer(reqVO.getClientId());
         // 鏍¢獙鍙戣揣閫氱煡鍗�
         if (reqVO.getNoticeId() != null) {
             MesWmSalesNoticeDO notice = salesNoticeService.validateSalesNoticeExists(reqVO.getNoticeId());

--
Gitblit v1.9.3