PDA上架修改

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);
     }
 

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;
 

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());