From d7422d48b06d753f8ba559d709fe80b4144fc763 Mon Sep 17 00:00:00 2001
From: rui_li <877258667@qq.com>
Date: Fri, 6 May 2022 11:01:16 +0800
Subject: [PATCH] =?UTF-8?q?2022-05-06=20=E7=89=B9=E6=AE=8A=E5=B7=A5?=
 =?UTF-8?q?=E5=8D=95-=E8=BD=AC=E6=9D=90=E6=96=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/SchedulingController.java      |  3 ++-
 .../schedule/service/SchedulingService.java   |  2 +-
 .../service/impl/SchedulingServiceImpl.java   | 20 +++++++++++++++----
 3 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/gaotao/modules/schedule/controller/SchedulingController.java b/src/main/java/com/gaotao/modules/schedule/controller/SchedulingController.java
index 37c13aa..5f5faff 100644
--- a/src/main/java/com/gaotao/modules/schedule/controller/SchedulingController.java
+++ b/src/main/java/com/gaotao/modules/schedule/controller/SchedulingController.java
@@ -498,9 +498,10 @@ public class SchedulingController {
      **/
     @RequestMapping(value = "transformRollPart")
     public R transformRollPart(@RequestBody SearchScheduleData inData){
-        schedulingService.transformRollPart(inData);
+        List<Map<String, Object>> printList = schedulingService.transformRollPart(inData);
         return R.ok()
                 .put("code", 200)
+                .put("printList", printList)
                 .put("msg", "操作成功!");
     }
 
diff --git a/src/main/java/com/gaotao/modules/schedule/service/SchedulingService.java b/src/main/java/com/gaotao/modules/schedule/service/SchedulingService.java
index aca2a27..a5f6d96 100644
--- a/src/main/java/com/gaotao/modules/schedule/service/SchedulingService.java
+++ b/src/main/java/com/gaotao/modules/schedule/service/SchedulingService.java
@@ -291,7 +291,7 @@ public interface SchedulingService {
      * @Param [inData]
      * @return void
      **/
-    void transformRollPart(SearchScheduleData inData);
+    List<Map<String, Object>> transformRollPart(SearchScheduleData inData);
 
     /**
      * TODO 获取已经转换物料的卷信息
diff --git a/src/main/java/com/gaotao/modules/schedule/service/impl/SchedulingServiceImpl.java b/src/main/java/com/gaotao/modules/schedule/service/impl/SchedulingServiceImpl.java
index f3dd047..f1af88d 100644
--- a/src/main/java/com/gaotao/modules/schedule/service/impl/SchedulingServiceImpl.java
+++ b/src/main/java/com/gaotao/modules/schedule/service/impl/SchedulingServiceImpl.java
@@ -976,7 +976,7 @@ public class SchedulingServiceImpl implements SchedulingService {
 
     @Override
     @Transactional
-    public void transformRollPart(SearchScheduleData inData) {
+    public List<Map<String, Object>> transformRollPart(SearchScheduleData inData) {
         //公共参数
         String site = inData.getSite();
         String orderNo = inData.getOrderNo();
@@ -1000,7 +1000,19 @@ public class SchedulingServiceImpl implements SchedulingService {
         }
 
         //调用存储过程  执行transData CRollInfo数据
-        this.transformRollPartProcessCrollInfoAndTransData(site, orderNo, rollDate, siPartNo, sirPartNo, siTransNo, sirTransNo, username);
+        List<Map<String, Object>> rollNoList =  this.transformRollPartProcessCrollInfoAndTransData(site, orderNo, rollDate, siPartNo, sirPartNo, siTransNo, sirTransNo, username);
+        //返回打印的列表
+        List<Map<String, Object>> printList = new ArrayList<>();
+        //循环获取参数  返回打印的列表数据
+        for (int i = 0; i < rollNoList.size(); i++){
+            String rollNo = String.valueOf(rollNoList.get(i).get("transRollNo"));
+            CRollInfoData cRollInfoData = new CRollInfoData();
+            cRollInfoData.setSite(site);
+            cRollInfoData.setRollNo(rollNo);
+            Map<String, Object> printMap = schedulingMapper.getSplitPrintMaterialRoll(cRollInfoData);
+            printList.add(printMap);
+        }
+        return printList;
     }
 
     /**
@@ -1010,7 +1022,7 @@ public class SchedulingServiceImpl implements SchedulingService {
      * @Param [site, orderNo, rollDate, siPartNo, sirPartNo, siTransNo, sirTransNo, username]
      * @return void
      **/
-    public void transformRollPartProcessCrollInfoAndTransData(String site, String orderNo, String rollDate, String siPartNo, String sirPartNo, String siTransNo, String sirTransNo, String username) {
+    public List<Map<String, Object>> transformRollPartProcessCrollInfoAndTransData(String site, String orderNo, String rollDate, String siPartNo, String sirPartNo, String siTransNo, String sirTransNo, String username) {
         List<Object> params = new ArrayList<>();
         params.add(site);
         params.add(orderNo);
@@ -1020,7 +1032,7 @@ public class SchedulingServiceImpl implements SchedulingService {
         params.add(siTransNo);
         params.add(sirTransNo);
         params.add(username);
-        procedureMapper.getProcedureData("transformRollPartProcessCrollInfoAndTransData", params);
+        return procedureMapper.getProcedureData("transformRollPartProcessCrollInfoAndTransData", params);
     }
 
     /**