2026-03-24

机台工作台【合并卷】打印标签

src/main/java/com/gaotao/modules/schedule/controller/ScheduleController.java

@@ -1450,11 +1450,13 @@ public class ScheduleController extends AbstractController {
     @RequestMapping(value = "processMergeSfdcRoll")
     @RepeatSubmit
     public R processMergeSfdcRoll(@RequestBody SearchScheduleData inData){
-        String rollNo = scheduleService.processMergeSfdcRoll(inData);
+        Map<String, Object> resultMap = scheduleService.processMergeSfdcRoll(inData);
+        String rollNo = String.valueOf(resultMap.get("rollNo"));
         return R.ok()
                 .put("code", 200)
                 .put("success", true)
                 .put("rollNo", rollNo)
+                .put("printData", resultMap)
                 .put("msg", getLanguageMsg(SysMsgConstant.OBJECT_ID_200000));
     }
 

src/main/java/com/gaotao/modules/schedule/service/ScheduleService.java

@@ -828,7 +828,7 @@ public interface ScheduleService {
      * @DateTime 2022/2/20 16:37
      * @Param [inData]
      **/
-    String processMergeSfdcRoll(SearchScheduleData inData);
+    Map<String, Object> processMergeSfdcRoll(SearchScheduleData inData);
 
     /**
      * @return Map<String, Object>

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

@@ -4079,7 +4079,7 @@ public class ScheduleServiceImpl implements ScheduleService {
 
     @Override
     @Transactional
-    public String processMergeSfdcRoll(SearchScheduleData inData) {
+    public Map<String, Object> processMergeSfdcRoll(SearchScheduleData inData) {
         //公共参数
         String site = inData.getSite();
         String orderNo = inData.getOrderNo();
@@ -4111,9 +4111,7 @@ public class ScheduleServiceImpl implements ScheduleService {
             String objectId = String.valueOf(resultMap.get("objectId"));
             throw new XJException(msg,objectId);
         }
-        //处理返回的合并卷好
-        String mergeRollNo = String.valueOf(resultMap.get("rollNo"));
-        return mergeRollNo;
+        return resultMap;
     }
 
     /**