From 0be02df3d287f802c76e5738916301a877dfaa0e Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期一, 27 四月 2026 16:56:12 +0800
Subject: [PATCH] feat: 生产报工与报工台账功能更改完成
---
src/main/java/com/ruoyi/production/mapper/ProductOrderMapper.java | 23 ++++++++++++++++++++---
1 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/mapper/ProductOrderMapper.java b/src/main/java/com/ruoyi/production/mapper/ProductOrderMapper.java
index 9ce5878..1569341 100644
--- a/src/main/java/com/ruoyi/production/mapper/ProductOrderMapper.java
+++ b/src/main/java/com/ruoyi/production/mapper/ProductOrderMapper.java
@@ -4,16 +4,33 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.production.dto.ProductOrderDto;
+import com.ruoyi.production.dto.ProductStructureDto;
+import com.ruoyi.production.pojo.ProcessRoute;
import com.ruoyi.production.pojo.ProductOrder;
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);
+ IPage<ProductOrderDto> pageProductOrder(Page<ProductOrderDto> page, @Param("c") ProductOrderDto productOrder);
+
+ List<ProcessRoute> listProcessRoute(@Param("productModelId") Long productModelId);
+
+ List<ProductStructureDto> listProcessBom(@Param("orderId") Long orderId);
+
+ Integer countCreated(@Param("startDate") String startDate, @Param("endDate") String endDate);
+
+ Integer countCompleted(@Param("startDate") String startDate, @Param("endDate") String endDate);
+
+ Integer countPending(@Param("startDate") String startDate, @Param("endDate") String endDate);
+
/**
- * 鏍规嵁璁㈠崟ID鏌ヨ宸ュ崟鎶ュ伐
+ * 鍘熷瓙澧炲姞瀹屾垚鏁伴噺锛岄槻姝㈠苟鍙戣秴鍑鸿鍗曟暟閲�
+ * @return 褰卞搷琛屾暟(1 鎴愬姛锛�0 澶辫触)
*/
- ProductOrderDto productMainByOrderId(@Param("c") ProductOrder productOrder);
+ int addCompleteQtyIfNotExceed(@Param("id") Long id, @Param("delta") BigDecimal delta);
}
--
Gitblit v1.9.3