From 44ff80785df949444df08b6df166fe64cf0dce01 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 12 五月 2026 15:25:00 +0800
Subject: [PATCH] refactor(procurementrecord): 重构DTO包结构及销售退货相关调整

---
 src/main/java/com/ruoyi/procurementrecord/utils/StockUtils.java |   28 ++++++++++++++++------------
 1 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/ruoyi/procurementrecord/utils/StockUtils.java b/src/main/java/com/ruoyi/procurementrecord/utils/StockUtils.java
index 5356500..b7e0478 100644
--- a/src/main/java/com/ruoyi/procurementrecord/utils/StockUtils.java
+++ b/src/main/java/com/ruoyi/procurementrecord/utils/StockUtils.java
@@ -1,5 +1,6 @@
 package com.ruoyi.procurementrecord.utils;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.ruoyi.procurementrecord.mapper.ProcurementRecordMapper;
@@ -66,8 +67,6 @@
 
     /**
      * 鍚堟牸鍏ュ簱
-     * @param productModelId
-     * @param quantity
      * @param recordType
      * @param recordId
      */
@@ -105,15 +104,6 @@
      * @param recordType
      * @param recordId
      */
-    public void substractStock(Long productModelId, BigDecimal quantity, String recordType, Long recordId) {
-        StockInventoryDto stockInventoryDto = new StockInventoryDto();
-        stockInventoryDto.setRecordId(recordId);
-        stockInventoryDto.setRecordType(String.valueOf(recordType));
-        stockInventoryDto.setQualitity(quantity);
-        stockInventoryDto.setProductModelId(productModelId);
-        stockInventoryService.subtractStockInventory(stockInventoryDto);
-    }
-
     public void substractStock(Long productModelId, BigDecimal quantity, String recordType, Long recordId, String batchNo) {
         StockInventoryDto stockInventoryDto = new StockInventoryDto();
         stockInventoryDto.setRecordId(recordId);
@@ -121,7 +111,21 @@
         stockInventoryDto.setQualitity(quantity);
         stockInventoryDto.setProductModelId(productModelId);
         stockInventoryDto.setBatchNo(batchNo);
-        stockInventoryService.subtractStockInventory(stockInventoryDto);
+        stockInventoryService.addStockOutRecordOnly(stockInventoryDto);
+    }
+
+    /**
+     * 鍙戣揣瀹℃壒鐘舵�佹洿鏀�
+     * @param recordType
+     * @param recordId
+     */
+    public void shipmentStatus(String recordType, Long recordId) {
+        LambdaQueryWrapper<StockOutRecord> queryWrapper = new LambdaQueryWrapper<StockOutRecord>().eq(StockOutRecord::getRecordType, recordType)
+                .eq(StockOutRecord::getRecordId, recordId);
+        stockOutRecordService.list(queryWrapper).stream().forEach(stockOutRecord -> {
+            stockOutRecord.setApprovalStatus(0);
+            stockOutRecordService.updateById(stockOutRecord);
+        });
     }
 
     //涓嶅悎鏍煎簱瀛樺垹闄�

--
Gitblit v1.9.3