From 4dcb5e299757924aef0edc4d608d2305dbedc780 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期四, 18 九月 2025 08:59:33 +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 | 10 ++++++----
1 files changed, 6 insertions(+), 4 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 47e0205..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);
--
Gitblit v1.8.0