From bb78ea38792502cbff36c9a4486b7b12e1940615 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期二, 03 二月 2026 10:59:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_New
---
src/main/java/com/ruoyi/production/mapper/ProductOrderMapper.java | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 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..72aa6cd 100644
--- a/src/main/java/com/ruoyi/production/mapper/ProductOrderMapper.java
+++ b/src/main/java/com/ruoyi/production/mapper/ProductOrderMapper.java
@@ -3,17 +3,28 @@
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;
import com.ruoyi.production.pojo.ProductOrder;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
+
+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);
+
+ 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);
}
--
Gitblit v1.9.3