From 1398cdc5500aebc25c4bed76a52318cb88144ed8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A7=A6=E9=B8=BF=E5=B1=95?= <18031053041@163.com>
Date: Thu, 19 Mar 2026 02:14:21 +0800
Subject: [PATCH] =?UTF-8?q?PDA=E4=B8=8A=E6=9E=B6=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../stockShelfOrder/StockShelfOrderApplicationService.java    | 1 +
 .../stockShelfOrder/repository/todo/StockShelfOrderDO.java    | 3 +++
 .../stockShelfOrder/service/StockShelfOrderDomainService.java | 4 +++-
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockShelfOrder/StockShelfOrderApplicationService.java b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockShelfOrder/StockShelfOrderApplicationService.java
index 054cbb62f..470b71f21 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockShelfOrder/StockShelfOrderApplicationService.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockShelfOrder/StockShelfOrderApplicationService.java
@@ -399,6 +399,7 @@ public class StockShelfOrderApplicationService {
         }
         //上架装配参数
         StockShelfOrderDO assembleStockShelfOrderDO = assembleParamByShelf(stockReceiptOrderDO);
+        assembleStockShelfOrderDO.setFromApp(Boolean.TRUE);
         return stockShelfOrderDomainService.upShelf(assembleStockShelfOrderDO);
     }
 
diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/stockShelfOrder/repository/todo/StockShelfOrderDO.java b/mhd_wms/src/main/java/com/mhd/wms/domain/stockShelfOrder/repository/todo/StockShelfOrderDO.java
index 26470b410..537016f38 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/domain/stockShelfOrder/repository/todo/StockShelfOrderDO.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/domain/stockShelfOrder/repository/todo/StockShelfOrderDO.java
@@ -126,6 +126,9 @@ public class StockShelfOrderDO extends StockInOrderBaseDO {
     @ApiModelProperty("物料明细")
     private List<ShelfMaterialDetailDO> materialDetailList;
 
+    @ApiModelProperty("是否来自App（PDA）：true-累加上架数量，false-直接覆盖")
+    private Boolean fromApp;
+
     @ApiModelProperty(name = "创建时间查询条件开始日期")
     private String createTimeStart;
 
diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/stockShelfOrder/service/StockShelfOrderDomainService.java b/mhd_wms/src/main/java/com/mhd/wms/domain/stockShelfOrder/service/StockShelfOrderDomainService.java
index 346167970..026122a87 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/domain/stockShelfOrder/service/StockShelfOrderDomainService.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/domain/stockShelfOrder/service/StockShelfOrderDomainService.java
@@ -544,7 +544,9 @@ public class StockShelfOrderDomainService {
         BigDecimal currentShelvesQuantity = stockShelfOrderPO.getShelvesQuantity() != null ? stockShelfOrderPO.getShelvesQuantity() : BigDecimal.ZERO;
         BigDecimal actualQuantity = stockShelfOrderDO.getActualQuantity() != null ? stockShelfOrderDO.getActualQuantity() : BigDecimal.ZERO;
         BigDecimal reduce = stockShelfOrderDO.getMaterialDetailList().stream().map(ShelfMaterialDetailDO::getShelvesQuantity).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add);
-        stockShelfOrder.setShelvesQuantity(reduce);
+        // PDA（fromApp=true）累加已有上架数量；PC 直接覆盖
+        boolean fromApp = Boolean.TRUE.equals(stockShelfOrderDO.getFromApp());
+        stockShelfOrder.setShelvesQuantity(fromApp ? currentShelvesQuantity.add(reduce) : reduce);
         stockShelfOrder.setShelvesMaterialQuantity(stockShelfOrderPO.getShelvesMaterialQuantity() + stockShelfOrderDO.getActualReceiptMaterialQuantity());
         stockShelfOrder.setUpdateBy(loginUser.getUserid());
         stockShelfOrder.setUpdateByName(loginUser.getUsername());