From 6ad5c2cdc193cf7bb02884961b7434cd7f607a0d Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 16 四月 2026 10:48:09 +0800
Subject: [PATCH] feat(production): 扩展生产工艺路线支持多产品绑定及工单权限控制
---
src/main/java/com/ruoyi/production/mapper/ProductOrderMapper.java | 23 ++++++++++++++++++-----
1 files changed, 18 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/mapper/ProductOrderMapper.java b/src/main/java/com/ruoyi/production/mapper/ProductOrderMapper.java
index 7e668b6..6cc8297 100644
--- a/src/main/java/com/ruoyi/production/mapper/ProductOrderMapper.java
+++ b/src/main/java/com/ruoyi/production/mapper/ProductOrderMapper.java
@@ -3,7 +3,9 @@
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;
@@ -14,11 +16,22 @@
@Mapper
public interface ProductOrderMapper extends BaseMapper<ProductOrder> {
- IPage<ProductOrderDto> pageProductOrder(Page page, @Param("c") ProductOrderDto productOrder);
- /**
- * 鏍规嵁璁㈠崟ID鏌ヨ宸ュ崟鎶ュ伐
- */
- ProductOrderDto productMainByOrderId(@Param("c") ProductOrder productOrder);
+ default IPage<ProductOrderDto> pageProductOrder(Page page, ProductOrderDto productOrder) {
+ return pageProductOrder(page, productOrder, null, true);
+ }
+
+ IPage<ProductOrderDto> pageProductOrder(Page page,
+ @Param("c") ProductOrderDto productOrder,
+ @Param("userId") Long userId,
+ @Param("isAdmin") Boolean isAdmin);
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