From 4ee53f8b43e850d2b35d5b1eb979d7b0bc2fbcd4 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 30 五月 2024 10:52:26 +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/mm/FinishedOperateLogMapper.java | 38 +++++++++++++++++++++++++++++++-------
1 files changed, 31 insertions(+), 7 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 d78b990..d71db9a 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,7 +9,9 @@
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> {
@@ -21,12 +24,12 @@
Boolean insertFinishedOperateLogAllocate(@Param("orderDetail") OrderDetail orderDetail,@Param("userName") String userName,@Param("oddNumber") String oddNumber);
List<OrderDetail> getselectAllocateFinishedOperateLog(@Param("offset") Integer offset,
- @Param("pageSize") Integer pageSize,
+ @Param("pageSize") Integer pageSize,String startDate, String endDate,
@Param("finishedOperateLog") FinishedOperateLog finishedOperateLog);
- Integer getselectAllocateFinishedOperateLogPageTotal(@Param("offset") Integer offset,
- @Param("pageSize") Integer pageSize,
- @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);
@@ -43,14 +46,35 @@
@Param("remarks") String remarks);
List<OrderDetail> getSelectOperateRecord(@Param("offset") Integer offset,
- @Param("pageSize") Integer pageSize,
+ @Param("pageSize") Integer pageSize,String startDate, String endDate,
@Param("finishedOperateLog") FinishedOperateLog finishedOperateLog);
- Integer getSelectOperateRecordLogPageTotal(@Param("offset") Integer offset,
- @Param("pageSize") Integer pageSize,
+ 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);
}
--
Gitblit v1.8.0