From a64774b3898c4ce8e7d3aa0ccc3c4ee92861d2a6 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期四, 21 五月 2026 15:03:51 +0800
Subject: [PATCH] Merge branch 'dev_New_pro' of http://114.132.189.42:9002/r/product-inventory-management-after into dev_New_pro
---
src/main/java/com/ruoyi/production/mapper/ProductionOrderMapper.java | 31 +++++++++++++++++++++++++++++++
1 files changed, 31 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/mapper/ProductionOrderMapper.java b/src/main/java/com/ruoyi/production/mapper/ProductionOrderMapper.java
index e66e768..cec7ca5 100644
--- a/src/main/java/com/ruoyi/production/mapper/ProductionOrderMapper.java
+++ b/src/main/java/com/ruoyi/production/mapper/ProductionOrderMapper.java
@@ -1,13 +1,18 @@
package com.ruoyi.production.mapper;
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.home.dto.ProductionProgressOrderDto;
+import com.ruoyi.production.bean.dto.ProductionOrderDto;
+import com.ruoyi.production.bean.vo.ProductionOrderVo;
import com.ruoyi.production.pojo.ProductionOrder;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.time.LocalDateTime;
import java.util.List;
+import java.util.Map;
/**
* <p>
@@ -20,6 +25,12 @@
@Mapper
public interface ProductionOrderMapper extends BaseMapper<ProductionOrder> {
+ IPage<ProductionOrderVo> pageProductionOrder(Page<?> page, @Param("c") ProductionOrderDto dto);
+
+ List<ProductionOrderVo> listProductionOrder(@Param("c") ProductionOrderDto dto);
+
+ ProductionOrderVo getProductionOrderInfo(@Param("id") Long id);
+
List<ProductionProgressOrderDto> selectProgressOrders(@Param("startTime") LocalDateTime startTime,
@Param("endTime") LocalDateTime endTime);
@@ -29,4 +40,24 @@
Integer countPending(@Param("startDate") String startDate, @Param("endDate") String endDate);
+ List<Map<String, Object>> selectHomeOrderProgressPage(@Param("status") Integer status,
+ @Param("offset") Long offset,
+ @Param("size") Long size,
+ @Param("startTime") LocalDateTime startTime,
+ @Param("endTime") LocalDateTime endTime);
+
+ Long countHomeOrderProgress(@Param("status") Integer status,
+ @Param("startTime") LocalDateTime startTime,
+ @Param("endTime") LocalDateTime endTime);
+
+ List<Map<String, Object>> countHomeOrderProgressByStatus(@Param("startTime") LocalDateTime startTime,
+ @Param("endTime") LocalDateTime endTime);
+
+ List<Map<String, Object>> selectHomeTodayProductionPlan(@Param("size") Long size,
+ @Param("planStart") LocalDateTime planStart,
+ @Param("planEnd") LocalDateTime planEnd);
+
+ Long countHomeTodayProductionPlan(@Param("planStart") LocalDateTime planStart,
+ @Param("planEnd") LocalDateTime planEnd);
+
}
--
Gitblit v1.9.3