From a158ed9136af588b82d365f98074b29c70cdb601 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期五, 08 八月 2025 15:58: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 | 4 ++--
1 files changed, 2 insertions(+), 2 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 a3b2aed..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
@@ -94,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