From b39599abcfce0b8db09fc5c94ff4655a2dc99ee1 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 25 十二月 2025 11:48:46 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override

---
 north-glass-erp/src/main/java/com/example/erp/mapper/pp/ReportingWorkDetailMapper.java |   24 +++++++++++++++++++++++-
 1 files changed, 23 insertions(+), 1 deletions(-)

diff --git a/north-glass-erp/src/main/java/com/example/erp/mapper/pp/ReportingWorkDetailMapper.java b/north-glass-erp/src/main/java/com/example/erp/mapper/pp/ReportingWorkDetailMapper.java
index 09fa243..1926bbb 100644
--- a/north-glass-erp/src/main/java/com/example/erp/mapper/pp/ReportingWorkDetailMapper.java
+++ b/north-glass-erp/src/main/java/com/example/erp/mapper/pp/ReportingWorkDetailMapper.java
@@ -1,11 +1,33 @@
 package com.example.erp.mapper.pp;
 
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.example.erp.entity.pp.ReportingWorkDetail;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
-public interface ReportingWorkDetailMapper {
+@Mapper
+public interface ReportingWorkDetailMapper extends BaseMapper<ReportingWorkDetail> {
     /*List<ReportingWorkDetail> getDetail();*/
 
+    /*鏌ヨ杩斿伐鏂板鏁版嵁*/
+    List<ReportingWorkDetail> queryReworkAdd(@Param("pageNum") Integer pageNum, @Param("pageSize") Integer pageSize,
+                                             ReportingWorkDetail reportingWorkDetail);
+
+
+    /*鏌ヨ杩斿伐鏁版嵁*/
+    List<ReportingWorkDetail> reworkDataManage(@Param("pageNum") Integer pageNum, @Param("pageSize") Integer pageSize,
+                                               @Param("sDate") String startTime,@Param("eDate") String endTime);
+
+    List<ReportingWorkDetail> reworkDataManage2(@Param("pageNum") Integer pageNum, @Param("pageSize") Integer pageSize,
+                                               @Param("sDate") String startTime,@Param("eDate") String endTime,ReportingWorkDetail reportingWorkDetail);
+
+
+    Integer selectInventory(@Param("processId") String processId, @Param("orderNumber") Integer orderNumber, @Param("technologyNumber") Integer technologyNumber, String thisProcess);
+
+    String getGlassPliesCount(String reportingWorkId);
+
+    int selectFinishQuantity(String reportingWorkId);
 }

--
Gitblit v1.8.0