diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index fe2ae218..90165144 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -157,7 +157,7 @@ scheduler:
     ifsPalletMoveQueue:
       processing-timeout-minutes: 10  # 自动化托运IFS移库队列P状态超时回收分钟数 - rqrq
   haianAutoTask:
-    enabled: false  # 海安非归档自动任务总开关：控制HaianAutoTaskScheduler与HaianWcsSchedule全部定时任务；归档仍走haianDataArchive.enabled - rqrq
+    enabled: true  # 海安非归档自动任务总开关：控制HaianAutoTaskScheduler与HaianWcsSchedule全部定时任务；归档仍走haianDataArchive.enabled - rqrq
     kit-transport-fixed-delay-ms: 10000  # 海安齐套transport_flag回写任务间隔（毫秒），默认10秒 - rqrq
     ifsPalletMoveQueue:
       processing-timeout-minutes: 10  # 海安IFS移库队列P状态超时回收分钟数 - rqrq
diff --git a/src/main/resources/mapper/autoWareHourceHaian/HaiAnPalletMergeQueryMapper.xml b/src/main/resources/mapper/autoWareHourceHaian/HaiAnPalletMergeQueryMapper.xml
index 4ccbcf0a..31f81ff4 100644
--- a/src/main/resources/mapper/autoWareHourceHaian/HaiAnPalletMergeQueryMapper.xml
+++ b/src/main/resources/mapper/autoWareHourceHaian/HaiAnPalletMergeQueryMapper.xml
@@ -183,7 +183,8 @@
         UPDATE haian_pallet
         SET calling_flag = #{callingFlag},
             <choose>
-                <when test="callingFlag != null and callingFlag == 'N'">
+                <!-- 调用标识按字符串比较，空值不进入释放分支；避免Y/N被OGNL转成数字导致合托状态更新失败及事务回滚 - rqrq -->
+                <when test='callingFlag != null and callingFlag == "N"'>
                     remark = NULL,
                 </when>
                 <when test="remark != null and remark != ''">
diff --git a/src/main/resources/mapper/autoWareHourceHaian/HaiAnPdaAutoWarehouseMapper.xml b/src/main/resources/mapper/autoWareHourceHaian/HaiAnPdaAutoWarehouseMapper.xml
index a89df4e6..74487798 100644
--- a/src/main/resources/mapper/autoWareHourceHaian/HaiAnPdaAutoWarehouseMapper.xml
+++ b/src/main/resources/mapper/autoWareHourceHaian/HaiAnPdaAutoWarehouseMapper.xml
@@ -538,7 +538,8 @@
         UPDATE haian_pallet
         SET calling_flag = #{callingFlag},
             <choose>
-                <when test="callingFlag != null and callingFlag == 'N'">
+                <!-- 调用标识按字符串比较，空值不进入释放分支；避免Y/N被OGNL转成数字导致状态更新失败及事务回滚 - rqrq -->
+                <when test='callingFlag != null and callingFlag == "N"'>
                     remark = NULL,
                 </when>
                 <when test="remark != null and remark != ''">
diff --git a/src/main/resources/mapper/autoWareHourceHaian/HaiAnWcsTaskMapper.xml b/src/main/resources/mapper/autoWareHourceHaian/HaiAnWcsTaskMapper.xml
index 38934150..3dc5e204 100644
--- a/src/main/resources/mapper/autoWareHourceHaian/HaiAnWcsTaskMapper.xml
+++ b/src/main/resources/mapper/autoWareHourceHaian/HaiAnWcsTaskMapper.xml
@@ -131,7 +131,8 @@
         UPDATE haian_pallet
         SET calling_flag = #{callingFlag},
             <choose>
-                <when test="callingFlag != null and callingFlag == 'N'">
+                <!-- 调用标识按字符串比较，空值不进入释放分支；避免Y/N被OGNL转成数字导致回调释放失败及事务回滚 - rqrq -->
+                <when test='callingFlag != null and callingFlag == "N"'>
                     remark = NULL,
                 </when>
                 <when test="remark != null and remark != ''">