2026-01-21

优化

src/main/java/com/gaotao/modules/inboundNotification/dao/InboundNotificationHeadMapper.java

@@ -138,5 +138,5 @@ public interface InboundNotificationHeadMapper extends BaseMapper<InboundNotific
     /**
      * 调用存储过程 UspImportRoll
      */
-    void callUspImportRoll(Map<String, Object> params);
+    Map<String, Object> callUspImportRoll(Map<String, Object> params);
 }

src/main/java/com/gaotao/modules/inboundNotification/service/impl/InboundNotificationServiceImpl.java

@@ -865,11 +865,11 @@ public class InboundNotificationServiceImpl implements InboundNotificationServic
             params.put("orderNo", orderNo);
             params.put("orderType", orderType);
             
-            headMapper.callUspImportRoll(params);
+            Map<String, Object> result = headMapper.callUspImportRoll(params);
             
             // 获取存储过程返回的结果
-            String resultCode = params.get("resultCode") != null ? params.get("resultCode").toString() : "400";
-            String resultMsg = params.get("resultMsg") != null ? params.get("resultMsg").toString() : "";
+            String resultCode = result != null && result.get("resultCode") != null ? result.get("resultCode").toString() : "400";
+            String resultMsg = result != null && result.get("resultMsg") != null ? result.get("resultMsg").toString() : "";
             
             if ("200".equals(resultCode)) {
                 return "200";

src/main/java/com/gaotao/modules/schedule/mapper/ScheduleMapper.java

@@ -780,7 +780,8 @@ public interface ScheduleMapper {
      * 调用存储过程 sfdcRollsOpsReportExecute
      * 用于打开材料卷
      * @param params 参数
+     * @return 存储过程返回结果
      */
-    void callSfdcRollsOpsReportExecute(Map<String, Object> params);
+    Map<String, Object> callSfdcRollsOpsReportExecute(Map<String, Object> params);
 
 }

src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java

@@ -5677,12 +5677,12 @@ public class ScheduleServiceImpl implements ScheduleService {
         params.put("type", type != null ? type : "open");
         params.put("userId", userId);
         
-        // 调用存储过程
-        scheduleMapper.callSfdcRollsOpsReportExecute(params);
+        // 调用存储过程，直接从返回结果中获取 code 和 message
+        Map<String, Object> procResult = scheduleMapper.callSfdcRollsOpsReportExecute(params);
         
         // 获取返回结果
-        String code = params.get("code") != null ? params.get("code").toString() : "400";
-        String message = params.get("message") != null ? params.get("message").toString() : "";
+        String code = procResult != null && procResult.get("code") != null ? procResult.get("code").toString() : "400";
+        String message = procResult != null && procResult.get("message") != null ? procResult.get("message").toString() : "";
         
         Map<String, Object> result = new HashMap<>();
         result.put("code", code);

src/main/resources/mapper/inboundNotification/InboundNotificationHeadMapper.xml

@@ -283,14 +283,11 @@
     </insert>
 
     <!-- 调用存储过程 UspImportRoll -->
-    <select id="callUspImportRoll" statementType="CALLABLE" parameterType="java.util.Map">
-        {call UspImportRoll(
-            #{site, mode=IN, jdbcType=VARCHAR},
-            #{buNo, mode=IN, jdbcType=VARCHAR},
-            #{orderNo, mode=IN, jdbcType=VARCHAR},
-            #{orderType, mode=IN, jdbcType=VARCHAR},
-            #{resultCode, mode=OUT, jdbcType=VARCHAR},
-            #{resultMsg, mode=OUT, jdbcType=VARCHAR}
-        )}
+    <select id="callUspImportRoll" resultType="java.util.Map" statementType="CALLABLE">
+        exec UspImportRoll
+            #{site},
+            #{buNo},
+            #{orderNo},
+            #{orderType}
     </select>
 </mapper>

src/main/resources/mapper/schedule/ScheduleMapper.xml

@@ -2043,17 +2043,14 @@
     </select>
 
     <!-- 调用存储过程 sfdcRollsOpsReportExecute 用于打开材料卷 -->
-    <select id="callSfdcRollsOpsReportExecute" statementType="CALLABLE" parameterType="java.util.Map">
-        {call sfdcRollsOpsReportExecute(
-            #{site, mode=IN, jdbcType=VARCHAR},
-            #{seqNo, mode=IN, jdbcType=VARCHAR},
-            #{rollNo, mode=IN, jdbcType=VARCHAR},
-            #{histSeqNo, mode=IN, jdbcType=INTEGER},
-            #{type, mode=IN, jdbcType=VARCHAR},
-            #{userId, mode=IN, jdbcType=VARCHAR},
-            #{code, mode=OUT, jdbcType=VARCHAR},
-            #{message, mode=OUT, jdbcType=VARCHAR}
-        )}
+    <select id="callSfdcRollsOpsReportExecute" resultType="java.util.Map" statementType="CALLABLE">
+        exec sfdcRollsOpsReportExecute
+            #{site},
+            #{seqNo},
+            #{rollNo},
+            #{histSeqNo},
+            #{type},
+            #{userId}
     </select>
 
 </mapper>