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/mm/FinishedOperateLogMapper.java |   37 ++++++++++++++++++++++++++++++++-----
 1 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/north-glass-erp/src/main/java/com/example/erp/mapper/mm/FinishedOperateLogMapper.java b/north-glass-erp/src/main/java/com/example/erp/mapper/mm/FinishedOperateLogMapper.java
index f376ea2..faae450 100644
--- a/north-glass-erp/src/main/java/com/example/erp/mapper/mm/FinishedOperateLogMapper.java
+++ b/north-glass-erp/src/main/java/com/example/erp/mapper/mm/FinishedOperateLogMapper.java
@@ -1,5 +1,6 @@
 package com.example.erp.mapper.mm;
 
+import com.example.erp.dto.mm.FinishedOperateLogDTO;
 import com.example.erp.entity.mm.FinishedGoodsInventory;
 import com.example.erp.entity.mm.FinishedOperateLog;
 import com.example.erp.entity.pp.FlowCard;
@@ -8,13 +9,15 @@
 import org.apache.ibatis.annotations.Param;
 import org.springframework.data.repository.CrudRepository;
 
+import java.time.LocalDate;
 import java.util.List;
+import java.util.Map;
 
 @Mapper
 public interface FinishedOperateLogMapper extends CrudRepository<FinishedOperateLog,Long> {
     FinishedOperateLog getselectFinishedOperateLog();
 
-    Boolean insertIntFinishedOperateLog(@Param("flowCard") FlowCard flowCard ,@Param("userName") String userName,@Param("oddNumber") String oddNumber);
+    Boolean insertIntFinishedOperateLog(@Param("flowCard") FlowCard flowCard ,@Param("userName") String userName,@Param("oddNumber") String oddNumber,@Param("container") String container);
 
     Boolean insertOutFinishedOperateLog(@Param("orderDetail") OrderDetail orderDetail,@Param("userName") String userName,@Param("oddNumber") String oddNumber);
 
@@ -24,9 +27,9 @@
                                              @Param("pageSize") Integer pageSize,String startDate, String endDate,
                                              @Param("finishedOperateLog") FinishedOperateLog finishedOperateLog);
 
-    Integer getselectAllocateFinishedOperateLogPageTotal(@Param("offset") Integer offset,
-                                                         @Param("pageSize") Integer pageSize,String startDate, String endDate,
-                                                         @Param("finishedOperateLog") FinishedOperateLog finishedOperateLog);
+    Map<String,Integer> getselectAllocateFinishedOperateLogPageTotal(@Param("offset") Integer offset,
+                                                                     @Param("pageSize") Integer pageSize, String startDate, String endDate,
+                                                                     @Param("finishedOperateLog") FinishedOperateLog finishedOperateLog);
 
     Integer getmaximum(@Param("type") String type);
 
@@ -46,11 +49,35 @@
                                                           @Param("pageSize") Integer pageSize,String startDate, String endDate,
                                                           @Param("finishedOperateLog") FinishedOperateLog finishedOperateLog);
 
-    Integer getSelectOperateRecordLogPageTotal(@Param("offset") Integer offset,
+    Map<String,Integer> getSelectOperateRecordLogPageTotal(@Param("offset") Integer offset,
                                                          @Param("pageSize") Integer pageSize,String startDate, String endDate,
                                                          @Param("finishedOperateLog") FinishedOperateLog finishedOperateLog);
 
     Boolean updateToExamine(@Param("finishedOperateLog") FinishedOperateLog finishedOperateLog,
                                            @Param("userName") String userName,
                                             @Param("type") String type);
+
+    Boolean updateFinishedOperateLogState(@Param("finishedOperateLog") FinishedOperateLog finishedOperateLog,@Param("type") String type);
+
+
+    List<OrderDetail> getSelectStorageRecord(@Param("offset") Integer offset,
+                                             @Param("pageSize") Integer pageSize,String startDate, String endDate,String type,
+                                             @Param("finishedOperateLog") FinishedOperateLog finishedOperateLog);
+
+    Map<String,Integer> getSelectStorageRecordLogPageTotal(@Param("offset") Integer offset,
+                                                           @Param("pageSize") Integer pageSize,String startDate, String endDate,String type,
+                                                           @Param("finishedOperateLog") FinishedOperateLog finishedOperateLog);
+
+    List<FinishedOperateLog> getSelectFinishedOperateLogReport(@Param("offset") Integer offset,
+                                             @Param("pageSize") Integer pageSize,String startDate, String endDate,
+                                             @Param("finishedOperateLog") FinishedOperateLog finishedOperateLog);
+
+    Map<String,Integer> getSelectFinishedOperateLogReportPageTotal(@Param("offset") Integer offset,
+                                                           @Param("pageSize") Integer pageSize,String startDate, String endDate,
+                                                           @Param("finishedOperateLog") FinishedOperateLog finishedOperateLog);
+
+    List<FinishedOperateLogDTO> exportFinishedOperateLogReport(List<LocalDate> dates);
+
+    Boolean insertOrderFinishedOperateLog(@Param("orderDetail") OrderDetail orderDetail,@Param("userName") String userName,@Param("oddNumber") String oddNumber);
+
 }

--
Gitblit v1.8.0