2025-12-02

机台工作台异常下机调用打印功能

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));

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 查询工单的订单备注信息

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;
     }
 
     /**