From 55f86d4e9ae0b0828b7498c3a6dc472ce4c91baa Mon Sep 17 00:00:00 2001 From: YunaiV Date: Sun, 22 Feb 2026 15:43:58 +0800 Subject: [PATCH] feat(mes): add request and response VO for MES item receipt and detail, including service and controller implementations --- yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/itemreceipt/MesWmItemReceiptController.java | 194 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/itemreceipt/MesWmItemReceiptDetailController.java | 144 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/itemreceipt/MesWmItemReceiptLineController.java | 153 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/itemreceipt/vo/MesWmItemReceiptPageReqVO.java | 30 ++++++++++++++++++++++++++++++ yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/itemreceipt/vo/MesWmItemReceiptRespVO.java | 101 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/itemreceipt/vo/MesWmItemReceiptSaveReqVO.java | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/itemreceipt/vo/detail/MesWmItemReceiptDetailPageReqVO.java | 21 +++++++++++++++++++++ yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/itemreceipt/vo/detail/MesWmItemReceiptDetailRespVO.java | 79 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/itemreceipt/vo/detail/MesWmItemReceiptDetailSaveReqVO.java | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/itemreceipt/vo/line/MesWmItemReceiptLinePageReqVO.java | 18 ++++++++++++++++++ yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/itemreceipt/vo/line/MesWmItemReceiptLineRespVO.java | 97 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/itemreceipt/vo/line/MesWmItemReceiptLineSaveReqVO.java | 73 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/itemreceipt/MesWmItemReceiptDO.java | 116 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/itemreceipt/MesWmItemReceiptDetailDO.java | 100 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/itemreceipt/MesWmItemReceiptLineDO.java | 125 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/itemreceipt/MesWmItemReceiptDetailMapper.java | 41 +++++++++++++++++++++++++++++++++++++++++ yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/itemreceipt/MesWmItemReceiptLineMapper.java | 32 ++++++++++++++++++++++++++++++++ yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/itemreceipt/MesWmItemReceiptMapper.java | 30 ++++++++++++++++++++++++++++++ yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemreceipt/MesWmItemReceiptDetailService.java | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemreceipt/MesWmItemReceiptDetailServiceImpl.java | 76 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemreceipt/MesWmItemReceiptLineService.java | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemreceipt/MesWmItemReceiptLineServiceImpl.java | 87 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemreceipt/MesWmItemReceiptService.java | 76 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemreceipt/MesWmItemReceiptServiceImpl.java | 200 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 24 files changed, 2037 insertions(+), 0 deletions(-) create mode 100644 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/itemreceipt/MesWmItemReceiptController.java create mode 100644 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/itemreceipt/MesWmItemReceiptDetailController.java create mode 100644 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/itemreceipt/MesWmItemReceiptLineController.java create mode 100644 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/itemreceipt/vo/MesWmItemReceiptPageReqVO.java create mode 100644 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/itemreceipt/vo/MesWmItemReceiptRespVO.java create mode 100644 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/itemreceipt/vo/MesWmItemReceiptSaveReqVO.java create mode 100644 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/itemreceipt/vo/detail/MesWmItemReceiptDetailPageReqVO.java create mode 100644 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/itemreceipt/vo/detail/MesWmItemReceiptDetailRespVO.java create mode 100644 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/itemreceipt/vo/detail/MesWmItemReceiptDetailSaveReqVO.java create mode 100644 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/itemreceipt/vo/line/MesWmItemReceiptLinePageReqVO.java create mode 100644 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/itemreceipt/vo/line/MesWmItemReceiptLineRespVO.java create mode 100644 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/itemreceipt/vo/line/MesWmItemReceiptLineSaveReqVO.java create mode 100644 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/itemreceipt/MesWmItemReceiptDO.java create mode 100644 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/itemreceipt/MesWmItemReceiptDetailDO.java create mode 100644 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/itemreceipt/MesWmItemReceiptLineDO.java create mode 100644 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/itemreceipt/MesWmItemReceiptDetailMapper.java create mode 100644 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/itemreceipt/MesWmItemReceiptLineMapper.java create mode 100644 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/itemreceipt/MesWmItemReceiptMapper.java create mode 100644 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemreceipt/MesWmItemReceiptDetailService.java create mode 100644 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemreceipt/MesWmItemReceiptDetailServiceImpl.java create mode 100644 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemreceipt/MesWmItemReceiptLineService.java create mode 100644 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemreceipt/MesWmItemReceiptLineServiceImpl.java create mode 100644 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemreceipt/MesWmItemReceiptService.java create mode 100644 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemreceipt/MesWmItemReceiptServiceImpl.java diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/itemreceipt/MesWmItemReceiptController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/itemreceipt/MesWmItemReceiptController.java new file mode 100644 index 0000000..281364f --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/itemreceipt/MesWmItemReceiptController.java @@ -0,0 +1,194 @@ +package cn.iocoder.yudao.module.mes.controller.admin.wm.itemreceipt; + +import cn.hutool.core.collection.CollUtil; +import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog; +import cn.iocoder.yudao.framework.common.pojo.CommonResult; +import cn.iocoder.yudao.framework.common.pojo.PageParam; +import cn.iocoder.yudao.framework.common.pojo.PageResult; +import cn.iocoder.yudao.framework.common.util.collection.MapUtils; +import cn.iocoder.yudao.framework.common.util.object.BeanUtils; +import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils; +import cn.iocoder.yudao.module.mes.controller.admin.wm.itemreceipt.vo.MesWmItemReceiptPageReqVO; +import cn.iocoder.yudao.module.mes.controller.admin.wm.itemreceipt.vo.MesWmItemReceiptRespVO; +import cn.iocoder.yudao.module.mes.controller.admin.wm.itemreceipt.vo.MesWmItemReceiptSaveReqVO; +import cn.iocoder.yudao.module.mes.dal.dataobject.md.vendor.MesMdVendorDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.qc.lqc.MesQcIqcDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.wm.arrivalnotice.MesWmArrivalNoticeDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.wm.itemreceipt.MesWmItemReceiptDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.wm.warehouse.MesWmWarehouseAreaDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.wm.warehouse.MesWmWarehouseDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.wm.warehouse.MesWmWarehouseLocationDO; +import cn.iocoder.yudao.module.mes.service.md.vendor.MesMdVendorService; +import cn.iocoder.yudao.module.mes.service.qc.lqc.MesQcIqcService; +import cn.iocoder.yudao.module.mes.service.wm.arrivalnotice.MesWmArrivalNoticeService; +import cn.iocoder.yudao.module.mes.service.wm.itemreceipt.MesWmItemReceiptService; +import cn.iocoder.yudao.module.mes.service.wm.warehouse.MesWmWarehouseAreaService; +import cn.iocoder.yudao.module.mes.service.wm.warehouse.MesWmWarehouseLocationService; +import cn.iocoder.yudao.module.mes.service.wm.warehouse.MesWmWarehouseService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.Valid; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.io.IOException; +import java.util.Collections; +import java.util.List; +import java.util.Map; + +import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT; +import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; +import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet; + +@Tag(name = "管理后台 - MES 采购入库单") +@RestController +@RequestMapping("/mes/wm/item-receipt") +@Validated +public class MesWmItemReceiptController { + + @Resource + private MesWmItemReceiptService itemReceiptService; + + @Resource + private MesMdVendorService vendorService; + + @Resource + private MesWmWarehouseService warehouseService; + + @Resource + private MesWmWarehouseLocationService locationService; + + @Resource + private MesWmWarehouseAreaService areaService; + + @Resource + private MesQcIqcService iqcService; + + @Resource + private MesWmArrivalNoticeService arrivalNoticeService; + + @PostMapping("/create") + @Operation(summary = "创建采购入库单") + @PreAuthorize("@ss.hasPermission('mes:wm-item-receipt:create')") + public CommonResult createItemReceipt(@Valid @RequestBody MesWmItemReceiptSaveReqVO createReqVO) { + return success(itemReceiptService.createItemReceipt(createReqVO)); + } + + @PutMapping("/update") + @Operation(summary = "修改采购入库单") + @PreAuthorize("@ss.hasPermission('mes:wm-item-receipt:update')") + public CommonResult updateItemReceipt(@Valid @RequestBody MesWmItemReceiptSaveReqVO updateReqVO) { + itemReceiptService.updateItemReceipt(updateReqVO); + return success(true); + } + + @DeleteMapping("/delete") + @Operation(summary = "删除采购入库单") + @Parameter(name = "id", description = "编号", required = true) + @PreAuthorize("@ss.hasPermission('mes:wm-item-receipt:delete')") + public CommonResult deleteItemReceipt(@RequestParam("id") Long id) { + itemReceiptService.deleteItemReceipt(id); + return success(true); + } + + @GetMapping("/get") + @Operation(summary = "获得采购入库单") + @Parameter(name = "id", description = "编号", required = true, example = "1024") + @PreAuthorize("@ss.hasPermission('mes:wm-item-receipt:query')") + public CommonResult getItemReceipt(@RequestParam("id") Long id) { + MesWmItemReceiptDO receipt = itemReceiptService.getItemReceipt(id); + if (receipt == null) { + return success(null); + } + return success(buildRespVOList(Collections.singletonList(receipt)).get(0)); + } + + @GetMapping("/page") + @Operation(summary = "获得采购入库单分页") + @PreAuthorize("@ss.hasPermission('mes:wm-item-receipt:query')") + public CommonResult> getItemReceiptPage( + @Valid MesWmItemReceiptPageReqVO pageReqVO) { + PageResult pageResult = itemReceiptService.getItemReceiptPage(pageReqVO); + return success(new PageResult<>(buildRespVOList(pageResult.getList()), pageResult.getTotal())); + } + + @GetMapping("/export-excel") + @Operation(summary = "导出采购入库单 Excel") + @PreAuthorize("@ss.hasPermission('mes:wm-item-receipt:export')") + @ApiAccessLog(operateType = EXPORT) + public void exportItemReceiptExcel(@Valid MesWmItemReceiptPageReqVO pageReqVO, + HttpServletResponse response) throws IOException { + pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); + PageResult pageResult = itemReceiptService.getItemReceiptPage(pageReqVO); + ExcelUtils.write(response, "采购入库单.xls", "数据", MesWmItemReceiptRespVO.class, + buildRespVOList(pageResult.getList())); + } + + @PutMapping("/submit") + @Operation(summary = "提交采购入库单") + @Parameter(name = "id", description = "编号", required = true) + @PreAuthorize("@ss.hasPermission('mes:wm-item-receipt:update')") + public CommonResult submitItemReceipt(@RequestParam("id") Long id) { + itemReceiptService.submitItemReceipt(id); + return success(true); + } + + @PutMapping("/approve") + @Operation(summary = "审批采购入库单") + @Parameter(name = "id", description = "编号", required = true) + @PreAuthorize("@ss.hasPermission('mes:wm-item-receipt:update')") + public CommonResult approveItemReceipt(@RequestParam("id") Long id) { + itemReceiptService.approveItemReceipt(id); + return success(true); + } + + @PutMapping("/execute") + @Operation(summary = "执行入库") + @Parameter(name = "id", description = "编号", required = true) + @PreAuthorize("@ss.hasPermission('mes:wm-item-receipt:execute')") + public CommonResult executeItemReceipt(@RequestParam("id") Long id) { + itemReceiptService.executeItemReceipt(id); + return success(true); + } + + // ==================== 拼接 VO ==================== + + private List buildRespVOList(List list) { + if (CollUtil.isEmpty(list)) { + return Collections.emptyList(); + } + // 1. 获得关联数据 + Map vendorMap = vendorService.getVendorMap( + convertSet(list, MesWmItemReceiptDO::getVendorId)); + Map warehouseMap = warehouseService.getWarehouseMap( + convertSet(list, MesWmItemReceiptDO::getWarehouseId)); + Map locationMap = locationService.getWarehouseLocationMap( + convertSet(list, MesWmItemReceiptDO::getLocationId)); + Map areaMap = areaService.getWarehouseAreaMap( + convertSet(list, MesWmItemReceiptDO::getAreaId)); + Map iqcMap = iqcService.getIqcMap( + convertSet(list, MesWmItemReceiptDO::getIqcId)); + Map noticeMap = arrivalNoticeService.getArrivalNoticeMap( + convertSet(list, MesWmItemReceiptDO::getNoticeId)); + // 2. 构建结果 + return BeanUtils.toBean(list, MesWmItemReceiptRespVO.class, vo -> { + MapUtils.findAndThen(vendorMap, vo.getVendorId(), + vendor -> vo.setVendorName(vendor.getName())); + MapUtils.findAndThen(warehouseMap, vo.getWarehouseId(), + warehouse -> vo.setWarehouseName(warehouse.getName())); + MapUtils.findAndThen(locationMap, vo.getLocationId(), + location -> vo.setLocationName(location.getName())); + MapUtils.findAndThen(areaMap, vo.getAreaId(), + area -> vo.setAreaName(area.getName())); + MapUtils.findAndThen(iqcMap, vo.getIqcId(), + iqc -> vo.setIqcCode(iqc.getCode())); + MapUtils.findAndThen(noticeMap, vo.getNoticeId(), + notice -> vo.setNoticeCode(notice.getCode())); + }); + } + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/itemreceipt/MesWmItemReceiptDetailController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/itemreceipt/MesWmItemReceiptDetailController.java new file mode 100644 index 0000000..511acf3 --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/itemreceipt/MesWmItemReceiptDetailController.java @@ -0,0 +1,144 @@ +package cn.iocoder.yudao.module.mes.controller.admin.wm.itemreceipt; + +import cn.hutool.core.collection.CollUtil; +import cn.iocoder.yudao.framework.common.pojo.CommonResult; +import cn.iocoder.yudao.framework.common.pojo.PageResult; +import cn.iocoder.yudao.framework.common.util.collection.MapUtils; +import cn.iocoder.yudao.framework.common.util.object.BeanUtils; +import cn.iocoder.yudao.module.mes.controller.admin.wm.itemreceipt.vo.detail.MesWmItemReceiptDetailPageReqVO; +import cn.iocoder.yudao.module.mes.controller.admin.wm.itemreceipt.vo.detail.MesWmItemReceiptDetailRespVO; +import cn.iocoder.yudao.module.mes.controller.admin.wm.itemreceipt.vo.detail.MesWmItemReceiptDetailSaveReqVO; +import cn.iocoder.yudao.module.mes.dal.dataobject.md.item.MesMdItemDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.md.unitmeasure.MesMdUnitMeasureDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.wm.itemreceipt.MesWmItemReceiptDetailDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.wm.warehouse.MesWmWarehouseAreaDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.wm.warehouse.MesWmWarehouseDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.wm.warehouse.MesWmWarehouseLocationDO; +import cn.iocoder.yudao.module.mes.service.md.item.MesMdItemService; +import cn.iocoder.yudao.module.mes.service.md.unitmeasure.MesMdUnitMeasureService; +import cn.iocoder.yudao.module.mes.service.wm.itemreceipt.MesWmItemReceiptDetailService; +import cn.iocoder.yudao.module.mes.service.wm.warehouse.MesWmWarehouseAreaService; +import cn.iocoder.yudao.module.mes.service.wm.warehouse.MesWmWarehouseLocationService; +import cn.iocoder.yudao.module.mes.service.wm.warehouse.MesWmWarehouseService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.annotation.Resource; +import jakarta.validation.Valid; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.Collections; +import java.util.List; +import java.util.Map; + +import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; +import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet; + +@Tag(name = "管理后台 - MES 采购入库明细") +@RestController +@RequestMapping("/mes/wm/item-receipt-detail") +@Validated +public class MesWmItemReceiptDetailController { + + @Resource + private MesWmItemReceiptDetailService itemReceiptDetailService; + + @Resource + private MesMdItemService itemService; + + @Resource + private MesMdUnitMeasureService unitMeasureService; + + @Resource + private MesWmWarehouseService warehouseService; + + @Resource + private MesWmWarehouseLocationService locationService; + + @Resource + private MesWmWarehouseAreaService areaService; + + @PostMapping("/create") + @Operation(summary = "创建采购入库明细") + @PreAuthorize("@ss.hasPermission('mes:wm-item-receipt:create')") + public CommonResult createItemReceiptDetail(@Valid @RequestBody MesWmItemReceiptDetailSaveReqVO createReqVO) { + return success(itemReceiptDetailService.createItemReceiptDetail(createReqVO)); + } + + @PutMapping("/update") + @Operation(summary = "修改采购入库明细") + @PreAuthorize("@ss.hasPermission('mes:wm-item-receipt:update')") + public CommonResult updateItemReceiptDetail(@Valid @RequestBody MesWmItemReceiptDetailSaveReqVO updateReqVO) { + itemReceiptDetailService.updateItemReceiptDetail(updateReqVO); + return success(true); + } + + @DeleteMapping("/delete") + @Operation(summary = "删除采购入库明细") + @Parameter(name = "id", description = "编号", required = true) + @PreAuthorize("@ss.hasPermission('mes:wm-item-receipt:delete')") + public CommonResult deleteItemReceiptDetail(@RequestParam("id") Long id) { + itemReceiptDetailService.deleteItemReceiptDetail(id); + return success(true); + } + + @GetMapping("/get") + @Operation(summary = "获得采购入库明细") + @Parameter(name = "id", description = "编号", required = true, example = "1024") + @PreAuthorize("@ss.hasPermission('mes:wm-item-receipt:query')") + public CommonResult getItemReceiptDetail(@RequestParam("id") Long id) { + MesWmItemReceiptDetailDO detail = itemReceiptDetailService.getItemReceiptDetail(id); + if (detail == null) { + return success(null); + } + return success(buildRespVOList(Collections.singletonList(detail)).get(0)); + } + + @GetMapping("/page") + @Operation(summary = "获得采购入库明细分页") + @PreAuthorize("@ss.hasPermission('mes:wm-item-receipt:query')") + public CommonResult> getItemReceiptDetailPage( + @Valid MesWmItemReceiptDetailPageReqVO pageReqVO) { + PageResult pageResult = itemReceiptDetailService.getItemReceiptDetailPage(pageReqVO); + return success(new PageResult<>(buildRespVOList(pageResult.getList()), pageResult.getTotal())); + } + + // ==================== 拼接 VO ==================== + + private List buildRespVOList(List list) { + if (CollUtil.isEmpty(list)) { + return Collections.emptyList(); + } + // 1. 获得关联数据 + Map itemMap = itemService.getItemMap( + convertSet(list, MesWmItemReceiptDetailDO::getItemId)); + Map warehouseMap = warehouseService.getWarehouseMap( + convertSet(list, MesWmItemReceiptDetailDO::getWarehouseId)); + Map locationMap = locationService.getWarehouseLocationMap( + convertSet(list, MesWmItemReceiptDetailDO::getLocationId)); + Map areaMap = areaService.getWarehouseAreaMap( + convertSet(list, MesWmItemReceiptDetailDO::getAreaId)); + // 2. 构建结果 + return BeanUtils.toBean(list, MesWmItemReceiptDetailRespVO.class, vo -> { + MapUtils.findAndThen(itemMap, vo.getItemId(), item -> { + vo.setItemCode(item.getCode()).setItemName(item.getName()).setSpecification(item.getSpecification()); + // TODO @AI：批量查询，避免 N+1 查询 + if (item.getUnitMeasureId() != null) { + MesMdUnitMeasureDO unitMeasure = unitMeasureService.getUnitMeasure(item.getUnitMeasureId()); + if (unitMeasure != null) { + vo.setUnitMeasureName(unitMeasure.getName()); + } + } + }); + MapUtils.findAndThen(warehouseMap, vo.getWarehouseId(), + warehouse -> vo.setWarehouseName(warehouse.getName())); + MapUtils.findAndThen(locationMap, vo.getLocationId(), + location -> vo.setLocationName(location.getName())); + MapUtils.findAndThen(areaMap, vo.getAreaId(), + area -> vo.setAreaName(area.getName())); + }); + } + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/itemreceipt/MesWmItemReceiptLineController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/itemreceipt/MesWmItemReceiptLineController.java new file mode 100644 index 0000000..9b9846a --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/itemreceipt/MesWmItemReceiptLineController.java @@ -0,0 +1,153 @@ +package cn.iocoder.yudao.module.mes.controller.admin.wm.itemreceipt; + +import cn.hutool.core.collection.CollUtil; +import cn.iocoder.yudao.framework.common.pojo.CommonResult; +import cn.iocoder.yudao.framework.common.pojo.PageResult; +import cn.iocoder.yudao.framework.common.util.collection.MapUtils; +import cn.iocoder.yudao.framework.common.util.object.BeanUtils; +import cn.iocoder.yudao.module.mes.controller.admin.wm.itemreceipt.vo.line.MesWmItemReceiptLinePageReqVO; +import cn.iocoder.yudao.module.mes.controller.admin.wm.itemreceipt.vo.line.MesWmItemReceiptLineRespVO; +import cn.iocoder.yudao.module.mes.controller.admin.wm.itemreceipt.vo.line.MesWmItemReceiptLineSaveReqVO; +import cn.iocoder.yudao.module.mes.dal.dataobject.md.item.MesMdItemDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.md.unitmeasure.MesMdUnitMeasureDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.qc.lqc.MesQcIqcDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.wm.itemreceipt.MesWmItemReceiptLineDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.wm.warehouse.MesWmWarehouseAreaDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.wm.warehouse.MesWmWarehouseDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.wm.warehouse.MesWmWarehouseLocationDO; +import cn.iocoder.yudao.module.mes.service.md.item.MesMdItemService; +import cn.iocoder.yudao.module.mes.service.md.unitmeasure.MesMdUnitMeasureService; +import cn.iocoder.yudao.module.mes.service.qc.lqc.MesQcIqcService; +import cn.iocoder.yudao.module.mes.service.wm.itemreceipt.MesWmItemReceiptLineService; +import cn.iocoder.yudao.module.mes.service.wm.warehouse.MesWmWarehouseAreaService; +import cn.iocoder.yudao.module.mes.service.wm.warehouse.MesWmWarehouseLocationService; +import cn.iocoder.yudao.module.mes.service.wm.warehouse.MesWmWarehouseService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.annotation.Resource; +import jakarta.validation.Valid; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.Collections; +import java.util.List; +import java.util.Map; + +import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; +import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet; + +@Tag(name = "管理后台 - MES 采购入库单行") +@RestController +@RequestMapping("/mes/wm/item-receipt-line") +@Validated +public class MesWmItemReceiptLineController { + + @Resource + private MesWmItemReceiptLineService itemReceiptLineService; + + @Resource + private MesMdItemService itemService; + + @Resource + private MesMdUnitMeasureService unitMeasureService; + + @Resource + private MesWmWarehouseService warehouseService; + + @Resource + private MesWmWarehouseLocationService locationService; + + @Resource + private MesWmWarehouseAreaService areaService; + + @Resource + private MesQcIqcService iqcService; + + @PostMapping("/create") + @Operation(summary = "创建采购入库单行") + @PreAuthorize("@ss.hasPermission('mes:wm-item-receipt:create')") + public CommonResult createItemReceiptLine(@Valid @RequestBody MesWmItemReceiptLineSaveReqVO createReqVO) { + return success(itemReceiptLineService.createItemReceiptLine(createReqVO)); + } + + @PutMapping("/update") + @Operation(summary = "修改采购入库单行") + @PreAuthorize("@ss.hasPermission('mes:wm-item-receipt:update')") + public CommonResult updateItemReceiptLine(@Valid @RequestBody MesWmItemReceiptLineSaveReqVO updateReqVO) { + itemReceiptLineService.updateItemReceiptLine(updateReqVO); + return success(true); + } + + @DeleteMapping("/delete") + @Operation(summary = "删除采购入库单行") + @Parameter(name = "id", description = "编号", required = true) + @PreAuthorize("@ss.hasPermission('mes:wm-item-receipt:delete')") + public CommonResult deleteItemReceiptLine(@RequestParam("id") Long id) { + itemReceiptLineService.deleteItemReceiptLine(id); + return success(true); + } + + @GetMapping("/get") + @Operation(summary = "获得采购入库单行") + @Parameter(name = "id", description = "编号", required = true, example = "1024") + @PreAuthorize("@ss.hasPermission('mes:wm-item-receipt:query')") + public CommonResult getItemReceiptLine(@RequestParam("id") Long id) { + MesWmItemReceiptLineDO line = itemReceiptLineService.getItemReceiptLine(id); + if (line == null) { + return success(null); + } + return success(buildRespVOList(Collections.singletonList(line)).get(0)); + } + + @GetMapping("/page") + @Operation(summary = "获得采购入库单行分页") + @PreAuthorize("@ss.hasPermission('mes:wm-item-receipt:query')") + public CommonResult> getItemReceiptLinePage( + @Valid MesWmItemReceiptLinePageReqVO pageReqVO) { + PageResult pageResult = itemReceiptLineService.getItemReceiptLinePage(pageReqVO); + return success(new PageResult<>(buildRespVOList(pageResult.getList()), pageResult.getTotal())); + } + + // ==================== 拼接 VO ==================== + + private List buildRespVOList(List list) { + if (CollUtil.isEmpty(list)) { + return Collections.emptyList(); + } + // 1. 获得关联数据 + Map itemMap = itemService.getItemMap( + convertSet(list, MesWmItemReceiptLineDO::getItemId)); + Map warehouseMap = warehouseService.getWarehouseMap( + convertSet(list, MesWmItemReceiptLineDO::getWarehouseId)); + Map locationMap = locationService.getWarehouseLocationMap( + convertSet(list, MesWmItemReceiptLineDO::getLocationId)); + Map areaMap = areaService.getWarehouseAreaMap( + convertSet(list, MesWmItemReceiptLineDO::getAreaId)); + Map iqcMap = iqcService.getIqcMap( + convertSet(list, MesWmItemReceiptLineDO::getIqcId)); + // 2. 构建结果 + return BeanUtils.toBean(list, MesWmItemReceiptLineRespVO.class, vo -> { + MapUtils.findAndThen(itemMap, vo.getItemId(), item -> { + vo.setItemCode(item.getCode()).setItemName(item.getName()).setSpecification(item.getSpecification()); + // TODO @AI：批量查询，避免 N+1 查询 + if (item.getUnitMeasureId() != null) { + MesMdUnitMeasureDO unitMeasure = unitMeasureService.getUnitMeasure(item.getUnitMeasureId()); + if (unitMeasure != null) { + vo.setUnitMeasureName(unitMeasure.getName()); + } + } + }); + MapUtils.findAndThen(warehouseMap, vo.getWarehouseId(), + warehouse -> vo.setWarehouseName(warehouse.getName())); + MapUtils.findAndThen(locationMap, vo.getLocationId(), + location -> vo.setLocationName(location.getName())); + MapUtils.findAndThen(areaMap, vo.getAreaId(), + area -> vo.setAreaName(area.getName())); + MapUtils.findAndThen(iqcMap, vo.getIqcId(), + iqc -> vo.setIqcCode(iqc.getCode())); + }); + } + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/itemreceipt/vo/MesWmItemReceiptPageReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/itemreceipt/vo/MesWmItemReceiptPageReqVO.java new file mode 100644 index 0000000..b4cba57 --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/itemreceipt/vo/MesWmItemReceiptPageReqVO.java @@ -0,0 +1,30 @@ +package cn.iocoder.yudao.module.mes.controller.admin.wm.itemreceipt.vo; + +import cn.iocoder.yudao.framework.common.pojo.PageParam; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; + +@Schema(description = "管理后台 - MES 采购入库单分页 Request VO") +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class MesWmItemReceiptPageReqVO extends PageParam { + + @Schema(description = "入库单编码", example = "IR2026020001") + private String code; + + @Schema(description = "入库单名称", example = "钢板入库单") + private String name; + + @Schema(description = "采购订单编号", example = "PO20260101") + private String purchaseOrderCode; + + @Schema(description = "供应商编号", example = "1") + private Long vendorId; + + @Schema(description = "状态", example = "0") + private Integer status; + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/itemreceipt/vo/MesWmItemReceiptRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/itemreceipt/vo/MesWmItemReceiptRespVO.java new file mode 100644 index 0000000..6ff293b --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/itemreceipt/vo/MesWmItemReceiptRespVO.java @@ -0,0 +1,101 @@ +package cn.iocoder.yudao.module.mes.controller.admin.wm.itemreceipt.vo; + +import cn.idev.excel.annotation.ExcelIgnoreUnannotated; +import cn.idev.excel.annotation.ExcelProperty; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.time.LocalDateTime; + +@Schema(description = "管理后台 - MES 采购入库单 Response VO") +@Data +@ExcelIgnoreUnannotated +public class MesWmItemReceiptRespVO { + + @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") + @ExcelProperty("编号") + private Long id; + + @Schema(description = "入库单编码", requiredMode = Schema.RequiredMode.REQUIRED, example = "IR2026020001") + @ExcelProperty("入库单编码") + private String code; + + @Schema(description = "入库单名称", example = "钢板入库单") + @ExcelProperty("入库单名称") + private String name; + + @Schema(description = "来料检验单编号", example = "1") + private Long iqcId; + + @Schema(description = "来料检验单编码", example = "IQC20260201") + @ExcelProperty("来料检验单") + private String iqcCode; + + @Schema(description = "到货通知单编号", example = "1") + private Long noticeId; + + @Schema(description = "到货通知单编码", example = "AN2026020001") + @ExcelProperty("到货通知单") + private String noticeCode; + + @Schema(description = "采购订单编号", example = "PO20260101") + @ExcelProperty("采购订单编号") + private String purchaseOrderCode; + + @Schema(description = "供应商编号", example = "1") + private Long vendorId; + + @Schema(description = "供应商名称", example = "某供应商") + @ExcelProperty("供应商") + private String vendorName; + + @Schema(description = "仓库编号", example = "1") + private Long warehouseId; + + @Schema(description = "仓库名称", example = "原料仓") + @ExcelProperty("仓库") + private String warehouseName; + + @Schema(description = "库区编号", example = "1") + private Long locationId; + + @Schema(description = "库区名称", example = "A 区") + @ExcelProperty("库区") + private String locationName; + + @Schema(description = "库位编号", example = "1") + private Long areaId; + + @Schema(description = "库位名称", example = "A-01") + @ExcelProperty("库位") + private String areaName; + + @Schema(description = "入库日期") + @ExcelProperty("入库日期") + private LocalDateTime receiptDate; + + @Schema(description = "状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "0") + @ExcelProperty("状态") + private Integer status; + + @Schema(description = "备注", example = "备注") + @ExcelProperty("备注") + private String remark; + + @Schema(description = "预留字段1") + private String attribute1; + + @Schema(description = "预留字段2") + private String attribute2; + + @Schema(description = "预留字段3") + private Integer attribute3; + + @Schema(description = "预留字段4") + private Integer attribute4; + + @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("创建时间") + private LocalDateTime createTime; + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/itemreceipt/vo/MesWmItemReceiptSaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/itemreceipt/vo/MesWmItemReceiptSaveReqVO.java new file mode 100644 index 0000000..acf906f --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/itemreceipt/vo/MesWmItemReceiptSaveReqVO.java @@ -0,0 +1,62 @@ +package cn.iocoder.yudao.module.mes.controller.admin.wm.itemreceipt.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotEmpty; +import lombok.Data; + +import java.time.LocalDateTime; + +@Schema(description = "管理后台 - MES 采购入库单新增/修改 Request VO") +@Data +public class MesWmItemReceiptSaveReqVO { + + @Schema(description = "编号", example = "1024") + private Long id; + + @Schema(description = "入库单编码", requiredMode = Schema.RequiredMode.REQUIRED, example = "IR2026020001") + @NotEmpty(message = "入库单编码不能为空") + private String code; + + @Schema(description = "入库单名称", example = "钢板入库单") + private String name; + + @Schema(description = "来料检验单编号", example = "1") + private Long iqcId; + + @Schema(description = "到货通知单编号", example = "1") + private Long noticeId; + + @Schema(description = "采购订单编号", example = "PO20260101") + private String purchaseOrderCode; + + @Schema(description = "供应商编号", example = "1") + private Long vendorId; + + @Schema(description = "仓库编号", example = "1") + private Long warehouseId; + + @Schema(description = "库区编号", example = "1") + private Long locationId; + + @Schema(description = "库位编号", example = "1") + private Long areaId; + + @Schema(description = "入库日期") + private LocalDateTime receiptDate; + + @Schema(description = "备注", example = "备注") + private String remark; + + @Schema(description = "预留字段1") + private String attribute1; + + @Schema(description = "预留字段2") + private String attribute2; + + @Schema(description = "预留字段3") + private Integer attribute3; + + @Schema(description = "预留字段4") + private Integer attribute4; + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/itemreceipt/vo/detail/MesWmItemReceiptDetailPageReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/itemreceipt/vo/detail/MesWmItemReceiptDetailPageReqVO.java new file mode 100644 index 0000000..2345679 --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/itemreceipt/vo/detail/MesWmItemReceiptDetailPageReqVO.java @@ -0,0 +1,21 @@ +package cn.iocoder.yudao.module.mes.controller.admin.wm.itemreceipt.vo.detail; + +import cn.iocoder.yudao.framework.common.pojo.PageParam; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; + +@Schema(description = "管理后台 - MES 采购入库明细分页 Request VO") +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class MesWmItemReceiptDetailPageReqVO extends PageParam { + + @Schema(description = "入库单编号", example = "1") + private Long receiptId; + + @Schema(description = "入库单行编号", example = "1") + private Long lineId; + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/itemreceipt/vo/detail/MesWmItemReceiptDetailRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/itemreceipt/vo/detail/MesWmItemReceiptDetailRespVO.java new file mode 100644 index 0000000..69c3a57 --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/itemreceipt/vo/detail/MesWmItemReceiptDetailRespVO.java @@ -0,0 +1,79 @@ +package cn.iocoder.yudao.module.mes.controller.admin.wm.itemreceipt.vo.detail; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.math.BigDecimal; +import java.time.LocalDateTime; + +@Schema(description = "管理后台 - MES 采购入库明细 Response VO") +@Data +public class MesWmItemReceiptDetailRespVO { + + @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") + private Long id; + + @Schema(description = "入库单行编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") + private Long lineId; + + @Schema(description = "入库单编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") + private Long receiptId; + + @Schema(description = "物料编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") + private Long itemId; + + @Schema(description = "物料编码", example = "M001") + private String itemCode; + + @Schema(description = "物料名称", example = "钢板") + private String itemName; + + @Schema(description = "规格型号", example = "10mm*100mm") + private String specification; + + @Schema(description = "计量单位名称", example = "千克") + private String unitMeasureName; + + @Schema(description = "上架数量", example = "300.00") + private BigDecimal quantity; + + @Schema(description = "批次编号", example = "1") + private Long batchId; + + @Schema(description = "仓库编号", example = "1") + private Long warehouseId; + + @Schema(description = "仓库名称", example = "原料仓") + private String warehouseName; + + @Schema(description = "库区编号", example = "1") + private Long locationId; + + @Schema(description = "库区名称", example = "A 区") + private String locationName; + + @Schema(description = "库位编号", example = "1") + private Long areaId; + + @Schema(description = "库位名称", example = "A-01") + private String areaName; + + @Schema(description = "备注", example = "备注") + private String remark; + + @Schema(description = "预留字段1") + private String attribute1; + + @Schema(description = "预留字段2") + private String attribute2; + + @Schema(description = "预留字段3") + private Integer attribute3; + + @Schema(description = "预留字段4") + private Integer attribute4; + + @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) + private LocalDateTime createTime; + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/itemreceipt/vo/detail/MesWmItemReceiptDetailSaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/itemreceipt/vo/detail/MesWmItemReceiptDetailSaveReqVO.java new file mode 100644 index 0000000..8fd1c66 --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/itemreceipt/vo/detail/MesWmItemReceiptDetailSaveReqVO.java @@ -0,0 +1,58 @@ +package cn.iocoder.yudao.module.mes.controller.admin.wm.itemreceipt.vo.detail; + +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotNull; +import lombok.Data; + +import java.math.BigDecimal; + +@Schema(description = "管理后台 - MES 采购入库明细新增/修改 Request VO") +@Data +public class MesWmItemReceiptDetailSaveReqVO { + + @Schema(description = "编号", example = "1024") + private Long id; + + @Schema(description = "入库单行编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") + @NotNull(message = "入库单行编号不能为空") + private Long lineId; + + @Schema(description = "入库单编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") + @NotNull(message = "入库单编号不能为空") + private Long receiptId; + + @Schema(description = "物料编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") + @NotNull(message = "物料编号不能为空") + private Long itemId; + + @Schema(description = "上架数量", example = "300.00") + private BigDecimal quantity; + + @Schema(description = "批次编号", example = "1") + private Long batchId; + + @Schema(description = "仓库编号", example = "1") + private Long warehouseId; + + @Schema(description = "库区编号", example = "1") + private Long locationId; + + @Schema(description = "库位编号", example = "1") + private Long areaId; + + @Schema(description = "备注", example = "备注") + private String remark; + + @Schema(description = "预留字段1") + private String attribute1; + + @Schema(description = "预留字段2") + private String attribute2; + + @Schema(description = "预留字段3") + private Integer attribute3; + + @Schema(description = "预留字段4") + private Integer attribute4; + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/itemreceipt/vo/line/MesWmItemReceiptLinePageReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/itemreceipt/vo/line/MesWmItemReceiptLinePageReqVO.java new file mode 100644 index 0000000..f92373f --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/itemreceipt/vo/line/MesWmItemReceiptLinePageReqVO.java @@ -0,0 +1,18 @@ +package cn.iocoder.yudao.module.mes.controller.admin.wm.itemreceipt.vo.line; + +import cn.iocoder.yudao.framework.common.pojo.PageParam; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; + +@Schema(description = "管理后台 - MES 采购入库单行分页 Request VO") +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class MesWmItemReceiptLinePageReqVO extends PageParam { + + @Schema(description = "入库单编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") + private Long receiptId; + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/itemreceipt/vo/line/MesWmItemReceiptLineRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/itemreceipt/vo/line/MesWmItemReceiptLineRespVO.java new file mode 100644 index 0000000..66a7936 --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/itemreceipt/vo/line/MesWmItemReceiptLineRespVO.java @@ -0,0 +1,97 @@ +package cn.iocoder.yudao.module.mes.controller.admin.wm.itemreceipt.vo.line; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.math.BigDecimal; +import java.time.LocalDateTime; + +@Schema(description = "管理后台 - MES 采购入库单行 Response VO") +@Data +public class MesWmItemReceiptLineRespVO { + + @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") + private Long id; + + @Schema(description = "入库单编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") + private Long receiptId; + + @Schema(description = "到货通知单行编号", example = "1") + private Long noticeLineId; + + @Schema(description = "物料编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") + private Long itemId; + + @Schema(description = "物料编码", example = "M001") + private String itemCode; + + @Schema(description = "物料名称", example = "钢板") + private String itemName; + + @Schema(description = "规格型号", example = "10mm*100mm") + private String specification; + + @Schema(description = "计量单位名称", example = "千克") + private String unitMeasureName; + + @Schema(description = "入库数量", example = "500.00") + private BigDecimal receivedQuantity; + + @Schema(description = "批次编号", example = "1") + private Long batchId; + + @Schema(description = "仓库编号", example = "1") + private Long warehouseId; + + @Schema(description = "仓库名称", example = "原料仓") + private String warehouseName; + + @Schema(description = "库区编号", example = "1") + private Long locationId; + + @Schema(description = "库区名称", example = "A 区") + private String locationName; + + @Schema(description = "库位编号", example = "1") + private Long areaId; + + @Schema(description = "库位名称", example = "A-01") + private String areaName; + + @Schema(description = "生产日期") + private LocalDateTime productionDate; + + @Schema(description = "有效期") + private LocalDateTime expireDate; + + @Schema(description = "生产批号", example = "PB20260110") + private String productionBatchNumber; + + @Schema(description = "是否需要来料检验", example = "true") + private Boolean iqcCheckFlag; + + @Schema(description = "来料检验单编号", example = "1") + private Long iqcId; + + @Schema(description = "来料检验单编码", example = "IQC20260201") + private String iqcCode; + + @Schema(description = "备注", example = "备注") + private String remark; + + @Schema(description = "预留字段1") + private String attribute1; + + @Schema(description = "预留字段2") + private String attribute2; + + @Schema(description = "预留字段3") + private Integer attribute3; + + @Schema(description = "预留字段4") + private Integer attribute4; + + @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) + private LocalDateTime createTime; + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/itemreceipt/vo/line/MesWmItemReceiptLineSaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/itemreceipt/vo/line/MesWmItemReceiptLineSaveReqVO.java new file mode 100644 index 0000000..cefd7af --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/itemreceipt/vo/line/MesWmItemReceiptLineSaveReqVO.java @@ -0,0 +1,73 @@ +package cn.iocoder.yudao.module.mes.controller.admin.wm.itemreceipt.vo.line; + +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotNull; +import lombok.Data; + +import java.math.BigDecimal; +import java.time.LocalDateTime; + +@Schema(description = "管理后台 - MES 采购入库单行新增/修改 Request VO") +@Data +public class MesWmItemReceiptLineSaveReqVO { + + @Schema(description = "编号", example = "1024") + private Long id; + + @Schema(description = "入库单编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") + @NotNull(message = "入库单编号不能为空") + private Long receiptId; + + @Schema(description = "到货通知单行编号", example = "1") + private Long noticeLineId; + + @Schema(description = "物料编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") + @NotNull(message = "物料编号不能为空") + private Long itemId; + + @Schema(description = "入库数量", example = "500.00") + private BigDecimal receivedQuantity; + + @Schema(description = "批次编号", example = "1") + private Long batchId; + + @Schema(description = "仓库编号", example = "1") + private Long warehouseId; + + @Schema(description = "库区编号", example = "1") + private Long locationId; + + @Schema(description = "库位编号", example = "1") + private Long areaId; + + @Schema(description = "生产日期") + private LocalDateTime productionDate; + + @Schema(description = "有效期") + private LocalDateTime expireDate; + + @Schema(description = "生产批号", example = "PB20260110") + private String productionBatchNumber; + + @Schema(description = "是否需要来料检验", example = "true") + private Boolean iqcCheckFlag; + + @Schema(description = "来料检验单编号", example = "1") + private Long iqcId; + + @Schema(description = "备注", example = "备注") + private String remark; + + @Schema(description = "预留字段1") + private String attribute1; + + @Schema(description = "预留字段2") + private String attribute2; + + @Schema(description = "预留字段3") + private Integer attribute3; + + @Schema(description = "预留字段4") + private Integer attribute4; + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/itemreceipt/MesWmItemReceiptDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/itemreceipt/MesWmItemReceiptDO.java new file mode 100644 index 0000000..a9a4d51 --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/itemreceipt/MesWmItemReceiptDO.java @@ -0,0 +1,116 @@ +package cn.iocoder.yudao.module.mes.dal.dataobject.wm.itemreceipt; + +import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.md.vendor.MesMdVendorDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.wm.arrivalnotice.MesWmArrivalNoticeDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.wm.warehouse.MesWmWarehouseAreaDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.wm.warehouse.MesWmWarehouseDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.wm.warehouse.MesWmWarehouseLocationDO; +import com.baomidou.mybatisplus.annotation.KeySequence; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.*; + +import java.time.LocalDateTime; + +/** + * MES 采购入库单 DO + */ +@TableName("mes_wm_item_receipt") +@KeySequence("mes_wm_item_receipt_seq") +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class MesWmItemReceiptDO extends BaseDO { + + /** + * 编号 + */ + @TableId + private Long id; + /** + * 入库单编码 + */ + private String code; + /** + * 入库单名称 + */ + private String name; + // TODO @AI：关联字段； + /** + * 来料检验单编号 + * + * 关联 mes_qc_iqc.id + */ + private Long iqcId; + /** + * 到货通知单编号 + * + * 关联 {@link MesWmArrivalNoticeDO#getId()} + */ + private Long noticeId; + /** + * 采购订单编号 + */ + private String purchaseOrderCode; + /** + * 供应商编号 + * + * 关联 {@link MesMdVendorDO#getId()} + */ + private Long vendorId; + /** + * 仓库编号 + * + * 关联 {@link MesWmWarehouseDO#getId()} + */ + private Long warehouseId; + /** + * 库区编号 + * + * 关联 {@link MesWmWarehouseLocationDO#getId()} + */ + private Long locationId; + /** + * 库位编号 + * + * 关联 {@link MesWmWarehouseAreaDO#getId()} + */ + private Long areaId; + /** + * 入库日期 + */ + private LocalDateTime receiptDate; + // TODO @AI：枚举类；需要 @关联 + // TODO @AI：字典类；需要 @关联 + /** + * 状态 + * + * 0=草稿 1=已提交 2=已审批 3=已完成 + */ + private Integer status; + /** + * 备注 + */ + private String remark; + /** + * 预留字段1 + */ + private String attribute1; + /** + * 预留字段2 + */ + private String attribute2; + /** + * 预留字段3 + */ + private Integer attribute3; + /** + * 预留字段4 + */ + private Integer attribute4; + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/itemreceipt/MesWmItemReceiptDetailDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/itemreceipt/MesWmItemReceiptDetailDO.java new file mode 100644 index 0000000..7ef7fa3 --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/itemreceipt/MesWmItemReceiptDetailDO.java @@ -0,0 +1,100 @@ +package cn.iocoder.yudao.module.mes.dal.dataobject.wm.itemreceipt; + +import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.md.item.MesMdItemDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.wm.warehouse.MesWmWarehouseAreaDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.wm.warehouse.MesWmWarehouseDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.wm.warehouse.MesWmWarehouseLocationDO; +import com.baomidou.mybatisplus.annotation.KeySequence; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.*; + +import java.math.BigDecimal; + +/** + * MES 采购入库明细 DO + */ +@TableName("mes_wm_item_receipt_detail") +@KeySequence("mes_wm_item_receipt_detail_seq") +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class MesWmItemReceiptDetailDO extends BaseDO { + + /** + * 编号 + */ + @TableId + private Long id; + /** + * 入库单行编号 + * + * 关联 {@link MesWmItemReceiptLineDO#getId()} + */ + private Long lineId; + /** + * 入库单编号 + * + * 关联 {@link MesWmItemReceiptDO#getId()} + */ + private Long receiptId; + /** + * 物料编号 + * + * 关联 {@link MesMdItemDO#getId()} + */ + private Long itemId; + /** + * 上架数量 + */ + private BigDecimal quantity; + /** + * 批次编号 + * + * TODO @芋艿：待 mes_wm_batch 模块迁移后关联 + */ + private Long batchId; + /** + * 仓库编号 + * + * 关联 {@link MesWmWarehouseDO#getId()} + */ + private Long warehouseId; + /** + * 库区编号 + * + * 关联 {@link MesWmWarehouseLocationDO#getId()} + */ + private Long locationId; + /** + * 库位编号 + * + * 关联 {@link MesWmWarehouseAreaDO#getId()} + */ + private Long areaId; + /** + * 备注 + */ + private String remark; + /** + * 预留字段1 + */ + private String attribute1; + /** + * 预留字段2 + */ + private String attribute2; + /** + * 预留字段3 + */ + private Integer attribute3; + /** + * 预留字段4 + */ + private Integer attribute4; + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/itemreceipt/MesWmItemReceiptLineDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/itemreceipt/MesWmItemReceiptLineDO.java new file mode 100644 index 0000000..ce295f8 --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/itemreceipt/MesWmItemReceiptLineDO.java @@ -0,0 +1,125 @@ +package cn.iocoder.yudao.module.mes.dal.dataobject.wm.itemreceipt; + +import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.md.item.MesMdItemDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.wm.arrivalnotice.MesWmArrivalNoticeLineDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.wm.warehouse.MesWmWarehouseAreaDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.wm.warehouse.MesWmWarehouseDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.wm.warehouse.MesWmWarehouseLocationDO; +import com.baomidou.mybatisplus.annotation.KeySequence; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.*; + +import java.math.BigDecimal; +import java.time.LocalDateTime; + +/** + * MES 采购入库单行 DO + */ +@TableName("mes_wm_item_receipt_line") +@KeySequence("mes_wm_item_receipt_line_seq") +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class MesWmItemReceiptLineDO extends BaseDO { + + /** + * 编号 + */ + @TableId + private Long id; + /** + * 入库单编号 + * + * 关联 {@link MesWmItemReceiptDO#getId()} + */ + private Long receiptId; + /** + * 到货通知单行编号 + * + * 关联 {@link MesWmArrivalNoticeLineDO#getId()} + */ + private Long noticeLineId; + /** + * 物料编号 + * + * 关联 {@link MesMdItemDO#getId()} + */ + private Long itemId; + /** + * 入库数量 + */ + private BigDecimal receivedQuantity; + /** + * 批次编号 + * + * TODO @芋艿：待 mes_wm_batch 模块迁移后关联 + */ + private Long batchId; + /** + * 仓库编号 + * + * 关联 {@link MesWmWarehouseDO#getId()} + */ + private Long warehouseId; + /** + * 库区编号 + * + * 关联 {@link MesWmWarehouseLocationDO#getId()} + */ + private Long locationId; + /** + * 库位编号 + * + * 关联 {@link MesWmWarehouseAreaDO#getId()} + */ + private Long areaId; + /** + * 生产日期 + */ + private LocalDateTime productionDate; + /** + * 有效期 + */ + private LocalDateTime expireDate; + /** + * 生产批号 + */ + private String productionBatchNumber; + /** + * 是否需要来料检验 + */ + private Boolean iqcCheckFlag; + // TODO @AI：关联下 iqcId 字段 + /** + * 来料检验单编号 + * + * 关联 mes_qc_iqc.id + */ + private Long iqcId; + /** + * 备注 + */ + private String remark; + /** + * 预留字段1 + */ + private String attribute1; + /** + * 预留字段2 + */ + private String attribute2; + /** + * 预留字段3 + */ + private Integer attribute3; + /** + * 预留字段4 + */ + private Integer attribute4; + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/itemreceipt/MesWmItemReceiptDetailMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/itemreceipt/MesWmItemReceiptDetailMapper.java new file mode 100644 index 0000000..5aebb81 --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/itemreceipt/MesWmItemReceiptDetailMapper.java @@ -0,0 +1,41 @@ +package cn.iocoder.yudao.module.mes.dal.mysql.wm.itemreceipt; + +import cn.iocoder.yudao.framework.common.pojo.PageResult; +import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; +import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; +import cn.iocoder.yudao.module.mes.controller.admin.wm.itemreceipt.vo.detail.MesWmItemReceiptDetailPageReqVO; +import cn.iocoder.yudao.module.mes.dal.dataobject.wm.itemreceipt.MesWmItemReceiptDetailDO; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +/** + * MES 采购入库明细 Mapper + */ +@Mapper +public interface MesWmItemReceiptDetailMapper extends BaseMapperX { + + default PageResult selectPage(MesWmItemReceiptDetailPageReqVO reqVO) { + return selectPage(reqVO, new LambdaQueryWrapperX() + .eqIfPresent(MesWmItemReceiptDetailDO::getReceiptId, reqVO.getReceiptId()) + .eqIfPresent(MesWmItemReceiptDetailDO::getLineId, reqVO.getLineId()) + .orderByDesc(MesWmItemReceiptDetailDO::getId)); + } + + default List selectListByReceiptId(Long receiptId) { + return selectList(MesWmItemReceiptDetailDO::getReceiptId, receiptId); + } + + default List selectListByLineId(Long lineId) { + return selectList(MesWmItemReceiptDetailDO::getLineId, lineId); + } + + default void deleteByReceiptId(Long receiptId) { + delete(MesWmItemReceiptDetailDO::getReceiptId, receiptId); + } + + default void deleteByLineId(Long lineId) { + delete(MesWmItemReceiptDetailDO::getLineId, lineId); + } + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/itemreceipt/MesWmItemReceiptLineMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/itemreceipt/MesWmItemReceiptLineMapper.java new file mode 100644 index 0000000..6fcf3d8 --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/itemreceipt/MesWmItemReceiptLineMapper.java @@ -0,0 +1,32 @@ +package cn.iocoder.yudao.module.mes.dal.mysql.wm.itemreceipt; + +import cn.iocoder.yudao.framework.common.pojo.PageResult; +import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; +import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; +import cn.iocoder.yudao.module.mes.controller.admin.wm.itemreceipt.vo.line.MesWmItemReceiptLinePageReqVO; +import cn.iocoder.yudao.module.mes.dal.dataobject.wm.itemreceipt.MesWmItemReceiptLineDO; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +/** + * MES 采购入库单行 Mapper + */ +@Mapper +public interface MesWmItemReceiptLineMapper extends BaseMapperX { + + default PageResult selectPage(MesWmItemReceiptLinePageReqVO reqVO) { + return selectPage(reqVO, new LambdaQueryWrapperX() + .eqIfPresent(MesWmItemReceiptLineDO::getReceiptId, reqVO.getReceiptId()) + .orderByDesc(MesWmItemReceiptLineDO::getId)); + } + + default List selectListByReceiptId(Long receiptId) { + return selectList(MesWmItemReceiptLineDO::getReceiptId, receiptId); + } + + default void deleteByReceiptId(Long receiptId) { + delete(MesWmItemReceiptLineDO::getReceiptId, receiptId); + } + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/itemreceipt/MesWmItemReceiptMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/itemreceipt/MesWmItemReceiptMapper.java new file mode 100644 index 0000000..229911f --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/itemreceipt/MesWmItemReceiptMapper.java @@ -0,0 +1,30 @@ +package cn.iocoder.yudao.module.mes.dal.mysql.wm.itemreceipt; + +import cn.iocoder.yudao.framework.common.pojo.PageResult; +import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; +import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; +import cn.iocoder.yudao.module.mes.controller.admin.wm.itemreceipt.vo.MesWmItemReceiptPageReqVO; +import cn.iocoder.yudao.module.mes.dal.dataobject.wm.itemreceipt.MesWmItemReceiptDO; +import org.apache.ibatis.annotations.Mapper; + +/** + * MES 采购入库单 Mapper + */ +@Mapper +public interface MesWmItemReceiptMapper extends BaseMapperX { + + default PageResult selectPage(MesWmItemReceiptPageReqVO reqVO) { + return selectPage(reqVO, new LambdaQueryWrapperX() + .likeIfPresent(MesWmItemReceiptDO::getCode, reqVO.getCode()) + .likeIfPresent(MesWmItemReceiptDO::getName, reqVO.getName()) + .likeIfPresent(MesWmItemReceiptDO::getPurchaseOrderCode, reqVO.getPurchaseOrderCode()) + .eqIfPresent(MesWmItemReceiptDO::getVendorId, reqVO.getVendorId()) + .eqIfPresent(MesWmItemReceiptDO::getStatus, reqVO.getStatus()) + .orderByDesc(MesWmItemReceiptDO::getId)); + } + + default MesWmItemReceiptDO selectByCode(String code) { + return selectOne(MesWmItemReceiptDO::getCode, code); + } + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemreceipt/MesWmItemReceiptDetailService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemreceipt/MesWmItemReceiptDetailService.java new file mode 100644 index 0000000..546706f --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemreceipt/MesWmItemReceiptDetailService.java @@ -0,0 +1,62 @@ +package cn.iocoder.yudao.module.mes.service.wm.itemreceipt; + +import cn.iocoder.yudao.framework.common.pojo.PageResult; +import cn.iocoder.yudao.module.mes.controller.admin.wm.itemreceipt.vo.detail.MesWmItemReceiptDetailPageReqVO; +import cn.iocoder.yudao.module.mes.controller.admin.wm.itemreceipt.vo.detail.MesWmItemReceiptDetailSaveReqVO; +import cn.iocoder.yudao.module.mes.dal.dataobject.wm.itemreceipt.MesWmItemReceiptDetailDO; +import jakarta.validation.Valid; + +import java.util.List; + +/** + * MES 采购入库明细 Service 接口 + */ +public interface MesWmItemReceiptDetailService { + + /** + * 创建采购入库明细 + * + * @param createReqVO 创建信息 + * @return 编号 + */ + Long createItemReceiptDetail(@Valid MesWmItemReceiptDetailSaveReqVO createReqVO); + + /** + * 修改采购入库明细 + * + * @param updateReqVO 修改信息 + */ + void updateItemReceiptDetail(@Valid MesWmItemReceiptDetailSaveReqVO updateReqVO); + + /** + * 删除采购入库明细 + * + * @param id 编号 + */ + void deleteItemReceiptDetail(Long id); + + /** + * 获得采购入库明细 + * + * @param id 编号 + * @return 采购入库明细 + */ + MesWmItemReceiptDetailDO getItemReceiptDetail(Long id); + + /** + * 获得采购入库明细分页 + * + * @param pageReqVO 分页参数 + * @return 采购入库明细分页 + */ + PageResult getItemReceiptDetailPage(MesWmItemReceiptDetailPageReqVO pageReqVO); + + /** + * 按入库单行编号获得明细列表 + * + * @param lineId 行编号 + * @return 明细列表 + */ + List getItemReceiptDetailListByLineId(Long lineId); + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemreceipt/MesWmItemReceiptDetailServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemreceipt/MesWmItemReceiptDetailServiceImpl.java new file mode 100644 index 0000000..e0a3d7b --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemreceipt/MesWmItemReceiptDetailServiceImpl.java @@ -0,0 +1,76 @@ +package cn.iocoder.yudao.module.mes.service.wm.itemreceipt; + +import cn.iocoder.yudao.framework.common.pojo.PageResult; +import cn.iocoder.yudao.framework.common.util.object.BeanUtils; +import cn.iocoder.yudao.module.mes.controller.admin.wm.itemreceipt.vo.detail.MesWmItemReceiptDetailPageReqVO; +import cn.iocoder.yudao.module.mes.controller.admin.wm.itemreceipt.vo.detail.MesWmItemReceiptDetailSaveReqVO; +import cn.iocoder.yudao.module.mes.dal.dataobject.wm.itemreceipt.MesWmItemReceiptDetailDO; +import cn.iocoder.yudao.module.mes.dal.mysql.wm.itemreceipt.MesWmItemReceiptDetailMapper; +import jakarta.annotation.Resource; +import org.springframework.stereotype.Service; +import org.springframework.validation.annotation.Validated; + +import java.util.List; + +import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; +import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.WM_ITEM_RECEIPT_DETAIL_NOT_EXISTS; + +/** + * MES 采购入库明细 Service 实现类 + */ +@Service +@Validated +public class MesWmItemReceiptDetailServiceImpl implements MesWmItemReceiptDetailService { + + @Resource + private MesWmItemReceiptDetailMapper itemReceiptDetailMapper; + + @Override + public Long createItemReceiptDetail(MesWmItemReceiptDetailSaveReqVO createReqVO) { + // TODO @AI：校验关联字段； + MesWmItemReceiptDetailDO detail = BeanUtils.toBean(createReqVO, MesWmItemReceiptDetailDO.class); + itemReceiptDetailMapper.insert(detail); + return detail.getId(); + } + + @Override + public void updateItemReceiptDetail(MesWmItemReceiptDetailSaveReqVO updateReqVO) { + // 校验存在 + validateItemReceiptDetailExists(updateReqVO.getId()); + // TODO @AI：校验关联字段； + + // 更新 + MesWmItemReceiptDetailDO updateObj = BeanUtils.toBean(updateReqVO, MesWmItemReceiptDetailDO.class); + itemReceiptDetailMapper.updateById(updateObj); + } + + @Override + public void deleteItemReceiptDetail(Long id) { + // 校验存在 + validateItemReceiptDetailExists(id); + // 删除 + itemReceiptDetailMapper.deleteById(id); + } + + @Override + public MesWmItemReceiptDetailDO getItemReceiptDetail(Long id) { + return itemReceiptDetailMapper.selectById(id); + } + + @Override + public PageResult getItemReceiptDetailPage(MesWmItemReceiptDetailPageReqVO pageReqVO) { + return itemReceiptDetailMapper.selectPage(pageReqVO); + } + + @Override + public List getItemReceiptDetailListByLineId(Long lineId) { + return itemReceiptDetailMapper.selectListByLineId(lineId); + } + + private void validateItemReceiptDetailExists(Long id) { + if (itemReceiptDetailMapper.selectById(id) == null) { + throw exception(WM_ITEM_RECEIPT_DETAIL_NOT_EXISTS); + } + } + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemreceipt/MesWmItemReceiptLineService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemreceipt/MesWmItemReceiptLineService.java new file mode 100644 index 0000000..0518363 --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemreceipt/MesWmItemReceiptLineService.java @@ -0,0 +1,62 @@ +package cn.iocoder.yudao.module.mes.service.wm.itemreceipt; + +import cn.iocoder.yudao.framework.common.pojo.PageResult; +import cn.iocoder.yudao.module.mes.controller.admin.wm.itemreceipt.vo.line.MesWmItemReceiptLinePageReqVO; +import cn.iocoder.yudao.module.mes.controller.admin.wm.itemreceipt.vo.line.MesWmItemReceiptLineSaveReqVO; +import cn.iocoder.yudao.module.mes.dal.dataobject.wm.itemreceipt.MesWmItemReceiptLineDO; +import jakarta.validation.Valid; + +import java.util.List; + +/** + * MES 采购入库单行 Service 接口 + */ +public interface MesWmItemReceiptLineService { + + /** + * 创建采购入库单行 + * + * @param createReqVO 创建信息 + * @return 编号 + */ + Long createItemReceiptLine(@Valid MesWmItemReceiptLineSaveReqVO createReqVO); + + /** + * 修改采购入库单行 + * + * @param updateReqVO 修改信息 + */ + void updateItemReceiptLine(@Valid MesWmItemReceiptLineSaveReqVO updateReqVO); + + /** + * 删除采购入库单行（级联删除明细） + * + * @param id 编号 + */ + void deleteItemReceiptLine(Long id); + + /** + * 获得采购入库单行 + * + * @param id 编号 + * @return 采购入库单行 + */ + MesWmItemReceiptLineDO getItemReceiptLine(Long id); + + /** + * 获得采购入库单行分页 + * + * @param pageReqVO 分页参数 + * @return 采购入库单行分页 + */ + PageResult getItemReceiptLinePage(MesWmItemReceiptLinePageReqVO pageReqVO); + + /** + * 按入库单编号获得行列表 + * + * @param receiptId 入库单编号 + * @return 行列表 + */ + List getItemReceiptLineListByReceiptId(Long receiptId); + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemreceipt/MesWmItemReceiptLineServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemreceipt/MesWmItemReceiptLineServiceImpl.java new file mode 100644 index 0000000..83dcb37 --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemreceipt/MesWmItemReceiptLineServiceImpl.java @@ -0,0 +1,87 @@ +package cn.iocoder.yudao.module.mes.service.wm.itemreceipt; + +import cn.iocoder.yudao.framework.common.pojo.PageResult; +import cn.iocoder.yudao.framework.common.util.object.BeanUtils; +import cn.iocoder.yudao.module.mes.controller.admin.wm.itemreceipt.vo.line.MesWmItemReceiptLinePageReqVO; +import cn.iocoder.yudao.module.mes.controller.admin.wm.itemreceipt.vo.line.MesWmItemReceiptLineSaveReqVO; +import cn.iocoder.yudao.module.mes.dal.dataobject.wm.itemreceipt.MesWmItemReceiptLineDO; +import cn.iocoder.yudao.module.mes.dal.mysql.wm.itemreceipt.MesWmItemReceiptDetailMapper; +import cn.iocoder.yudao.module.mes.dal.mysql.wm.itemreceipt.MesWmItemReceiptLineMapper; +import jakarta.annotation.Resource; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.validation.annotation.Validated; + +import java.util.List; + +import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; +import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.WM_ITEM_RECEIPT_LINE_NOT_EXISTS; + +/** + * MES 采购入库单行 Service 实现类 + */ +@Service +@Validated +public class MesWmItemReceiptLineServiceImpl implements MesWmItemReceiptLineService { + + @Resource + private MesWmItemReceiptLineMapper itemReceiptLineMapper; + + @Resource + private MesWmItemReceiptDetailMapper itemReceiptDetailMapper; + + @Override + public Long createItemReceiptLine(MesWmItemReceiptLineSaveReqVO createReqVO) { + // TODO @AI：校验关联字段； + + // 新增 + MesWmItemReceiptLineDO line = BeanUtils.toBean(createReqVO, MesWmItemReceiptLineDO.class); + itemReceiptLineMapper.insert(line); + return line.getId(); + } + + @Override + public void updateItemReceiptLine(MesWmItemReceiptLineSaveReqVO updateReqVO) { + // 校验存在 + validateItemReceiptLineExists(updateReqVO.getId()); + // TODO @AI：校验关联字段； + + // 更新 + MesWmItemReceiptLineDO updateObj = BeanUtils.toBean(updateReqVO, MesWmItemReceiptLineDO.class); + itemReceiptLineMapper.updateById(updateObj); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void deleteItemReceiptLine(Long id) { + // 校验存在 + validateItemReceiptLineExists(id); + + // 级联删除明细 + itemReceiptDetailMapper.deleteByLineId(id); + // 删除 + itemReceiptLineMapper.deleteById(id); + } + + @Override + public MesWmItemReceiptLineDO getItemReceiptLine(Long id) { + return itemReceiptLineMapper.selectById(id); + } + + @Override + public PageResult getItemReceiptLinePage(MesWmItemReceiptLinePageReqVO pageReqVO) { + return itemReceiptLineMapper.selectPage(pageReqVO); + } + + @Override + public List getItemReceiptLineListByReceiptId(Long receiptId) { + return itemReceiptLineMapper.selectListByReceiptId(receiptId); + } + + private void validateItemReceiptLineExists(Long id) { + if (itemReceiptLineMapper.selectById(id) == null) { + throw exception(WM_ITEM_RECEIPT_LINE_NOT_EXISTS); + } + } + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemreceipt/MesWmItemReceiptService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemreceipt/MesWmItemReceiptService.java new file mode 100644 index 0000000..5d01683 --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemreceipt/MesWmItemReceiptService.java @@ -0,0 +1,76 @@ +package cn.iocoder.yudao.module.mes.service.wm.itemreceipt; + +import cn.iocoder.yudao.framework.common.pojo.PageResult; +import cn.iocoder.yudao.module.mes.controller.admin.wm.itemreceipt.vo.MesWmItemReceiptPageReqVO; +import cn.iocoder.yudao.module.mes.controller.admin.wm.itemreceipt.vo.MesWmItemReceiptSaveReqVO; +import cn.iocoder.yudao.module.mes.dal.dataobject.wm.itemreceipt.MesWmItemReceiptDO; +import jakarta.validation.Valid; + +/** + * MES 采购入库单 Service 接口 + */ +public interface MesWmItemReceiptService { + + /** + * 创建采购入库单 + * + * @param createReqVO 创建信息 + * @return 编号 + */ + Long createItemReceipt(@Valid MesWmItemReceiptSaveReqVO createReqVO); + + /** + * 修改采购入库单 + * + * @param updateReqVO 修改信息 + */ + void updateItemReceipt(@Valid MesWmItemReceiptSaveReqVO updateReqVO); + + /** + * 删除采购入库单（级联删除行+明细） + * + * @param id 编号 + */ + void deleteItemReceipt(Long id); + + /** + * 获得采购入库单 + * + * @param id 编号 + * @return 采购入库单 + */ + MesWmItemReceiptDO getItemReceipt(Long id); + + /** + * 获得采购入库单分页 + * + * @param pageReqVO 分页参数 + * @return 采购入库单分页 + */ + PageResult getItemReceiptPage(MesWmItemReceiptPageReqVO pageReqVO); + + // TODO @AI：0-》1、1-》2 尽量写状态；不要写这种； + /** + * 提交采购入库单（0→1） + * + * @param id 编号 + */ + void submitItemReceipt(Long id); + + // TODO @AI：0-》1、1-》2 尽量写状态；不要写这种； + /** + * 审批采购入库单（1→2） + * + * @param id 编号 + */ + void approveItemReceipt(Long id); + + // TODO @AI：0-》1、1-》2 尽量写状态；不要写这种； + /** + * 执行入库（2→3），更新库存台账 + * + * @param id 编号 + */ + void executeItemReceipt(Long id); + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemreceipt/MesWmItemReceiptServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemreceipt/MesWmItemReceiptServiceImpl.java new file mode 100644 index 0000000..db079e2 --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemreceipt/MesWmItemReceiptServiceImpl.java @@ -0,0 +1,200 @@ +package cn.iocoder.yudao.module.mes.service.wm.itemreceipt; + +import cn.iocoder.yudao.framework.common.pojo.PageResult; +import cn.iocoder.yudao.framework.common.util.object.BeanUtils; +import cn.iocoder.yudao.module.mes.controller.admin.wm.itemreceipt.vo.MesWmItemReceiptPageReqVO; +import cn.iocoder.yudao.module.mes.controller.admin.wm.itemreceipt.vo.MesWmItemReceiptSaveReqVO; +import cn.iocoder.yudao.module.mes.dal.dataobject.wm.itemreceipt.MesWmItemReceiptDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.wm.itemreceipt.MesWmItemReceiptDetailDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.wm.itemreceipt.MesWmItemReceiptLineDO; +import cn.iocoder.yudao.module.mes.dal.mysql.wm.itemreceipt.MesWmItemReceiptDetailMapper; +import cn.iocoder.yudao.module.mes.dal.mysql.wm.itemreceipt.MesWmItemReceiptLineMapper; +import cn.iocoder.yudao.module.mes.dal.mysql.wm.itemreceipt.MesWmItemReceiptMapper; +import cn.iocoder.yudao.module.mes.service.wm.arrivalnotice.MesWmArrivalNoticeService; +import cn.iocoder.yudao.module.mes.service.wm.materialstock.MesWmMaterialStockService; +import jakarta.annotation.Resource; +import org.springframework.context.annotation.Lazy; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.validation.annotation.Validated; + +import java.math.BigDecimal; +import java.util.List; + +import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; +import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.*; + +/** + * MES 采购入库单 Service 实现类 + */ +@Service +@Validated +public class MesWmItemReceiptServiceImpl implements MesWmItemReceiptService { + + @Resource + private MesWmItemReceiptMapper itemReceiptMapper; + + @Resource + private MesWmItemReceiptLineMapper itemReceiptLineMapper; + + @Resource + private MesWmItemReceiptDetailMapper itemReceiptDetailMapper; + + @Resource + @Lazy + private MesWmArrivalNoticeService arrivalNoticeService; + + @Resource + private MesWmMaterialStockService materialStockService; + + @Override + public Long createItemReceipt(MesWmItemReceiptSaveReqVO createReqVO) { + // 校验编码唯一 + validateCodeUnique(null, createReqVO.getCode()); + // TODO @AI：校验关联字段； + + // 插入 + MesWmItemReceiptDO receipt = BeanUtils.toBean(createReqVO, MesWmItemReceiptDO.class); + receipt.setStatus(0); // 草稿 TODO @AI：使用枚举类 + itemReceiptMapper.insert(receipt); + return receipt.getId(); + } + + @Override + public void updateItemReceipt(MesWmItemReceiptSaveReqVO updateReqVO) { + // 校验存在 + MesWmItemReceiptDO receipt = validateItemReceiptExists(updateReqVO.getId()); + // TODO @AI：校验关联字段； + // 校验状态：只有草稿才允许修改 + // TODO @AI：校验状态，看看抽个方法，尽量几个方法复用 + if (receipt.getStatus() != 0) { + throw exception(WM_ITEM_RECEIPT_STATUS_NOT_PREPARE); + } + // 校验编码唯一 + validateCodeUnique(updateReqVO.getId(), updateReqVO.getCode()); + + // 更新 + MesWmItemReceiptDO updateObj = BeanUtils.toBean(updateReqVO, MesWmItemReceiptDO.class); + itemReceiptMapper.updateById(updateObj); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void deleteItemReceipt(Long id) { + // 校验存在 + MesWmItemReceiptDO receipt = validateItemReceiptExists(id); + // 校验状态：只有草稿才允许删除 + // TODO @AI：校验状态，看看抽个方法，尽量几个方法复用 + if (receipt.getStatus() != 0) { + throw exception(WM_ITEM_RECEIPT_STATUS_NOT_PREPARE); + } + + // 级联删除明细和行 + itemReceiptDetailMapper.deleteByReceiptId(id); + itemReceiptLineMapper.deleteByReceiptId(id); + // 删除 + itemReceiptMapper.deleteById(id); + } + + @Override + public MesWmItemReceiptDO getItemReceipt(Long id) { + return itemReceiptMapper.selectById(id); + } + + @Override + public PageResult getItemReceiptPage(MesWmItemReceiptPageReqVO pageReqVO) { + return itemReceiptMapper.selectPage(pageReqVO); + } + + @Override + public void submitItemReceipt(Long id) { + // 校验存在 + MesWmItemReceiptDO receipt = validateItemReceiptExists(id); + // TODO @AI：校验状态，看看抽个方法，尽量几个方法复用 + if (receipt.getStatus() != 0) { + throw exception(WM_ITEM_RECEIPT_STATUS_NOT_PREPARE); + } + // 校验至少有一条行 + // TODO @AI：对方抽个计算数量的方法啊； + List lines = itemReceiptLineMapper.selectListByReceiptId(id); + if (lines.isEmpty()) { + throw exception(WM_ITEM_RECEIPT_NO_LINE); + } + + // 提交 + itemReceiptMapper.updateById(new MesWmItemReceiptDO().setId(id).setStatus(1)); + } + + @Override + public void approveItemReceipt(Long id) { + // 校验存在 + MesWmItemReceiptDO receipt = validateItemReceiptExists(id); + // TODO @AI：抽一些校验的存在+状态方法 + if (receipt.getStatus() != 1) { + throw exception(WM_ITEM_RECEIPT_STATUS_ERROR); + } + // 校验每行的 SUM(detail.quantity) = line.receivedQuantity + // TODO @AI：抽个计算的 count 方法，然后在行和明细都用；不然代码里到处都是计算的逻辑； + List lines = itemReceiptLineMapper.selectListByReceiptId(id); + for (MesWmItemReceiptLineDO line : lines) { + List details = itemReceiptDetailMapper.selectListByLineId(line.getId()); + BigDecimal totalDetailQty = details.stream() + .map(MesWmItemReceiptDetailDO::getQuantity) + .reduce(BigDecimal.ZERO, BigDecimal::add); + if (line.getReceivedQuantity() != null && totalDetailQty.compareTo(line.getReceivedQuantity()) != 0) { + throw exception(WM_ITEM_RECEIPT_DETAIL_QUANTITY_MISMATCH); + } + } + + // 审批 + itemReceiptMapper.updateById(new MesWmItemReceiptDO().setId(id).setStatus(2)); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void executeItemReceipt(Long id) { + // 校验存在 + MesWmItemReceiptDO receipt = validateItemReceiptExists(id); + // TODO @AI：抽一些校验的存在+状态方法 + if (receipt.getStatus() != 2) { + throw exception(WM_ITEM_RECEIPT_STATUS_ERROR); + } + + // 遍历所有明细，更新库存台账 + // TODO @AI：select 方法，对方搞个； + List details = itemReceiptDetailMapper.selectListByReceiptId(id); + for (MesWmItemReceiptDetailDO detail : details) { + materialStockService.increaseStock( + detail.getItemId(), detail.getWarehouseId(), detail.getLocationId(), detail.getAreaId(), + detail.getBatchId(), detail.getQuantity(), receipt.getVendorId(), null, null); + } + + // 更新入库单状态 + // TODO @AI：枚举类； + itemReceiptMapper.updateById(new MesWmItemReceiptDO().setId(id).setStatus(3)); + // 更新关联的到货通知单状态 + if (receipt.getNoticeId() != null) { + arrivalNoticeService.finishArrivalNotice(receipt.getNoticeId()); + } + } + + private MesWmItemReceiptDO validateItemReceiptExists(Long id) { + MesWmItemReceiptDO receipt = itemReceiptMapper.selectById(id); + if (receipt == null) { + throw exception(WM_ITEM_RECEIPT_NOT_EXISTS); + } + return receipt; + } + + private void validateCodeUnique(Long id, String code) { + MesWmItemReceiptDO receipt = itemReceiptMapper.selectByCode(code); + if (receipt == null) { + return; + } + // TODO @AI：ObjUtil notEquals + if (id == null || !id.equals(receipt.getId())) { + throw exception(WM_ITEM_RECEIPT_CODE_DUPLICATE); + } + } + +} -- libgit2 0.21.4