Merge branch 'dev-ty1.2' into dev

2026-08-05 18:32:42 +08:00
parent 476d7c8b0e 56b39702b5
commit 925eeba899
16 changed files with 725 additions and 300 deletions
@@ -25,6 +25,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;

 import java.lang.reflect.Field;
+import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -127,6 +128,17 @@ public class StatementStatisticsService {
            }
        }
        List<ImmediateInventoryPO> immediateInventoryPOS = materialInventoryDomainService.queryImmediateInventoryList(immediateInventoryDO);
+
+        // 库存数量合计：与列表同筛选条件、不分页统计全部库存数量，回填到每行
+        if (!CollectionUtils.isEmpty(immediateInventoryPOS)) {
+            BigDecimal totalInventoryQuantity = materialInventoryDomainService.sumImmediateInventoryQuantity(immediateInventoryDO);
+            if (totalInventoryQuantity == null) {
+                totalInventoryQuantity = BigDecimal.ZERO;
+            }
+            BigDecimal finalTotal = totalInventoryQuantity;
+            immediateInventoryPOS.forEach(po -> po.setTotalInventoryQuantity(finalTotal));
+        }
+
        // 性能优化：批量获取批次属性，避免N+1查询问题
        // 1. 收集所有唯一的materialBaseInfoId
        Set<Long> materialBaseInfoIdSet = immediateInventoryPOS.stream()
@@ -2222,24 +2222,31 @@ public class StockReceiptOrderApplicationService {
    }

    /**
-     * PDA 抄码收货不采集毛重、体积、面积：在装配前将对应请求字段置 0，避免 getInfo 带回的累计展示值被当作本次增量。
+     * PDA 抄码收货不采集毛重、体积、面积：在装配前将对应请求字段置 null，
+     * 利用 MyBatis-Plus NOT_NULL 策略跳过这些字段，避免覆盖已有累计数据。
+     * @param lines 收货明细列表
     */
    private static void normalizePdaCopyReceiptGrossVolumeAreaToZero(List<ReceiptMaterialDetailDO> lines) {
+        // 没有明细时，直接返回
        if (CollectionUtils.isEmpty(lines)) {
            return;
        }
+        // 有明细时，遍历
        for (ReceiptMaterialDetailDO line : lines) {
+            // 跳过 line 为 null
            if (line == null) {
                continue;
            }
+            // 在装配之前将字段置为 null
            if (isPdaCopyReceiptLine(line)) {
-                line.setReceiptGrossWeight(BigDecimal.ZERO);
-                line.setTotalGrossWeight(BigDecimal.ZERO);
-                line.setReceiptVolume(BigDecimal.ZERO);
-                line.setTotalVolume(BigDecimal.ZERO);
-                line.setReceiptArea(BigDecimal.ZERO);
-                line.setTotalArea(BigDecimal.ZERO);
+                line.setReceiptGrossWeight(null);
+                line.setTotalGrossWeight(null);
+                line.setReceiptVolume(null);
+                line.setTotalVolume(null);
+                line.setReceiptArea(null);
+                line.setTotalArea(null);
            }
+            // 递归，确保每一个子行都会独立通过 isPdaCopyReceiptLine 判断是否需要清字段
            normalizePdaCopyReceiptGrossVolumeAreaToZero(line.getChildren());
        }
    }
@@ -71,6 +71,12 @@ public interface IMaterialInventoryService extends IService<MaterialInventory>
     */
    public List<ImmediateInventoryPO> queryImmediateInventoryList(ImmediateInventoryDO immediateInventoryDO);

+    /**
+     * 查询即时库存合计数量
+     */
+    public BigDecimal sumImmediateInventoryQuantity(ImmediateInventoryDO immediateInventoryDO);
+
+
    /**
     * @description 增加指定库存
     * @author ZhouGY
@@ -91,6 +91,12 @@ public interface MaterialInventoryMapper extends BaseMapper<MaterialInventory>
     */
    public List<ImmediateInventoryPO> queryImmediateInventoryList(ImmediateInventoryDO immediateInventoryDO);

