From e51e45f2cabcc4628ce93e55c7c3806b1b760161 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期一, 11 八月 2025 16:26:23 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/mapper/pp/ReworkMapper.java | 25 ++++++++++++++++++-------
1 files changed, 18 insertions(+), 7 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 175a79e..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,8 +1,7 @@
package com.example.erp.mapper.pp;
-import com.example.erp.entity.mm.FinishedGoodsInventory;
-import com.example.erp.entity.pp.FlowCard;
-import com.example.erp.entity.pp.ReportingWorkDetail;
+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;
@@ -11,11 +10,13 @@
import java.util.Map;
@Mapper
-public interface ReworkMapper {
+public interface ReworkMapper extends BaseMapper<Rework> {
- List<Map<String,Object>> SelectRework(@Param("offset") Integer offset,@Param("pageSize") Integer pageSiz,String startDate,String endDate,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,Rework 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);
@@ -24,8 +25,18 @@
Boolean insertRework(@Param("rework") Rework rework , @Param("oddNumber") String oddNumber);
- Boolean updateReportingWorkDetail(@Param("rework") Rework rework);
+ 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