From b6a4013c6a8804fe0dbaab99cf86dfa8e3d55af5 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期六, 12 十月 2024 16:30:18 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

---
 north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml b/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
index 348e5ed..1aece63 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
@@ -2261,7 +2261,7 @@
     </select>
 
     <update id="updateFlowCardMerge">
-        update  pp.flow_card fc set fc.merge=1
+        update  pp.flow_card fc set fc.merge=#{index}
         where fc.process_id = #{processId} and fc.technology_number  in
         <foreach item="technologyNumber" collection="technologyNumbers" open="(" separator="," close=")">
             #{technologyNumber}

--
Gitblit v1.8.0