+    /**
+     * 查询即时库存合计数量（与列表相同筛选条件，返回库存数量总和）
+     */
+    public BigDecimal sumImmediateInventoryQuantity(ImmediateInventoryDO immediateInventoryDO);
+
+

    @Select("SELECT SUM(inventory_quantity) FROM material_inventory a  LEFT JOIN material_base_info b ON a.material_base_info_id = b.material_base_info_id WHERE  a.del_flag = 1 AND b.shipper_id = #{shipperId} AND b.material_base_info_id =  #{materialBaseInfoId}")
    public BigDecimal sumInventoryQuantityByShipperAndMaterialCode(@Param("shipperId") Long shipperId, @Param("materialBaseInfoId") Long materialBaseInfoId);
@@ -464,11 +464,29 @@ public class MaterialInventoryImpl extends ServiceImpl<MaterialInventoryMapper,
        }
    }

+    /**
+     * 分页查询即时库存列表
+     *
+     * @param immediateInventoryDO 即时库存查询条件（含组织权限、货主、物料、仓库、数量区间等筛选条件）
+     * @return 即时库存列表
+     */
    @Override
    public List<ImmediateInventoryPO> queryImmediateInventoryList(ImmediateInventoryDO immediateInventoryDO) {
        return materialInventoryMapper.queryImmediateInventoryList(immediateInventoryDO);
    }

+    /**
+     * 查询即时库存合计数量
+     * <p>与列表查询使用相同筛选条件但不分页，统计筛选条件下所有库存数量之和</p>
+     *
+     * @param immediateInventoryDO 即时库存查询条件（与列表查询保持一致，保证合计口径一致）
+     * @return 库存数量合计值，无数据时为 0
+     */
+    @Override
+    public BigDecimal sumImmediateInventoryQuantity(ImmediateInventoryDO immediateInventoryDO) {
+        return materialInventoryMapper.sumImmediateInventoryQuantity(immediateInventoryDO);
+    }
+
    /**
     * @description 增加指定库存
     * @author ZhouGY
@@ -103,6 +103,20 @@ public class MaterialInventoryDomainService {
        return materialInventoryService.queryImmediateInventoryList(immediateInventoryDO);
    }

+    /**
+     * 查询即时库存合计数量
+     */
+    public BigDecimal sumImmediateInventoryQuantity(ImmediateInventoryDO immediateInventoryDO) {
+        return materialInventoryService.sumImmediateInventoryQuantity(immediateInventoryDO);
+    }
+
+    /**
+     * 根据查询条件获取物料库存信息
+     * <p>按货主、组织、物料、仓库、库位等条件查询，返回汇总后的库存信息（含库存数量合计）</p>
+     *
+     * @param materialInventoryDO 物料库存查询条件（含货主、顶级组织、物料基础信息、仓库、库位等）
+     * @return 匹配条件的物料库存信息，无匹配数据时返回 null
+     */
    public MaterialInventoryPO selectOneByWhere(MaterialInventoryDO materialInventoryDO) {
        return materialInventoryService.selectOneByWhere(materialInventoryDO);
    }
@@ -459,6 +459,7 @@ public class ReceiptMaterialDetailImpl extends ServiceImpl<ReceiptMaterialDetail
                    ReceiptMaterialDetail receiptMaterialDetailChild = new ReceiptMaterialDetail();
                    BeanUtils.copyProperties(receiptMaterialDetailDOChild, receiptMaterialDetailChild);
                    alignPersistedReceiptQuantityToCumulative(receiptMaterialDetailDOChild, receiptMaterialDetailChild);
+                    normalizeZeroMetricsToNull(receiptMaterialDetailChild);
                    receiptMaterialDetailChild.setCreateBy(loginUser.getUserid());
                    receiptMaterialDetailChild.setCreateByName(loginUser.getUsername());
                    receiptMaterialDetailChild.setCreateTime(new Date());
@@ -474,9 +475,12 @@ public class ReceiptMaterialDetailImpl extends ServiceImpl<ReceiptMaterialDetail
                    }
                }
            }
+
            ReceiptMaterialDetail receiptMaterialDetail = new ReceiptMaterialDetail();
            BeanUtils.copyProperties(receiptMaterialDetailDO, receiptMaterialDetail);
            alignPersistedReceiptQuantityToCumulative(receiptMaterialDetailDO, receiptMaterialDetail);
+            // total* 字段为 0 或空字符串时置为 null，避免 MyBatis-Plus NOT_NULL 策略下覆盖已有数据
+            normalizeZeroMetricsToNull(receiptMaterialDetail);
            receiptMaterialDetail.setUpdateBy(loginUser.getUserid());
            receiptMaterialDetail.setUpdateByName(loginUser.getUsername());
            receiptMaterialDetail.setUpdateTime(new Date());
