From 22fdaa6df3fed4e1c14abcad4101a676d238dd2c Mon Sep 17 00:00:00 2001
From: liangzhou <594755172@qq.com>
Date: Thu, 13 Nov 2025 15:52:33 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9B=98=E7=82=B9=E7=A1=AE=E8=AE=A4=E6=95=B0?=
 =?UTF-8?q?=E9=87=8F=E4=B8=8D=E4=B8=80=E8=87=B4=E6=97=B6=EF=BC=8C=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=E5=BA=93=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wms/constants/enums/StockUpdateReasonEnum.java  |  3 ++-
 .../java/com/wms/controller/TaskController.java     | 13 +++++++++++++
 .../wms/entity/app/dto/extend/StockDetailInfo.java  |  4 ++++
 3 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/wms/constants/enums/StockUpdateReasonEnum.java b/src/main/java/com/wms/constants/enums/StockUpdateReasonEnum.java
index c6d2ee0..f949d39 100644
--- a/src/main/java/com/wms/constants/enums/StockUpdateReasonEnum.java
+++ b/src/main/java/com/wms/constants/enums/StockUpdateReasonEnum.java
@@ -13,7 +13,8 @@ public enum StockUpdateReasonEnum {
     KITTING_UPDATE("备料拣选更新"),
     CONFIRM_UPDATE("站台确认更新"),
     CONFIRM_DELETE("站台处理箱料错误"),
-    CLC_NO_PLAN_UPDATE("直接物料非计划领料回库更新");
+    CLC_NO_PLAN_UPDATE("直接物料非计划领料回库更新"),
+    INV_CONFIRM("盘点确认数量不一致更新");
 
     StockUpdateReasonEnum(String reason) {
         this.reason = reason;
diff --git a/src/main/java/com/wms/controller/TaskController.java b/src/main/java/com/wms/controller/TaskController.java
index 85f788d..4b7d15b 100644
--- a/src/main/java/com/wms/controller/TaskController.java
+++ b/src/main/java/com/wms/controller/TaskController.java
@@ -3400,6 +3400,19 @@ public class TaskController {
                     .apply("goods_related ->> '$.goodsId' = {0}" + MYSQL_JSON_CI, confirmRequest.getGoodsId())
                     .eq(Stock::getVehicleId, confirmRequest.getVehicleId())
                     .last("limit 1"));
+            // 更新库存数量
+            if (existStock != null && existStock.getGoodsRelated() != null) {
+                if (confirmRequest.getConfirmNum().compareTo(existStock.getGoodsRelated().getRemainNum()) != 0) {
+                    Stock originStock = BeanUtil.copyProperties(existStock, Stock.class);
+                    BigDecimal quantityBefore = originStock.getGoodsRelated().getRemainNum();
+                    StockDetailInfo goodsDetail = existStock.getGoodsRelated();
+                    // 更新库存
+                    goodsDetail.setRemainNum(confirmRequest.getConfirmNum());
+                    existStock.setGoodsRelated(goodsDetail);
+                    stockService.updateById(existStock);
+                    stockUpdateRecordService.addStockUpdateRecord(originStock, existStock, StockUpdateReasonEnum.INV_CONFIRM.getReason(), confirmRequest.getUserName(), quantityBefore);
+                }
+            }
             // 保存盘点记录
             List<InventoryHistory> historyList = new ArrayList<>();
             for (InventoryList inventoryList : currentGoodsInvList) {
diff --git a/src/main/java/com/wms/entity/app/dto/extend/StockDetailInfo.java b/src/main/java/com/wms/entity/app/dto/extend/StockDetailInfo.java
index 340fc93..d2a730b 100644
--- a/src/main/java/com/wms/entity/app/dto/extend/StockDetailInfo.java
+++ b/src/main/java/com/wms/entity/app/dto/extend/StockDetailInfo.java
@@ -1,10 +1,14 @@
 package com.wms.entity.app.dto.extend;
 
+import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 import java.math.BigDecimal;
 
 @Data
+@AllArgsConstructor
+@NoArgsConstructor
 public class StockDetailInfo {
     /**
      * 物料编号