2022-05-06 特殊工单-转材料

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", "操作成功!");
     }
 

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 获取已经转换物料的卷信息

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