@@ -488,23 +492,25 @@ public class ReceiptMaterialDetailImpl extends ServiceImpl<ReceiptMaterialDetail
        }
        //保存物料明细信息
        saveOrUpdateBatch(receiptMaterialDetailList);
+        //批量新增/更新物料更多属性：保留已有值，仅更新有值的属性，不再先删后插
+        mergeMaterialMoreDetail(materialMoreDetailList, stockReceiptOrderDO, receiptMaterialDetailDOList);
        //批量新增/更新物料更多属性：先删除该收货单下所有明细的旧批次属性，再插入新值，避免重复插入导致更新失效
-        if (!CollectionUtils.isEmpty(materialMoreDetailList)){
-            String receiptOrderNumber = stockReceiptOrderDO.getReceiptOrderNumber();
-            if (StringUtils.isBlank(receiptOrderNumber) && !CollectionUtils.isEmpty(receiptMaterialDetailDOList)) {
-                receiptOrderNumber = receiptMaterialDetailDOList.get(0).getReceiptOrderNumber();
-            }
-            if (StringUtils.isNotBlank(receiptOrderNumber)) {
-                java.util.Set<Long> uniqueIds = collectReceiptDetailUniqueIds(receiptMaterialDetailDOList);
-                if (!uniqueIds.isEmpty()) {
-                    IMaterialMoreDetailService.remove(new QueryWrapper<MaterialMoreDetail>()
-                            .eq("order_number", receiptOrderNumber)
-                            .in("material_detail_unique_id", uniqueIds)
-                            .eq("del_flag", 1));
-                }
-            }
-            IMaterialMoreDetailService.saveBatch(materialMoreDetailList);
-        }
+//        if (!CollectionUtils.isEmpty(materialMoreDetailList)){
+//            String receiptOrderNumber = stockReceiptOrderDO.getReceiptOrderNumber();
+//            if (StringUtils.isBlank(receiptOrderNumber) && !CollectionUtils.isEmpty(receiptMaterialDetailDOList)) {
+//                receiptOrderNumber = receiptMaterialDetailDOList.get(0).getReceiptOrderNumber();
+//            }
+//            if (StringUtils.isNotBlank(receiptOrderNumber)) {
+//                java.util.Set<Long> uniqueIds = collectReceiptDetailUniqueIds(receiptMaterialDetailDOList);
+//                if (!uniqueIds.isEmpty()) {
+//                    IMaterialMoreDetailService.remove(new QueryWrapper<MaterialMoreDetail>()
+//                            .eq("order_number", receiptOrderNumber)
+//                            .in("material_detail_unique_id", uniqueIds)
+//                            .eq("del_flag", 1));
+//                }
+//            }
+//            IMaterialMoreDetailService.saveBatch(materialMoreDetailList);
+//        }
        //批量新增序列号
        if (!CollectionUtils.isEmpty(materialDetailSerialNumberList)){
            inMaterialDetailSerialNumberService.saveBatch(materialDetailSerialNumberList);
@@ -513,6 +519,144 @@ public class ReceiptMaterialDetailImpl extends ServiceImpl<ReceiptMaterialDetail
        updateInMaterialDetailFromAttributeOption(receiptMaterialDetailDOList);
    }

