From fec9f42e00f2df68a2a20cbf132b17bdeed8e63a Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期一, 25 八月 2025 09:19:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
north-glass-erp/src/main/java/com/example/erp/mapper/mm/FinishedOperateLogMapper.java | 80 ++++++++++++++++++++++++++++++++++-----
1 files changed, 69 insertions(+), 11 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 fe84513..47e0205 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,6 +1,7 @@
package com.example.erp.mapper.mm;
-import com.example.erp.entity.mm.FinishedGoodsInventory;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.example.erp.dto.mm.FinishedOperateLogDTO;
import com.example.erp.entity.mm.FinishedOperateLog;
import com.example.erp.entity.pp.FlowCard;
import com.example.erp.entity.sd.OrderDetail;
@@ -8,25 +9,29 @@
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> {
+public interface FinishedOperateLogMapper extends BaseMapper<FinishedOperateLog> {
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,
+ @Param("deliveryDetailMoney") Double deliveryDetailMoney,@Param("deliveryDetailArea") Double deliveryDetailArea);
- Boolean insertOutFinishedOperateLog(@Param("orderDetail") OrderDetail orderDetail,@Param("userName") String userName,@Param("oddNumber") String oddNumber);
+ Boolean insertOutFinishedOperateLog(@Param("orderDetail") OrderDetail orderDetail, @Param("userName") String userName, @Param("oddNumber") String oddNumber, String boxNo);
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);
@@ -36,11 +41,64 @@
@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,
+ @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);
+
+ 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, String>> getPrimaryListLimts(Integer customerId, String project, String remarks);
+
+ List<Map<String, Object>> getDetailList(String orderId, String processId, String remarks);
+
+ List<Map<String, Object>> getDetailLists(String orderId, String remarks, Integer productId,String thickness);
+
+ List<Map<String, Object>> getDetailList2(String orderId, String processId, String remarks);
}
--
Gitblit v1.8.0