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 47ca9e5..68e0c82 100644 --- a/src/main/java/com/gaotao/modules/schedule/controller/ScheduleController.java +++ b/src/main/java/com/gaotao/modules/schedule/controller/ScheduleController.java @@ -1164,10 +1164,10 @@ public class ScheduleController extends AbstractController { @RequestMapping(value = "processCuttingMaterialRoll") @RepeatSubmit public R processCuttingMaterialRoll(@RequestBody SearchScheduleData inData) { - List> printList = scheduleService.processCuttingMaterialRoll(inData); + Map result = scheduleService.processCuttingMaterialRoll(inData); return R.ok() .put("code", 200) - .put("printList", printList) + .put("printRollNo", result.get("printRollNo")) .put("msg", getLanguageMsg(SysMsgConstant.OBJECT_ID_200000)); } 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 840098b..633eac3 100644 --- a/src/main/java/com/gaotao/modules/schedule/service/ScheduleService.java +++ b/src/main/java/com/gaotao/modules/schedule/service/ScheduleService.java @@ -675,8 +675,9 @@ public interface ScheduleService { * @Description 处理材料下料功能 * @DateTime 2022/2/15 17:13 * @Param [inData] + * @return 包含打印卷号的Map **/ - List> processCuttingMaterialRoll(SearchScheduleData inData); + Map processCuttingMaterialRoll(SearchScheduleData inData); /** * TODO 重新打开当前下架卷的数据 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 ad9abcc..2b3c966 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 @@ -3060,7 +3060,7 @@ public class ScheduleServiceImpl implements ScheduleService { @Override @Transactional - public List> processCuttingMaterialRoll(SearchScheduleData inData) { + public Map processCuttingMaterialRoll(SearchScheduleData inData) { //公共参数 String site = inData.getSite(); String orderNo = inData.getOrderNo(); @@ -3083,9 +3083,11 @@ public class ScheduleServiceImpl implements ScheduleService { Map rollMap = this.getProcessCuttingMaterialRoll(site, orderNo, itemNo, seqNo, rollNo, rmRollNo, rmPartNo, transQty, histSeqNo, operatorId, currentTime); //获取打印的卷号 String printRollNo = String.valueOf(rollMap.get("rollNo")); - //调用存储过程获取打印的数据 - List> printList = this.getMaterialRollReturnPrintData(site, orderNo, printRollNo); - return printList; + + //返回打印卷号 + Map result = new HashMap<>(); + result.put("printRollNo", printRollNo); + return result; } /**