From 2d03084f0c95120253895bfa755cf518b981bf54 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com>
Date: Thu, 16 Jul 2026 19:00:49 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E6=89=B9=E4=B8=8A=E6=9E=B6=E5=A4=9A?=
 =?UTF-8?q?=E4=BD=99=E6=95=B0=E6=8D=AE=E5=A4=84=E7=90=86=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/StockInOrderDomainService.java    | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/service/StockInOrderDomainService.java b/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/service/StockInOrderDomainService.java
index c022ecaa9..d4ba915cb 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/service/StockInOrderDomainService.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/service/StockInOrderDomainService.java
@@ -3,6 +3,7 @@ package com.mhd.wms.domain.stockInOrder.service;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.TypeReference;
 import com.alibaba.fastjson2.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.mhd.common.core.constant.SnowFlakeConstants;
@@ -525,6 +526,10 @@ public class StockInOrderDomainService {
                         .eq(ReceiptMaterialDetail::getMaterialBaseInfoId, materialBaseInfoId)
                         .eq(ReceiptMaterialDetail::getInUniqueId, uniqueId)
                         .eq(ReceiptMaterialDetail::getDelFlag, 1), false);
+                BigDecimal alreadyReceiptQuantity = receiptMaterialDetail.getAlreadyReceiptQuantity();
+                if (alreadyReceiptQuantity != null && alreadyReceiptQuantity.compareTo(collectQuantity) == 0) {
+                    continue;
+                }
                 receiptMaterialDetail.setReceiptQuantity(collectQuantity);
                 receiptMaterialDetail.setAlreadyReceiptQuantity(collectQuantity);
                 BigDecimal quantity = receiptMaterialDetail.getQuantity();
@@ -722,6 +727,23 @@ public class StockInOrderDomainService {
                 materialDetailService.updateById(inMaterialDetail);
             }
         }
+        StockShelfOrder stockShelfOrder = stockShelfOrderService.getOne(new QueryWrapper<StockShelfOrder>().lambda()
+                .eq(StockShelfOrder::getInOrderNumber, inOrderNumber)
+                .eq(StockShelfOrder::getDelFlag, 1), false);
+        if (stockShelfOrder != null) {
+            String shelfOrderNumber = stockShelfOrder.getShelfOrderNumber();
+            List<ShelfMaterialDetail> list = shelfMaterialDetailService.list(new LambdaQueryWrapper<ShelfMaterialDetail>()
+                    .eq(ShelfMaterialDetail::getShelfOrderNumber, shelfOrderNumber)
+                    .eq(ShelfMaterialDetail::getDelFlag, 1));
+            if (list!=null&&list.size() > 0) {
+                BigDecimal quantity = BigDecimal.ZERO;
+                for (ShelfMaterialDetail shelfMaterialDetail : list) {
+                    quantity = quantity.add(shelfMaterialDetail.getAlreadyShelvesQuantity());
+                }
+                stockShelfOrder.setShelvesQuantity(quantity);
+                stockShelfOrderService.updateById(stockShelfOrder);
+            }
+        }
         return true;
     }