+    /**
+     * 批量合并物料更多属性：有值则更新，无值跳过保留旧值，不存在则新增。
+     * 替代原先「先 DELETE 全部再 INSERT」的策略，避免未填写字段丢失已有数据。
+     * @param materialMoreDetailList     本次收货提交的批次属性列表
+     * @param stockReceiptOrderDO        收货单信息，用于获取收货单号
+     * @param receiptMaterialDetailDOList 收货明细列表，用于提取 uniqueId 集合
+     */
+    private void mergeMaterialMoreDetail(List<MaterialMoreDetail> materialMoreDetailList,
+                                         StockReceiptOrderDO stockReceiptOrderDO,
+                                         List<ReceiptMaterialDetailDO> receiptMaterialDetailDOList) {
+        // 无批次属性则直接返回
+        if (CollectionUtils.isEmpty(materialMoreDetailList)) {
+            return;
+        }
+        // 无收货单号无法做增量更新，退回全量插入
+        String receiptOrderNumber = stockReceiptOrderDO.getReceiptOrderNumber();
+        if (StringUtils.isBlank(receiptOrderNumber) && !CollectionUtils.isEmpty(receiptMaterialDetailDOList)) {
+            receiptOrderNumber = receiptMaterialDetailDOList.get(0).getReceiptOrderNumber();
+        }
+        // 无收货单号无法做增量更新，退回全量插入
+        if (StringUtils.isBlank(receiptOrderNumber)) {
+            IMaterialMoreDetailService.saveBatch(materialMoreDetailList);
+            return;
+        }
+        // 无明细唯一ID无法做增量更新，退回全量插入
+        java.util.Set<Long> uniqueIds = collectReceiptDetailUniqueIds(receiptMaterialDetailDOList);
+        if (uniqueIds.isEmpty()) {
+            IMaterialMoreDetailService.saveBatch(materialMoreDetailList);
+            return;
+        }
+        // 查询已存在的批次属性记录
+        List<MaterialMoreDetail> existingList = IMaterialMoreDetailService.list(
+                new QueryWrapper<MaterialMoreDetail>()
+                        .eq("order_number", receiptOrderNumber) // 收货单号
+                        .in("material_detail_unique_id", uniqueIds) // 明细唯一ID
+                        .eq("del_flag", 1)); // 删除标志
+        // 按 materialDetailUniqueId + batchDetailId 构建索引
+        Map<String, MaterialMoreDetail> existingMap = new HashMap<>();
+        for (MaterialMoreDetail existing : existingList) {
+            String key = buildMaterialMoreDetailKey(existing.getMaterialDetailUniqueId(), existing.getBatchDetailId());
+            existingMap.put(key, existing);
+        }
+        // 分离：需要更新的 以及 需要新增的；跳过空值（保留旧数据）
+        List<MaterialMoreDetail> toUpdate = new ArrayList<>();
+        List<MaterialMoreDetail> toInsert = new ArrayList<>();
+        for (MaterialMoreDetail incoming : materialMoreDetailList) {
+            // attributeValue 为空/空白时跳过，不覆盖已有数据
+            if (StringUtils.isBlank(incoming.getAttributeValue())) {
+                continue;
+            }
+            // 按 materialDetailUniqueId + batchDetailId 构建索引
+            String key = buildMaterialMoreDetailKey(incoming.getMaterialDetailUniqueId(), incoming.getBatchDetailId());
+            // 已存在的批次属性记录
+            MaterialMoreDetail existing = existingMap.get(key);
+            // 存在则更新 ，不存在则新增
+            if (existing != null) {
+                // 设置主键走 update，保留已有记录的 id
+                incoming.setMaterialMoreDetailId(existing.getMaterialMoreDetailId());
+                // 更新现有记录
+                toUpdate.add(incoming);
+            } else {
+                // 插入新的记录
+                toInsert.add(incoming);
+            }
+        }
+        // 判断需更新的记录是否存在，存在则更新
+        if (!toUpdate.isEmpty()) {
+            IMaterialMoreDetailService.updateBatchById(toUpdate);
+        }
+        // 判断是否存在需新增的记录，存在则批量插入
+        if (!toInsert.isEmpty()) {
+            IMaterialMoreDetailService.saveBatch(toInsert);
+        }
+    }
+
+    /**
+     * 构建批次属性索引
+     * @param materialDetailUniqueId 明细唯一ID
+     * @param batchDetailId          批次属性ID
+     * @return 批次属性索引
+     */
+    private static String buildMaterialMoreDetailKey(Long materialDetailUniqueId, Long batchDetailId) {
+        return (materialDetailUniqueId != null ? materialDetailUniqueId : "null") + "_"
+                + (batchDetailId != null ? batchDetailId : "null");
+    }
+
+    /**
+     * 将 total* 指标字段中值为 0 的置为 null。
+     * MyBatis-Plus 默认 NOT_NULL 策略下，null 不参与 SET 子句，已有数据得以保留。
+     * 注意：仅对「未填写」场景生效；用户确实需要填 0 的极端场景不受影响（因前端通常传 null 表示未填）。
+     * @param receiptMaterialDetail 收货明细
+     * 需保证 total* 字段已赋值。
+     * 需保证 alreadyReceipt* 字段已赋值。
+     *      静态方法修改 receiptMaterialDetail 参数
+     **/
+    private static void normalizeZeroMetricsToNull(ReceiptMaterialDetail receiptMaterialDetail) {
+        // entity 为 null 时直接返回
+        if (receiptMaterialDetail == null) {
+            return;
+        }
+        // receiptMaterialDetail totalNetWeight 字段为 0 时置为 null
+        if (isZeroBigDecimal(receiptMaterialDetail.getTotalNetWeight())) {
+            receiptMaterialDetail.setTotalNetWeight(null);
+        }
+        // receiptMaterialDetail totalGrossWeight 字段为 0 时置为 null
+        if (isZeroBigDecimal(receiptMaterialDetail.getTotalGrossWeight())) {
+            receiptMaterialDetail.setTotalGrossWeight(null);
+        }
+        // receiptMaterialDetail totalVolume 字段为 0 时置为 null
+        if (isZeroBigDecimal(receiptMaterialDetail.getTotalVolume())) {
+            receiptMaterialDetail.setTotalVolume(null);
+        }
+        // receiptMaterialDetail totalArea 字段为 0 时置为 null
+        if (isZeroBigDecimal(receiptMaterialDetail.getTotalArea())) {
+            receiptMaterialDetail.setTotalArea(null);
+        }
+        // receiptMaterialDetail alreadyReceiptNetWeight 字段为 0 时置为 null
+        if (isZeroBigDecimal(receiptMaterialDetail.getAlreadyReceiptNetWeight())) {
+            receiptMaterialDetail.setAlreadyReceiptNetWeight(null);
+        }
+        // receiptMaterialDetail alreadyReceiptGrossWeight 字段为 0 时置为 null
+        if (isZeroBigDecimal(receiptMaterialDetail.getAlreadyReceiptGrossWeight())) {
+            receiptMaterialDetail.setAlreadyReceiptGrossWeight(null);
+        }
+        // receiptMaterialDetail alreadyReceiptVolume 字段为 0 时置为 null
+        if (isZeroBigDecimal(receiptMaterialDetail.getAlreadyReceiptVolume())) {
+            receiptMaterialDetail.setAlreadyReceiptVolume(null);
+        }
+        // receiptMaterialDetail alreadyReceiptArea 字段为 0 时置为 null
+        if (isZeroBigDecimal(receiptMaterialDetail.getAlreadyReceiptArea())) {
+            receiptMaterialDetail.setAlreadyReceiptArea(null);
+        }
+    }
+
+    private static boolean isZeroBigDecimal(BigDecimal val) {
+        return val != null && val.compareTo(BigDecimal.ZERO) == 0;
+    }
+
    private void setMore(ReceiptMaterialDetailDO receiptMaterialDetailDO) {
        List<MaterialMoreDetailDO> materialMoreDetailList = receiptMaterialDetailDO.getMaterialMoreDetailList();
        if (!CollectionUtils.isEmpty(materialMoreDetailList)) {
@@ -42,10 +42,18 @@ public class ImmediateInventoryPO {
    @Excel(name = "物料条形码")
    private String barCode;

+    @ApiModelProperty("规格型号")
+    @Excel(name = "规格型号")
+    private String specificationModel;
+
    @ApiModelProperty("库存数量")
    @Excel(name = "库存数量")
    private BigDecimal inventoryQuantity;

+    @ApiModelProperty("库存数量合计（当前查询条件下所有库存数量之和）")
+    @Excel(name = "库存数量合计")
+    private BigDecimal totalInventoryQuantity;
+
    @ApiModelProperty("可用数量 ")
    @Excel(name = "可用数量 ")
    private BigDecimal allocationQuantity;
@@ -44,6 +44,10 @@ public class ImmediateInventoryDO extends BaseVOEntity {
    @Excel(name = "物料条形码")
    private String barCode;

+    @ApiModelProperty("规格型号")
+    @Excel(name = "规格型号")
+    private String specificationModel;
+
    @ApiModelProperty("仓库id")
    @Excel(name = "仓库id")
    private Long warehouseId;
@@ -45,6 +45,10 @@ public class ImmediateInventoryDTO {
    @Excel(name = "物料条形码")
    private String barCode;

+    @ApiModelProperty("规格型号")
+    @Excel(name = "规格型号")
+    private String specificationModel;
+
    @ApiModelProperty("仓库id")
    @Excel(name = "仓库id")
    private Long warehouseId;