From 95270d9f2d0c93b52569268737902c4f09216c6b Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期五, 13 九月 2024 12:04:39 +0800
Subject: [PATCH] 返工查询后端筛选提交

---
 north-glass-erp/src/main/java/com/example/erp/mapper/pp/PatchLogMapper.java |   15 +++++++++++----
 1 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/north-glass-erp/src/main/java/com/example/erp/mapper/pp/PatchLogMapper.java b/north-glass-erp/src/main/java/com/example/erp/mapper/pp/PatchLogMapper.java
index ae834dd..cf4ec80 100644
--- a/north-glass-erp/src/main/java/com/example/erp/mapper/pp/PatchLogMapper.java
+++ b/north-glass-erp/src/main/java/com/example/erp/mapper/pp/PatchLogMapper.java
@@ -1,5 +1,7 @@
 package com.example.erp.mapper.pp;
 
+import com.example.erp.dto.pp.PatchLogAddDTO;
+import com.example.erp.dto.pp.PatchLogDTO;
 import com.example.erp.entity.pp.PatchLog;
 import com.example.erp.entity.pp.ReportingWork;
 import com.github.yulichang.base.MPJBaseMapper;
@@ -12,9 +14,11 @@
 @Mapper
 public interface PatchLogMapper extends MPJBaseMapper<PatchLog> {
 
-    List<Map<String,Object>> SelectReplenish(@Param("offset") Integer offset,@Param("pageSize") Integer pageSiz,String startDate,String endDate,PatchLog patchLog);
+    List<PatchLogDTO> SelectReplenish(@Param("offset") Integer offset, @Param("pageSize") Integer pageSiz,
+                                      String startDate, String endDate,@Param("patchLog") PatchLogDTO patchLogDTO);
 
-    Map<String,Integer> SelectReplenishPageTotal(@Param("offset") Integer offset,@Param("pageSize") Integer pageSiz,String startDate,String endDate,PatchLog patchLog);
+    Map<String,Integer> SelectReplenishPageTotal(@Param("offset") Integer offset,@Param("pageSize") Integer pageSiz,
+                                                 String startDate,String endDate,@Param("patchLog") PatchLogDTO patchLogDTO);
 
 
 
@@ -31,7 +35,7 @@
 
     Boolean updateOrderProcessDetail(@Param("patchLog") PatchLog patchLog,@Param("reportingWork") ReportingWork reportingWork );
 
-    List<Map<String,Object>> getSelectReplenish(@Param("offset") Integer offset, @Param("pageSize") Integer pageSiz);
+    List<PatchLogAddDTO> getSelectReplenish(@Param("offset") Integer offset, @Param("pageSize") Integer pageSiz,@Param("patchLogAddDTO") PatchLogAddDTO patchLogAddDTO);
 
 
     Boolean deleteReplenishMp(String patchId);
@@ -40,6 +44,9 @@
 
     Boolean updatePatchBgMp(String reportingWorkId, String orderSort, Integer technologyNumber);
 
-    
+
+    Boolean updateOrderProcessDetailCancel(@Param("patchLog") PatchLog patchLog,@Param("reportingWork") ReportingWork reportingWork);
+
+    Boolean updateReplenishCancel(@Param("patchLog") PatchLog patchLog);
 }
 

--
Gitblit v1.8.0