From c2ad18d09d62ec9922fe234c7d141258f2acf577 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期五, 28 三月 2025 08:10:27 +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 |    4 ++++
 1 files changed, 4 insertions(+), 0 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 6a16701..668634d 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
@@ -55,4 +55,8 @@
 
     //鏌ヨ璁㈠崟鍏ュ簱鐘舵��
     Integer searchOrderWarehousing( String orderId);
+
+    Map<String,String> scannerGlassInfo(String projectNo, Integer layoutId, Integer sort, String orderId);
+
+    String getProcessIdByOptimizeHeatDetail(String projectId, Integer layoutId, Integer sort);
 }

--
Gitblit v1.8.0