From d5bb894f9be2e0a3b62d475b60b44f2ab138528c Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期四, 12 六月 2025 16:48:35 +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 |   96 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 96 insertions(+), 0 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
new file mode 100644
index 0000000..bd6a361
--- /dev/null
+++ b/north-glass-erp/src/main/java/com/example/erp/mapper/mm/FinishedOperateLogMapper.java
@@ -0,0 +1,96 @@
+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;
+import com.example.erp.entity.sd.OrderDetail;
+import org.apache.ibatis.annotations.Mapper;
+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,@Param("container") String container);
+
+    Boolean insertOutFinishedOperateLog(@Param("orderDetail") OrderDetail orderDetail,@Param("userName") String userName,@Param("oddNumber") String oddNumber);
+
+    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,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);
+
+    Boolean insertFinishedOperateLogTakeOut(@Param("orderDetail") OrderDetail orderDetail,
+                                            @Param("userName") String userName,
+                                            @Param("oddNumber") String oddNumber,
+                                            @Param("operateType") String operateType,
+                                            @Param("remarks") String remarks);
+
+    Boolean insertFinishedOperateLogRework(@Param("orderDetail") OrderDetail orderDetail,
+                                            @Param("userName") String userName,
+                                            @Param("oddNumber") String oddNumber,
+                                            @Param("operateType") String operateType,
+                                            @Param("remarks") String remarks);
+
+    List<OrderDetail> getSelectOperateRecord(@Param("offset") Integer offset,
+                                                          @Param("pageSize") Integer pageSize,String startDate, String endDate,
+                                                          @Param("finishedOperateLog") FinishedOperateLog finishedOperateLog);
+
+    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);
+
+    List<FinishedOperateLog> getSelectStorageRecordDeliveryId(@Param("deliveryId") String deliveryId,String type);
+
+    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,String type);
+
+    Map<String,Integer> getSelectFinishedOperateLogReportPageTotal(@Param("offset") Integer offset,
+                                                           @Param("pageSize") Integer pageSize,String startDate, String endDate,
+                                                           @Param("finishedOperateLog") FinishedOperateLog finishedOperateLog,String type);
+
+    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