From 6b6f3fbd333894209e0df1822ff89881aa4319fe Mon Sep 17 00:00:00 2001
From: 于杰 <1210123631@qq.com>
Date: 星期五, 29 八月 2025 14:30:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
north-glass-erp/src/main/java/com/example/erp/mapper/pp/ReportingWorkDetailMapper.java | 24 ++++++++++++++++++++++--
1 files changed, 22 insertions(+), 2 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 26c635a..52c4b3a 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,31 @@
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 {
- List<ReportingWorkDetail> getDetail();
+@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);
}
--
Gitblit v1.8.0