From df143921e8ec85b43420b71961d73825521911d1 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期四, 23 十月 2025 10:14:49 +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/ReworkMapper.java | 33 +++++++++++++++++++++++++++++++--
1 files changed, 31 insertions(+), 2 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/mapper/pp/ReworkMapper.java b/north-glass-erp/src/main/java/com/example/erp/mapper/pp/ReworkMapper.java
index 5be6e5c..681eb3c 100644
--- a/north-glass-erp/src/main/java/com/example/erp/mapper/pp/ReworkMapper.java
+++ b/north-glass-erp/src/main/java/com/example/erp/mapper/pp/ReworkMapper.java
@@ -1,13 +1,42 @@
package com.example.erp.mapper.pp;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.example.erp.dto.pp.ReworkDTO;
import com.example.erp.entity.pp.Rework;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
+import java.util.Map;
@Mapper
-public interface ReworkMapper {
+public interface ReworkMapper extends BaseMapper<Rework> {
- List<Rework> queryRework(@Param("offset") Integer offset,@Param("pageSize") Integer pageSiz,String startTime,String endTime,Rework rework);
+ List<ReworkDTO> SelectRework(@Param("offset") Integer offset, @Param("pageSize") Integer pageSiz,
+ String startDate, String endDate,@Param("rework") ReworkDTO rework);
+
+ Map<String,Integer> SelectReworkPageTotal(@Param("offset") Integer offset,@Param("pageSize") Integer pageSiz,
+ String startDate,String endDate,@Param("rework") ReworkDTO rework);
+
+ List<Map<String,Object>> getSelectRework(@Param("offset") Integer offset, @Param("pageSize") Integer pageSiz);
+
+
+ Integer getMaximum();
+
+ Boolean insertRework(@Param("rework") Rework rework , @Param("oddNumber") String oddNumber);
+
+ Boolean updateDamageDetails(@Param("rework") Rework rework);
+
+ Boolean updateRework(@Param("rework") Rework rework , @Param("userName") String userName);
+
+ List<Map<String,Object>> getSelectReplenish(@Param("offset") Integer offset, @Param("pageSize") Integer pageSiz);
+
+ Integer getMaxFlowCard(@Param("processId") String processId);
+
+ Boolean deleteReworkMp(String reworkId);
+
+ Boolean updateReworkDdMp(String reportingWorkId, String orderSort, Integer technologyNumber, Integer reworkNum, String reworkType, String reworkReason);
+
+ Boolean updateReworkBgMp(String reportingWorkId, String orderSort, Integer technologyNumber);
}
+
--
Gitblit v1.8.0