From b0a4de74b47e2626f51eb4a844db3e62f6a4bf9d Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期四, 18 十二月 2025 10:52:48 +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/sd/OrderMapper.java |    7 ++++++-
 1 files changed, 6 insertions(+), 1 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 855fd5c..4e19bf2 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,9 +61,14 @@
 
     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,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);
 }

--
Gitblit v1.8.0