From b0c60452329a61c32db74a1c7d7753d383d6310a Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期五, 05 九月 2025 08:20:53 +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 | 12 +++++++-----
1 files changed, 7 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 5cbc12e..5cbfe07 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
@@ -7,9 +7,9 @@
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.time.LocalDateTime;
import java.util.List;
import java.util.Map;
@@ -17,9 +17,11 @@
public interface FinishedOperateLogMapper extends BaseMapper<FinishedOperateLog> {
FinishedOperateLog getselectFinishedOperateLog();
- 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 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,
+ String createTime);
Boolean insertOutFinishedOperateLog(@Param("orderDetail") OrderDetail orderDetail, @Param("userName") String userName, @Param("oddNumber") String oddNumber, String boxNo);
@@ -94,7 +96,7 @@
List<Map<String, String>> getPrimaryListLimt(String orderId, String processId, String remarks);
- List<Map<String, String>> getPrimaryListLimts(String customerName, String project, String remarks);
+ List<Map<String, String>> getPrimaryListLimts(Integer customerId, String project, String remarks);
List<Map<String, Object>> getDetailList(String orderId, String processId, String remarks);
--
Gitblit v1.8.0