From be5783c8a7e13bbc76d33c95643d75779cce21db Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期六, 18 七月 2026 15:39:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_business' into dev_business

---
 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/materialstock/MesWmMaterialStockMapper.java |   33 +++++++++++++++++++++++++++++++++
 1 files changed, 33 insertions(+), 0 deletions(-)

diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/materialstock/MesWmMaterialStockMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/materialstock/MesWmMaterialStockMapper.java
index a22847d..3086782 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/materialstock/MesWmMaterialStockMapper.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/materialstock/MesWmMaterialStockMapper.java
@@ -86,6 +86,39 @@
     }
 
     /**
+     * 澧為噺鏇存柊搴撳瓨鍗犵敤閲�
+     *
+     * @param id        搴撳瓨璁板綍缂栧彿
+     * @param count     鍙樺姩鏁伴噺锛堟鏁�=澧炲姞鍗犵敤锛岃礋鏁�=鍑忓皯鍗犵敤锛�
+     * @param checkFlag 鏄惁鏍¢獙鍙敤閲忓厖瓒筹紙涓� true 鏃跺崰鐢ㄤ笉鍏佽瓒呰繃鍙敤閲忥級
+     * @return 褰卞搷琛屾暟
+     */
+    default int updateReservedQuantity(Long id, BigDecimal count, boolean checkFlag) {
+        LambdaUpdateWrapper<MesWmMaterialStockDO> updateWrapper = new LambdaUpdateWrapper<MesWmMaterialStockDO>()
+                .eq(MesWmMaterialStockDO::getId, id)
+                .setSql("reserved_quantity = reserved_quantity + " + count);
+        if (checkFlag && count.compareTo(BigDecimal.ZERO) > 0) {
+            // 鏍¢獙鍙敤閲忓厖瓒筹細quantity - frozen_quantity - reserved_quantity >= count
+            updateWrapper.apply("quantity - IFNULL(frozen_quantity, 0) - IFNULL(reserved_quantity, 0) >= {0}", count);
+        }
+        return update(null, updateWrapper);
+    }
+
+    /**
+     * 澧為噺鏇存柊搴撳瓨鍦ㄩ�旈噺
+     *
+     * @param id    搴撳瓨璁板綍缂栧彿
+     * @param count 鍙樺姩鏁伴噺锛堟鏁�=澧炲姞鍦ㄩ�旓紝璐熸暟=鍑忓皯鍦ㄩ�旓級
+     * @return 褰卞搷琛屾暟
+     */
+    default int updateInTransitQuantity(Long id, BigDecimal count) {
+        LambdaUpdateWrapper<MesWmMaterialStockDO> updateWrapper = new LambdaUpdateWrapper<MesWmMaterialStockDO>()
+                .eq(MesWmMaterialStockDO::getId, id)
+                .setSql("in_transit_quantity = in_transit_quantity + " + count);
+        return update(null, updateWrapper);
+    }
+
+    /**
      * 鎸夌粍鍚堥敭鏌ヨ搴撳瓨璁板綍
      *
      * 鍞竴閿細(itemId, warehouseId, locationId, areaId, batchId, vendorId)

--
Gitblit v1.9.3