From 37d78fc85bde3796c97c0f306c63f6010422267c Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Tue, 2 Dec 2025 16:57:46 +0800
Subject: [PATCH] =?UTF-8?q?2025-12-02=20=E6=9C=BA=E5=8F=B0=E5=B7=A5?=
 =?UTF-8?q?=E4=BD=9C=E5=8F=B0=E5=BC=82=E5=B8=B8=E4=B8=8B=E6=9C=BA=E8=B0=83?=
 =?UTF-8?q?=E7=94=A8=E6=89=93=E5=8D=B0=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../schedule/controller/ScheduleController.java    | 14 +++++++++++++-
 .../modules/schedule/service/ScheduleService.java  |  3 ++-
 .../schedule/service/impl/ScheduleServiceImpl.java |  4 +++-
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/gaotao/modules/schedule/controller/ScheduleController.java b/src/main/java/com/gaotao/modules/schedule/controller/ScheduleController.java
index 05e9511..47ca9e5 100644
--- a/src/main/java/com/gaotao/modules/schedule/controller/ScheduleController.java
+++ b/src/main/java/com/gaotao/modules/schedule/controller/ScheduleController.java
@@ -1322,7 +1322,19 @@ public class ScheduleController extends AbstractController {
      **/
     @RequestMapping(value = "materialReturnDuringProduction")
     public R materialReturnDuringProduction(@RequestBody SearchScheduleData inData){
-        scheduleService.materialReturnDuringProduction(inData);
+        Map<String, Object> resultMap = scheduleService.materialReturnDuringProduction(inData);
+        // 获取存储过程返回的code
+        String resultCode = String.valueOf(resultMap.get("Code"));
+        String resultMsg = String.valueOf(resultMap.get("Message"));
+        
+        if ("201".equalsIgnoreCase(resultCode)) {
+            // code=201 表示需要打印，返回打印参数
+            return R.ok()
+                    .put("code", 201)
+                    .put("msg", resultMsg)
+                    .put("printData", resultMap); // 将存储过程返回的所有参数作为打印数据返回
+        }
+        
         return R.ok()
                 .put("code", 200)
                 .put("msg", getLanguageMsg(SysMsgConstant.OBJECT_ID_200000));
diff --git a/src/main/java/com/gaotao/modules/schedule/service/ScheduleService.java b/src/main/java/com/gaotao/modules/schedule/service/ScheduleService.java
index e40c2b0..840098b 100644
--- a/src/main/java/com/gaotao/modules/schedule/service/ScheduleService.java
+++ b/src/main/java/com/gaotao/modules/schedule/service/ScheduleService.java
@@ -766,8 +766,9 @@ public interface ScheduleService {
      * @Description 材料生产过程中异常退料
      * @DateTime 2025/12/2
      * @Param [inData]
+     * @return java.util.Map<java.lang.String, java.lang.Object>
      **/
-    void materialReturnDuringProduction(SearchScheduleData inData);
+    Map<String, Object> materialReturnDuringProduction(SearchScheduleData inData);
 
     /**
      * @Description 查询工单的订单备注信息
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 71ec23c..ad9abcc 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
@@ -3722,7 +3722,7 @@ public class ScheduleServiceImpl implements ScheduleService {
 
     @Override
     @Transactional
-    public void materialReturnDuringProduction(SearchScheduleData inData) {
+    public Map<String, Object> materialReturnDuringProduction(SearchScheduleData inData) {
         //公共参数
         String site = inData.getSite();
         String orderNo = inData.getOrderNo();
@@ -3742,6 +3742,8 @@ public class ScheduleServiceImpl implements ScheduleService {
             String msg = String.valueOf(resultMap.get("Message"));
             throw new XJException(msg, 400);
         }
+        // 返回存储过程的结果（包含code和打印参数）
+        return resultMap;
     }
 
     /**