From 96d60dcd18b3d8c304afb8131fcbe547c0e74554 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期三, 24 十二月 2025 16:25:10 +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/sd/OrderMapper.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/mapper/sd/OrderMapper.java b/north-glass-erp/src/main/java/com/example/erp/mapper/sd/OrderMapper.java
index fd19d96..fa8b8cd 100644
--- a/north-glass-erp/src/main/java/com/example/erp/mapper/sd/OrderMapper.java
+++ b/north-glass-erp/src/main/java/com/example/erp/mapper/sd/OrderMapper.java
@@ -61,11 +61,16 @@
String getProcessIdByOptimizeHeatDetail(String projectId, Integer layoutId, Integer sort);
- Boolean saveOrderFile(String fileName,String dxfData,String orderId,Integer orderNumber);
+ Boolean saveOrderFile(String fileName,String dxfData,String orderId,Integer orderNumber,Object fileJson);
- Boolean updateOrderFile(String fileName,String dxfData,String orderId,Integer orderNumber);
+ Boolean updateOrderFile(String fileName,String dxfData,String orderId,Integer orderNumber,Object fileJson);
Map<String,String> selectOrderFile( String orderId,Integer orderNumber);
List<Map<String,String>> selectOrderFileList( String orderId);
+
+ List<Map<String,Object>> selectProcessAttributeConfigOne();
+ List<Map<String,Object>> selectProcessAttributeConfigTow(String belong);
+
+ Integer selectDeliveryStateConut(String orderId);
}
--
Gitblit v1.8.0