From 85741906046ab01e6b824e7e306a1f332c25f2f4 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期五, 06 十二月 2024 17:33:32 +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/mm/FinishedOperateLogMapper.java | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 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 30cbd44..2439bb8 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
@@ -70,16 +70,25 @@
List<FinishedOperateLog> getSelectFinishedOperateLogReport(@Param("offset") Integer offset,
@Param("pageSize") Integer pageSize,String startDate, String endDate,
- @Param("finishedOperateLog") FinishedOperateLog finishedOperateLog);
+ @Param("finishedOperateLog") FinishedOperateLog finishedOperateLog,String type);
Map<String,Integer> getSelectFinishedOperateLogReportPageTotal(@Param("offset") Integer offset,
@Param("pageSize") Integer pageSize,String startDate, String endDate,
- @Param("finishedOperateLog") FinishedOperateLog finishedOperateLog);
+ @Param("finishedOperateLog") FinishedOperateLog finishedOperateLog,String type);
- List<FinishedOperateLogDTO> exportFinishedOperateLogReport(List<LocalDate> dates);
+ List<FinishedOperateLogDTO> exportFinishedOperateLogReport(List<LocalDate> dates,String type);
Boolean insertOrderFinishedOperateLog(@Param("orderDetail") OrderDetail orderDetail,@Param("userName") String userName,@Param("oddNumber") String oddNumber);
Boolean updateOrderFinishedOperateLog(@Param("orderDetail") OrderDetail orderDetail,@Param("userName") String userName,@Param("oddNumber") String oddNumber);
+ List<FinishedOperateLog> getSelectStorageRecordPint(@Param("offset") Integer offset,@Param("pageSize") Integer pageSize,String startDate, String endDate,
+ @Param("finishedOperateLog") FinishedOperateLog finishedOperateLog);
+
+ Map<String,Integer> getSelectStorageRecordPintPageTotal(@Param("offset") Integer offset,@Param("pageSize") Integer pageSize,String startDate, String endDate,
+ @Param("finishedOperateLog") FinishedOperateLog finishedOperateLog);
+
+ List<Map<String, String>> getPrimaryListLimt(String orderId, String processId, String remarks);
+
+ List<Map<String, Object>> getDetailList(String orderId, String processId, String remarks);
}
--
Gitblit v1.8.0