diff --git a/op-modules/op-mes/src/main/java/com/op/mes/controller/MesPrepareDetailController.java b/op-modules/op-mes/src/main/java/com/op/mes/controller/MesPrepareDetailController.java index b82b0b242..61c1ebb9b 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/controller/MesPrepareDetailController.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/controller/MesPrepareDetailController.java @@ -3,6 +3,7 @@ package com.op.mes.controller; import java.util.List; import javax.servlet.http.HttpServletResponse; +import com.op.mes.domain.MesPrepare; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; @@ -113,4 +114,16 @@ public class MesPrepareDetailController extends BaseController { public AjaxResult remove(@PathVariable String[] recordIds) { return toAjax(mesPrepareDetailService.deleteMesPrepareDetailByRecordIds(recordIds)); } + + /** + * 领料单记录批量打印明细列表 + * + * @return + */ + @RequiresPermissions("mes:prepareDetail:export") + @Log(title = "mes备料打印生产物料", businessType = BusinessType.EXPORT) + @GetMapping("/printBatchPrepare") + public AjaxResult printBatchPrepare(MesPrepare params) { + return AjaxResult.success(mesPrepareDetailService.printBatchPrepare(params)); + } } diff --git a/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesPrepareDetailMapper.java b/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesPrepareDetailMapper.java index 22a64a4f2..fd511c035 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesPrepareDetailMapper.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesPrepareDetailMapper.java @@ -74,4 +74,6 @@ public interface MesPrepareDetailMapper { List selectPrintPrepareDetailList(MesPrepareDetail dto); List selectPreDetailHzList(MesPrepareDetail qodetail); + + List selectPrintPrepareDetailListByOrderCodes(@Param("list") List orderCodes); } diff --git a/op-modules/op-mes/src/main/java/com/op/mes/service/IMesPrepareDetailService.java b/op-modules/op-mes/src/main/java/com/op/mes/service/IMesPrepareDetailService.java index 09807e527..e0cc76c3c 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/service/IMesPrepareDetailService.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/service/IMesPrepareDetailService.java @@ -3,6 +3,7 @@ package com.op.mes.service; import java.util.List; import com.op.common.core.web.domain.AjaxResult; +import com.op.mes.domain.MesPrepare; import com.op.mes.domain.MesPrepareDetail; /** @@ -68,4 +69,6 @@ public interface IMesPrepareDetailService { AjaxResult printPrepareByCode(String workorderCode,String recoil); AjaxResult printPrepareXByCode(String productDate); + + List printBatchPrepare(MesPrepare params); } diff --git a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesPrepareDetailServiceImpl.java b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesPrepareDetailServiceImpl.java index a997aa3a4..69ce229fb 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesPrepareDetailServiceImpl.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesPrepareDetailServiceImpl.java @@ -151,4 +151,13 @@ public class MesPrepareDetailServiceImpl implements IMesPrepareDetailService { printPrepareVo.setMesPrepareDetailList(mesPrepareDetailList); return AjaxResult.success(printPrepareVo); } + + @Override + @DS("#header.poolName") + public List printBatchPrepare(MesPrepare params) { + //获取今天的领料单 + List prepareList = mesPrepareMapper.selectMesPrepareList(params); + List orderCodes = prepareList.stream().map(MesPrepare::getWorkorderCode).collect(Collectors.toList()); + return mesPrepareDetailMapper.selectPrintPrepareDetailListByOrderCodes(orderCodes); + } } diff --git a/op-modules/op-mes/src/main/resources/mapper/mes/MesPrepareDetailMapper.xml b/op-modules/op-mes/src/main/resources/mapper/mes/MesPrepareDetailMapper.xml index 53d17b7b1..90964bd4e 100644 --- a/op-modules/op-mes/src/main/resources/mapper/mes/MesPrepareDetailMapper.xml +++ b/op-modules/op-mes/src/main/resources/mapper/mes/MesPrepareDetailMapper.xml @@ -215,4 +215,34 @@ #{recordId} + + + +