From b6f5bd3d831957840ba4bfb1212eeb4d1d03b0aa Mon Sep 17 00:00:00 2001
From: rui_li <877258667@qq.com>
Date: Mon, 9 May 2022 17:37:00 +0800
Subject: [PATCH] =?UTF-8?q?2022-05-09=20=E6=A0=87=E7=AD=BE=E6=89=93?=
 =?UTF-8?q?=E5=8D=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/ScheduleController.java        |  8 +++---
 .../schedule/service/ScheduleService.java     |  2 +-
 .../service/impl/ScheduleServiceImpl.java     | 25 +++++++++++++++++--
 3 files changed, 29 insertions(+), 6 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 6135e90..ce27b58 100644
--- a/src/main/java/com/gaotao/modules/schedule/controller/ScheduleController.java
+++ b/src/main/java/com/gaotao/modules/schedule/controller/ScheduleController.java
@@ -1287,8 +1287,9 @@ public class ScheduleController {
      **/
     @PostMapping(value = "otherCreateSplitSfdcRoll")
     public R otherCreateSplitSfdcRoll(@RequestBody SearchScheduleData inData) {
-        scheduleService.otherCreateSplitSfdcRoll(inData);
-        return R.ok("操作成功").put("code", 200);
+       scheduleService.otherCreateSplitSfdcRoll(inData);
+        return R.ok("操作成功")
+                .put("code", 200);
     }
 
     /**
@@ -1625,9 +1626,10 @@ public class ScheduleController {
      **/
     @RequestMapping(value = "workbench_createslittingroll_Repack_action")
     public R workbenchCreateslittingrollRepackAction(@RequestBody SearchScheduleData inData) {
-        scheduleService.workbenchCreateslittingrollRepackAction(inData);
+        List<Map<String, Object>> printList = scheduleService.workbenchCreateslittingrollRepackAction(inData);
         return R.ok()
                 .put("code", 200)
+                .put("printList", printList)
                 .put("msg", "操作成功!");
     }
 
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 93e6a64..bd40d11 100644
--- a/src/main/java/com/gaotao/modules/schedule/service/ScheduleService.java
+++ b/src/main/java/com/gaotao/modules/schedule/service/ScheduleService.java
@@ -963,7 +963,7 @@ public interface ScheduleService {
      * @Param
      * @return
      **/
-    void workbenchCreateslittingrollRepackAction(SearchScheduleData inData);
+    List<Map<String, Object>> workbenchCreateslittingrollRepackAction(SearchScheduleData inData);
 
     /**
      * @Author LR
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 6f12da4..0078517 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
@@ -3930,6 +3930,7 @@ public class ScheduleServiceImpl implements ScheduleService {
 
 
     @Override
+    @Transactional
     public void otherCreateSplitSfdcRoll(SearchScheduleData inData) {
         List<Object> params = new ArrayList<>();
         params.add(inData.getSite());
@@ -4479,7 +4480,8 @@ public class ScheduleServiceImpl implements ScheduleService {
     }
 
     @Override
-    public void workbenchCreateslittingrollRepackAction(SearchScheduleData scheduleData) {
+    @Transactional
+    public List<Map<String, Object>> workbenchCreateslittingrollRepackAction(SearchScheduleData scheduleData) {
         List<Object> params = new ArrayList<>();
         params.add(scheduleData.getSite());
         params.add(scheduleData.getOrderNo());
@@ -4489,7 +4491,26 @@ public class ScheduleServiceImpl implements ScheduleService {
         params.add(scheduleData.getRollNo());
         params.add(scheduleData.getRollCount());
         params.add(scheduleData.getOperatorId());
-        workbenchCreateslittingrollFqcCheck("workbench_createslittingroll_Repack_action",params);
+        Map<String, Object> resultMap = workbenchCreateslittingrollFqcCheck("workbench_createslittingroll_Repack_action",params);
+        //获取卷号的信息
+        String rollNos = String.valueOf(resultMap.get("rollNos"));
+        String[] rollNoArr = rollNos.split(";");
+        //打印信息的数据
+        List<Map<String, Object>> printList = new ArrayList<>();
+        //循环获取打印的数据
+        for (int i = 0;  i < rollNoArr.length; i++){
+            SearchScheduleData tempData = new SearchScheduleData();
+            //设置查询的参数
+            tempData.setSite(scheduleData.getSite());
+            tempData.setOrderNo(scheduleData.getOrderNo());
+            tempData.setRollNo(rollNoArr[i]);
+            //查询当前的打印的数据
+            Map<String, Object> printMap = schedulingMapper.getSfdcFlowLabelData(tempData);
+            //添加打印的数据
+            printList.add(printMap);
+        }
+        //返回打印的数据 2022-05-09
+        return printList;
     }
 
     @Override