From fcc929fa2888c6b06a168f1ca84344e3bf9fdce5 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期二, 28 十月 2025 11:34:14 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/mapper/mm/FinishedOperateLogMapper.java | 4 +++-
1 files changed, 3 insertions(+), 1 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 5cbfe07..77f3bfc 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
@@ -21,7 +21,8 @@
@Param("oddNumber") String oddNumber, @Param("container") String container,
@Param("deliveryDetailMoney") Double deliveryDetailMoney,
@Param("deliveryDetailArea") Double deliveryDetailArea,
- String createTime);
+ String createTime,
+ @Param("getComputeArea") Double getComputeArea);
Boolean insertOutFinishedOperateLog(@Param("orderDetail") OrderDetail orderDetail, @Param("userName") String userName, @Param("oddNumber") String oddNumber, String boxNo);
@@ -103,4 +104,5 @@
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