From c2ad2126d6f8423e0a5e6e20bbb91ef6bb1cffc0 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期一, 25 五月 2026 13:26:27 +0800
Subject: [PATCH] fix(approve): 修复审批流程为空时的异常处理
---
src/main/java/com/ruoyi/production/mapper/ProductOrderMapper.java | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/mapper/ProductOrderMapper.java b/src/main/java/com/ruoyi/production/mapper/ProductOrderMapper.java
index ad76d3f..1569341 100644
--- a/src/main/java/com/ruoyi/production/mapper/ProductOrderMapper.java
+++ b/src/main/java/com/ruoyi/production/mapper/ProductOrderMapper.java
@@ -3,7 +3,6 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.production.dto.ProductBomDto;
import com.ruoyi.production.dto.ProductOrderDto;
import com.ruoyi.production.dto.ProductStructureDto;
import com.ruoyi.production.pojo.ProcessRoute;
@@ -11,16 +10,13 @@
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
+import java.math.BigDecimal;
import java.util.List;
@Mapper
public interface ProductOrderMapper extends BaseMapper<ProductOrder> {
- IPage<ProductOrderDto> pageProductOrder(Page page, @Param("c") ProductOrderDto productOrder);
- /**
- * 鏍规嵁璁㈠崟ID鏌ヨ宸ュ崟鎶ュ伐
- */
- ProductOrderDto productMainByOrderId(@Param("c") ProductOrder productOrder);
+ IPage<ProductOrderDto> pageProductOrder(Page<ProductOrderDto> page, @Param("c") ProductOrderDto productOrder);
List<ProcessRoute> listProcessRoute(@Param("productModelId") Long productModelId);
@@ -31,4 +27,10 @@
Integer countCompleted(@Param("startDate") String startDate, @Param("endDate") String endDate);
Integer countPending(@Param("startDate") String startDate, @Param("endDate") String endDate);
+
+ /**
+ * 鍘熷瓙澧炲姞瀹屾垚鏁伴噺锛岄槻姝㈠苟鍙戣秴鍑鸿鍗曟暟閲�
+ * @return 褰卞搷琛屾暟(1 鎴愬姛锛�0 澶辫触)
+ */
+ int addCompleteQtyIfNotExceed(@Param("id") Long id, @Param("delta") BigDecimal delta);
}
--
Gitblit v1.9.3