diff --git a/src/main/java/com/gaotao/modules/inboundNotification/dao/InboundNotificationHeadMapper.java b/src/main/java/com/gaotao/modules/inboundNotification/dao/InboundNotificationHeadMapper.java index 5eb5871..fd62a87 100644 --- a/src/main/java/com/gaotao/modules/inboundNotification/dao/InboundNotificationHeadMapper.java +++ b/src/main/java/com/gaotao/modules/inboundNotification/dao/InboundNotificationHeadMapper.java @@ -138,5 +138,5 @@ public interface InboundNotificationHeadMapper extends BaseMapper params); + Map callUspImportRoll(Map params); } diff --git a/src/main/java/com/gaotao/modules/inboundNotification/service/impl/InboundNotificationServiceImpl.java b/src/main/java/com/gaotao/modules/inboundNotification/service/impl/InboundNotificationServiceImpl.java index 0082790..6f78919 100644 --- a/src/main/java/com/gaotao/modules/inboundNotification/service/impl/InboundNotificationServiceImpl.java +++ b/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 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"; diff --git a/src/main/java/com/gaotao/modules/schedule/mapper/ScheduleMapper.java b/src/main/java/com/gaotao/modules/schedule/mapper/ScheduleMapper.java index faf52d8..f66efcb 100644 --- a/src/main/java/com/gaotao/modules/schedule/mapper/ScheduleMapper.java +++ b/src/main/java/com/gaotao/modules/schedule/mapper/ScheduleMapper.java @@ -780,7 +780,8 @@ public interface ScheduleMapper { * 调用存储过程 sfdcRollsOpsReportExecute * 用于打开材料卷 * @param params 参数 + * @return 存储过程返回结果 */ - void callSfdcRollsOpsReportExecute(Map params); + Map callSfdcRollsOpsReportExecute(Map params); } diff --git a/src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java b/src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java index 81dcabe..b9ce444 100644 --- a/src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java +++ b/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 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 result = new HashMap<>(); result.put("code", code); diff --git a/src/main/resources/mapper/inboundNotification/InboundNotificationHeadMapper.xml b/src/main/resources/mapper/inboundNotification/InboundNotificationHeadMapper.xml index 421e472..4e39d78 100644 --- a/src/main/resources/mapper/inboundNotification/InboundNotificationHeadMapper.xml +++ b/src/main/resources/mapper/inboundNotification/InboundNotificationHeadMapper.xml @@ -283,14 +283,11 @@ - + exec UspImportRoll + #{site}, + #{buNo}, + #{orderNo}, + #{orderType} diff --git a/src/main/resources/mapper/schedule/ScheduleMapper.xml b/src/main/resources/mapper/schedule/ScheduleMapper.xml index b55ea33..d205cb8 100644 --- a/src/main/resources/mapper/schedule/ScheduleMapper.xml +++ b/src/main/resources/mapper/schedule/ScheduleMapper.xml @@ -2043,17 +2043,14 @@ - + exec sfdcRollsOpsReportExecute + #{site}, + #{seqNo}, + #{rollNo}, + #{histSeqNo}, + #{type}, + #{userId} \ No newline at end of file