From e51e45f2cabcc4628ce93e55c7c3806b1b760161 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期一, 11 八月 2025 16:26:23 +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 | 8 +++++---
1 files changed, 5 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 405d0ec..6bd9690 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
@@ -17,7 +17,9 @@
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 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);
@@ -92,11 +94,11 @@
List<Map<String, String>> getPrimaryListLimt(String orderId, String processId, String remarks);
- List<Map<String, String>> getPrimaryListLimts(String orderId, String processId, String remarks);
+ List<Map<String, String>> getPrimaryListLimts(String customerName, 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);
+ 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