From 5224b79436b16039d07a981029e330f48b3c7708 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期一, 23 三月 2026 10:05:46 +0800
Subject: [PATCH] fix: 日期格式转换、生产订单缺少查询条件
---
src/main/java/com/ruoyi/production/mapper/ProductOrderMapper.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/mapper/ProductOrderMapper.java b/src/main/java/com/ruoyi/production/mapper/ProductOrderMapper.java
index 72aa6cd..84da613 100644
--- a/src/main/java/com/ruoyi/production/mapper/ProductOrderMapper.java
+++ b/src/main/java/com/ruoyi/production/mapper/ProductOrderMapper.java
@@ -3,8 +3,8 @@
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.ProductOrderSourceDto;
import com.ruoyi.production.dto.ProductStructureDto;
import com.ruoyi.production.pojo.ProcessRoute;
import com.ruoyi.production.pojo.ProductOrder;
@@ -16,7 +16,7 @@
@Mapper
public interface ProductOrderMapper extends BaseMapper<ProductOrder> {
- IPage<ProductOrderDto> pageProductOrder(Page page, @Param("c") ProductOrderDto productOrder);
+ IPage<ProductOrderDto> pageProductOrder(Page<ProductOrder> page, @Param("c") ProductOrderDto productOrder);
List<ProcessRoute> listProcessRoute(@Param("productModelId") Long productModelId);
@@ -27,4 +27,6 @@
Integer countCompleted(@Param("startDate") String startDate, @Param("endDate") String endDate);
Integer countPending(@Param("startDate") String startDate, @Param("endDate") String endDate);
+
+ List<ProductOrderSourceDto> productOrderSource(@Param("orderId") Long orderId);
}
--
Gitblit v1.9.3