diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productrecpt/MesWmProductRecptController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productreceipt/MesWmProductReceiptController.java index 9915e2e..16155c2 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productrecpt/MesWmProductRecptController.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productreceipt/MesWmProductReceiptController.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.mes.controller.admin.wm.productrecpt; +package cn.iocoder.yudao.module.mes.controller.admin.wm.productreceipt; import cn.hutool.core.collection.CollUtil; import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog; @@ -8,17 +8,17 @@ 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.productrecpt.vo.MesWmProductRecptPageReqVO; -import cn.iocoder.yudao.module.mes.controller.admin.wm.productrecpt.vo.MesWmProductRecptRespVO; -import cn.iocoder.yudao.module.mes.controller.admin.wm.productrecpt.vo.MesWmProductRecptSaveReqVO; +import cn.iocoder.yudao.module.mes.controller.admin.wm.productreceipt.vo.MesWmProductReceiptPageReqVO; +import cn.iocoder.yudao.module.mes.controller.admin.wm.productreceipt.vo.MesWmProductReceiptRespVO; +import cn.iocoder.yudao.module.mes.controller.admin.wm.productreceipt.vo.MesWmProductReceiptSaveReqVO; 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.pro.workorder.MesProWorkOrderDO; -import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productrecpt.MesWmProductRecptDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productreceipt.MesWmProductReceiptDO; 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.pro.workorder.MesProWorkOrderService; -import cn.iocoder.yudao.module.mes.service.wm.productrecpt.MesWmProductRecptService; +import cn.iocoder.yudao.module.mes.service.wm.productreceipt.MesWmProductReceiptService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; @@ -40,12 +40,12 @@ import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils. @Tag(name = "管理后台 - MES 产品收货单") @RestController -@RequestMapping("/mes/wm/product-recpt") +@RequestMapping("/mes/wm/product-receipt") @Validated -public class MesWmProductRecptController { +public class MesWmProductReceiptController { @Resource - private MesWmProductRecptService productRecptService; + private MesWmProductReceiptService productReceiptService; @Resource private MesProWorkOrderService workOrderService; @@ -58,120 +58,120 @@ public class MesWmProductRecptController { @PostMapping("/create") @Operation(summary = "创建产品收货单") - @PreAuthorize("@ss.hasPermission('mes:wm-product-recpt:create')") - public CommonResult createProductRecpt(@Valid @RequestBody MesWmProductRecptSaveReqVO createReqVO) { - return success(productRecptService.createProductRecpt(createReqVO)); + @PreAuthorize("@ss.hasPermission('mes:wm-product-receipt:create')") + public CommonResult createProductReceipt(@Valid @RequestBody MesWmProductReceiptSaveReqVO createReqVO) { + return success(productReceiptService.createProductReceipt(createReqVO)); } @PutMapping("/update") @Operation(summary = "修改产品收货单") - @PreAuthorize("@ss.hasPermission('mes:wm-product-recpt:update')") - public CommonResult updateProductRecpt(@Valid @RequestBody MesWmProductRecptSaveReqVO updateReqVO) { - productRecptService.updateProductRecpt(updateReqVO); + @PreAuthorize("@ss.hasPermission('mes:wm-product-receipt:update')") + public CommonResult updateProductReceipt(@Valid @RequestBody MesWmProductReceiptSaveReqVO updateReqVO) { + productReceiptService.updateProductReceipt(updateReqVO); return success(true); } @DeleteMapping("/delete") @Operation(summary = "删除产品收货单") @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('mes:wm-product-recpt:delete')") - public CommonResult deleteProductRecpt(@RequestParam("id") Long id) { - productRecptService.deleteProductRecpt(id); + @PreAuthorize("@ss.hasPermission('mes:wm-product-receipt:delete')") + public CommonResult deleteProductReceipt(@RequestParam("id") Long id) { + productReceiptService.deleteProductReceipt(id); return success(true); } @GetMapping("/get") @Operation(summary = "获得产品收货单") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('mes:wm-product-recpt:query')") - public CommonResult getProductRecpt(@RequestParam("id") Long id) { - MesWmProductRecptDO recpt = productRecptService.getProductRecpt(id); - if (recpt == null) { + @PreAuthorize("@ss.hasPermission('mes:wm-product-receipt:query')") + public CommonResult getProductReceipt(@RequestParam("id") Long id) { + MesWmProductReceiptDO receipt = productReceiptService.getProductReceipt(id); + if (receipt == null) { return success(null); } - return success(buildRespVOList(Collections.singletonList(recpt)).get(0)); + return success(buildRespVOList(Collections.singletonList(receipt)).get(0)); } @GetMapping("/page") @Operation(summary = "获得产品收货单分页") - @PreAuthorize("@ss.hasPermission('mes:wm-product-recpt:query')") - public CommonResult> getProductRecptPage( - @Valid MesWmProductRecptPageReqVO pageReqVO) { - PageResult pageResult = productRecptService.getProductRecptPage(pageReqVO); + @PreAuthorize("@ss.hasPermission('mes:wm-product-receipt:query')") + public CommonResult> getProductReceiptPage( + @Valid MesWmProductReceiptPageReqVO pageReqVO) { + PageResult pageResult = productReceiptService.getProductReceiptPage(pageReqVO); return success(new PageResult<>(buildRespVOList(pageResult.getList()), pageResult.getTotal())); } @GetMapping("/export-excel") @Operation(summary = "导出产品收货单 Excel") - @PreAuthorize("@ss.hasPermission('mes:wm-product-recpt:export')") + @PreAuthorize("@ss.hasPermission('mes:wm-product-receipt:export')") @ApiAccessLog(operateType = EXPORT) - public void exportProductRecptExcel(@Valid MesWmProductRecptPageReqVO pageReqVO, + public void exportProductReceiptExcel(@Valid MesWmProductReceiptPageReqVO pageReqVO, HttpServletResponse response) throws IOException { pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); - PageResult pageResult = productRecptService.getProductRecptPage(pageReqVO); - ExcelUtils.write(response, "产品收货单.xls", "数据", MesWmProductRecptRespVO.class, + PageResult pageResult = productReceiptService.getProductReceiptPage(pageReqVO); + ExcelUtils.write(response, "产品收货单.xls", "数据", MesWmProductReceiptRespVO.class, buildRespVOList(pageResult.getList())); } @PutMapping("/submit") @Operation(summary = "提交产品收货单") @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('mes:wm-product-recpt:update')") - public CommonResult submitProductRecpt(@RequestParam("id") Long id) { - productRecptService.submitProductRecpt(id); + @PreAuthorize("@ss.hasPermission('mes:wm-product-receipt:update')") + public CommonResult submitProductReceipt(@RequestParam("id") Long id) { + productReceiptService.submitProductReceipt(id); return success(true); } @PutMapping("/stock") @Operation(summary = "执行上架") @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('mes:wm-product-recpt:update')") - public CommonResult stockProductRecpt(@RequestParam("id") Long id) { - productRecptService.stockProductRecpt(id); + @PreAuthorize("@ss.hasPermission('mes:wm-product-receipt:update')") + public CommonResult stockProductReceipt(@RequestParam("id") Long id) { + productReceiptService.stockProductReceipt(id); return success(true); } @PutMapping("/execute") @Operation(summary = "执行入库") @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('mes:wm-product-recpt:execute')") - public CommonResult executeProductRecpt(@RequestParam("id") Long id) { - productRecptService.executeProductRecpt(id); + @PreAuthorize("@ss.hasPermission('mes:wm-product-receipt:execute')") + public CommonResult executeProductReceipt(@RequestParam("id") Long id) { + productReceiptService.executeProductReceipt(id); return success(true); } @PutMapping("/cancel") @Operation(summary = "取消产品收货单") @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('mes:wm-product-recpt:update')") - public CommonResult cancelProductRecpt(@RequestParam("id") Long id) { - productRecptService.cancelProductRecpt(id); + @PreAuthorize("@ss.hasPermission('mes:wm-product-receipt:update')") + public CommonResult cancelProductReceipt(@RequestParam("id") Long id) { + productReceiptService.cancelProductReceipt(id); return success(true); } @GetMapping("/check-quantity") @Operation(summary = "校验产品收货单明细数量") @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('mes:wm-product-recpt:query')") - public CommonResult checkProductRecptQuantity(@RequestParam("id") Long id) { - return success(productRecptService.checkProductRecptQuantity(id)); + @PreAuthorize("@ss.hasPermission('mes:wm-product-receipt:query')") + public CommonResult checkProductReceiptQuantity(@RequestParam("id") Long id) { + return success(productReceiptService.checkProductReceiptQuantity(id)); } // ==================== 拼接 VO ==================== - private List buildRespVOList(List list) { + private List buildRespVOList(List list) { if (CollUtil.isEmpty(list)) { return Collections.emptyList(); } // 1. 获得关联数据 Map workOrderMap = workOrderService.getWorkOrderMap( - convertSet(list, MesWmProductRecptDO::getWorkOrderId)); + convertSet(list, MesWmProductReceiptDO::getWorkOrderId)); Map itemMap = itemService.getItemMap( - convertSet(list, MesWmProductRecptDO::getItemId)); + convertSet(list, MesWmProductReceiptDO::getItemId)); Map unitMeasureMap = unitMeasureService.getUnitMeasureMap( convertSet(itemMap.values(), MesMdItemDO::getUnitMeasureId)); // 2. 构建结果 - return BeanUtils.toBean(list, MesWmProductRecptRespVO.class, vo -> { + return BeanUtils.toBean(list, MesWmProductReceiptRespVO.class, vo -> { MapUtils.findAndThen(workOrderMap, vo.getWorkOrderId(), workOrder -> vo.setWorkOrderCode(workOrder.getCode())); MapUtils.findAndThen(itemMap, vo.getItemId(), item -> { diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productrecpt/MesWmProductRecptDetailController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productreceipt/MesWmProductReceiptDetailController.java index 82fc027..9b5b9b0 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productrecpt/MesWmProductRecptDetailController.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productreceipt/MesWmProductReceiptDetailController.java @@ -1,20 +1,20 @@ -package cn.iocoder.yudao.module.mes.controller.admin.wm.productrecpt; +package cn.iocoder.yudao.module.mes.controller.admin.wm.productreceipt; import cn.hutool.core.collection.CollUtil; import cn.iocoder.yudao.framework.common.pojo.CommonResult; 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.productrecpt.vo.detail.MesWmProductRecptDetailRespVO; -import cn.iocoder.yudao.module.mes.controller.admin.wm.productrecpt.vo.detail.MesWmProductRecptDetailSaveReqVO; +import cn.iocoder.yudao.module.mes.controller.admin.wm.productreceipt.vo.detail.MesWmProductReceiptDetailRespVO; +import cn.iocoder.yudao.module.mes.controller.admin.wm.productreceipt.vo.detail.MesWmProductReceiptDetailSaveReqVO; 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.productrecpt.MesWmProductRecptDetailDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productreceipt.MesWmProductReceiptDetailDO; 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.productrecpt.MesWmProductRecptDetailService; +import cn.iocoder.yudao.module.mes.service.wm.productreceipt.MesWmProductReceiptDetailService; 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; @@ -36,12 +36,12 @@ import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils. @Tag(name = "管理后台 - MES 产品收货单明细") @RestController -@RequestMapping("/mes/wm/product-recpt-detail") +@RequestMapping("/mes/wm/product-receipt-detail") @Validated -public class MesWmProductRecptDetailController { +public class MesWmProductReceiptDetailController { @Resource - private MesWmProductRecptDetailService productRecptDetailService; + private MesWmProductReceiptDetailService productReceiptDetailService; @Resource private MesMdItemService itemService; @@ -60,34 +60,34 @@ public class MesWmProductRecptDetailController { @PostMapping("/create") @Operation(summary = "创建产品收货单明细") - @PreAuthorize("@ss.hasPermission('mes:wm-product-recpt:create')") - public CommonResult createProductRecptDetail(@Valid @RequestBody MesWmProductRecptDetailSaveReqVO createReqVO) { - return success(productRecptDetailService.createProductRecptDetail(createReqVO)); + @PreAuthorize("@ss.hasPermission('mes:wm-product-receipt:create')") + public CommonResult createProductReceiptDetail(@Valid @RequestBody MesWmProductReceiptDetailSaveReqVO createReqVO) { + return success(productReceiptDetailService.createProductReceiptDetail(createReqVO)); } @PutMapping("/update") @Operation(summary = "修改产品收货单明细") - @PreAuthorize("@ss.hasPermission('mes:wm-product-recpt:update')") - public CommonResult updateProductRecptDetail(@Valid @RequestBody MesWmProductRecptDetailSaveReqVO updateReqVO) { - productRecptDetailService.updateProductRecptDetail(updateReqVO); + @PreAuthorize("@ss.hasPermission('mes:wm-product-receipt:update')") + public CommonResult updateProductReceiptDetail(@Valid @RequestBody MesWmProductReceiptDetailSaveReqVO updateReqVO) { + productReceiptDetailService.updateProductReceiptDetail(updateReqVO); return success(true); } @DeleteMapping("/delete") @Operation(summary = "删除产品收货单明细") @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('mes:wm-product-recpt:delete')") - public CommonResult deleteProductRecptDetail(@RequestParam("id") Long id) { - productRecptDetailService.deleteProductRecptDetail(id); + @PreAuthorize("@ss.hasPermission('mes:wm-product-receipt:delete')") + public CommonResult deleteProductReceiptDetail(@RequestParam("id") Long id) { + productReceiptDetailService.deleteProductReceiptDetail(id); return success(true); } @GetMapping("/get") @Operation(summary = "获得产品收货单明细") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('mes:wm-product-recpt:query')") - public CommonResult getProductRecptDetail(@RequestParam("id") Long id) { - MesWmProductRecptDetailDO detail = productRecptDetailService.getProductRecptDetail(id); + @PreAuthorize("@ss.hasPermission('mes:wm-product-receipt:query')") + public CommonResult getProductReceiptDetail(@RequestParam("id") Long id) { + MesWmProductReceiptDetailDO detail = productReceiptDetailService.getProductReceiptDetail(id); if (detail == null) { return success(null); } @@ -97,32 +97,32 @@ public class MesWmProductRecptDetailController { @GetMapping("/list-by-line") @Operation(summary = "获得产品收货单明细列表（按行编号）") @Parameter(name = "lineId", description = "行编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('mes:wm-product-recpt:query')") - public CommonResult> getProductRecptDetailListByLineId( + @PreAuthorize("@ss.hasPermission('mes:wm-product-receipt:query')") + public CommonResult> getProductReceiptDetailListByLineId( @RequestParam("lineId") Long lineId) { - List list = productRecptDetailService.getProductRecptDetailListByLineId(lineId); + List list = productReceiptDetailService.getProductReceiptDetailListByLineId(lineId); return success(buildRespVOList(list)); } // ==================== 拼接 VO ==================== - private List buildRespVOList(List list) { + private List buildRespVOList(List list) { if (CollUtil.isEmpty(list)) { return Collections.emptyList(); } // 1. 获得关联数据 Map itemMap = itemService.getItemMap( - convertSet(list, MesWmProductRecptDetailDO::getItemId)); + convertSet(list, MesWmProductReceiptDetailDO::getItemId)); Map unitMeasureMap = unitMeasureService.getUnitMeasureMap( convertSet(itemMap.values(), MesMdItemDO::getUnitMeasureId)); Map warehouseMap = warehouseService.getWarehouseMap( - convertSet(list, MesWmProductRecptDetailDO::getWarehouseId)); + convertSet(list, MesWmProductReceiptDetailDO::getWarehouseId)); Map locationMap = locationService.getWarehouseLocationMap( - convertSet(list, MesWmProductRecptDetailDO::getLocationId)); + convertSet(list, MesWmProductReceiptDetailDO::getLocationId)); Map areaMap = areaService.getWarehouseAreaMap( - convertSet(list, MesWmProductRecptDetailDO::getAreaId)); + convertSet(list, MesWmProductReceiptDetailDO::getAreaId)); // 2. 构建结果 - return BeanUtils.toBean(list, MesWmProductRecptDetailRespVO.class, vo -> { + return BeanUtils.toBean(list, MesWmProductReceiptDetailRespVO.class, vo -> { MapUtils.findAndThen(itemMap, vo.getItemId(), item -> { vo.setItemCode(item.getCode()).setItemName(item.getName()).setSpecification(item.getSpecification()); MapUtils.findAndThen(unitMeasureMap, item.getUnitMeasureId(), diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productrecpt/MesWmProductRecptLineController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productreceipt/MesWmProductReceiptLineController.java index 4348dd8..a4b969d 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productrecpt/MesWmProductRecptLineController.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productreceipt/MesWmProductReceiptLineController.java @@ -1,19 +1,19 @@ -package cn.iocoder.yudao.module.mes.controller.admin.wm.productrecpt; +package cn.iocoder.yudao.module.mes.controller.admin.wm.productreceipt; 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.productrecpt.vo.line.MesWmProductRecptLinePageReqVO; -import cn.iocoder.yudao.module.mes.controller.admin.wm.productrecpt.vo.line.MesWmProductRecptLineRespVO; -import cn.iocoder.yudao.module.mes.controller.admin.wm.productrecpt.vo.line.MesWmProductRecptLineSaveReqVO; +import cn.iocoder.yudao.module.mes.controller.admin.wm.productreceipt.vo.line.MesWmProductReceiptLinePageReqVO; +import cn.iocoder.yudao.module.mes.controller.admin.wm.productreceipt.vo.line.MesWmProductReceiptLineRespVO; +import cn.iocoder.yudao.module.mes.controller.admin.wm.productreceipt.vo.line.MesWmProductReceiptLineSaveReqVO; 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.productrecpt.MesWmProductRecptLineDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productreceipt.MesWmProductReceiptLineDO; 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.productrecpt.MesWmProductRecptLineService; +import cn.iocoder.yudao.module.mes.service.wm.productreceipt.MesWmProductReceiptLineService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; @@ -32,12 +32,12 @@ import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils. @Tag(name = "管理后台 - MES 产品收货单行") @RestController -@RequestMapping("/mes/wm/product-recpt-line") +@RequestMapping("/mes/wm/product-receipt-line") @Validated -public class MesWmProductRecptLineController { +public class MesWmProductReceiptLineController { @Resource - private MesWmProductRecptLineService productRecptLineService; + private MesWmProductReceiptLineService productReceiptLineService; @Resource private MesMdItemService itemService; @@ -47,34 +47,34 @@ public class MesWmProductRecptLineController { @PostMapping("/create") @Operation(summary = "创建产品收货单行") - @PreAuthorize("@ss.hasPermission('mes:wm-product-recpt:create')") - public CommonResult createProductRecptLine(@Valid @RequestBody MesWmProductRecptLineSaveReqVO createReqVO) { - return success(productRecptLineService.createProductRecptLine(createReqVO)); + @PreAuthorize("@ss.hasPermission('mes:wm-product-receipt:create')") + public CommonResult createProductReceiptLine(@Valid @RequestBody MesWmProductReceiptLineSaveReqVO createReqVO) { + return success(productReceiptLineService.createProductReceiptLine(createReqVO)); } @PutMapping("/update") @Operation(summary = "修改产品收货单行") - @PreAuthorize("@ss.hasPermission('mes:wm-product-recpt:update')") - public CommonResult updateProductRecptLine(@Valid @RequestBody MesWmProductRecptLineSaveReqVO updateReqVO) { - productRecptLineService.updateProductRecptLine(updateReqVO); + @PreAuthorize("@ss.hasPermission('mes:wm-product-receipt:update')") + public CommonResult updateProductReceiptLine(@Valid @RequestBody MesWmProductReceiptLineSaveReqVO updateReqVO) { + productReceiptLineService.updateProductReceiptLine(updateReqVO); return success(true); } @DeleteMapping("/delete") @Operation(summary = "删除产品收货单行") @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('mes:wm-product-recpt:delete')") - public CommonResult deleteProductRecptLine(@RequestParam("id") Long id) { - productRecptLineService.deleteProductRecptLine(id); + @PreAuthorize("@ss.hasPermission('mes:wm-product-receipt:delete')") + public CommonResult deleteProductReceiptLine(@RequestParam("id") Long id) { + productReceiptLineService.deleteProductReceiptLine(id); return success(true); } @GetMapping("/get") @Operation(summary = "获得产品收货单行") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('mes:wm-product-recpt:query')") - public CommonResult getProductRecptLine(@RequestParam("id") Long id) { - MesWmProductRecptLineDO line = productRecptLineService.getProductRecptLine(id); + @PreAuthorize("@ss.hasPermission('mes:wm-product-receipt:query')") + public CommonResult getProductReceiptLine(@RequestParam("id") Long id) { + MesWmProductReceiptLineDO line = productReceiptLineService.getProductReceiptLine(id); if (line == null) { return success(null); } @@ -83,26 +83,26 @@ public class MesWmProductRecptLineController { @GetMapping("/page") @Operation(summary = "获得产品收货单行分页") - @PreAuthorize("@ss.hasPermission('mes:wm-product-recpt:query')") - public CommonResult> getProductRecptLinePage( - @Valid MesWmProductRecptLinePageReqVO pageReqVO) { - PageResult pageResult = productRecptLineService.getProductRecptLinePage(pageReqVO); + @PreAuthorize("@ss.hasPermission('mes:wm-product-receipt:query')") + public CommonResult> getProductReceiptLinePage( + @Valid MesWmProductReceiptLinePageReqVO pageReqVO) { + PageResult pageResult = productReceiptLineService.getProductReceiptLinePage(pageReqVO); return success(new PageResult<>(buildRespVOList(pageResult.getList()), pageResult.getTotal())); } // ==================== 拼接 VO ==================== - private List buildRespVOList(List list) { + private List buildRespVOList(List list) { if (CollUtil.isEmpty(list)) { return Collections.emptyList(); } // 1. 获得关联数据 Map itemMap = itemService.getItemMap( - convertSet(list, MesWmProductRecptLineDO::getItemId)); + convertSet(list, MesWmProductReceiptLineDO::getItemId)); Map unitMeasureMap = unitMeasureService.getUnitMeasureMap( convertSet(itemMap.values(), MesMdItemDO::getUnitMeasureId)); // 2. 构建结果 - return BeanUtils.toBean(list, MesWmProductRecptLineRespVO.class, vo -> { + return BeanUtils.toBean(list, MesWmProductReceiptLineRespVO.class, vo -> { MapUtils.findAndThen(itemMap, vo.getItemId(), item -> { vo.setItemCode(item.getCode()).setItemName(item.getName()).setSpecification(item.getSpecification()); MapUtils.findAndThen(unitMeasureMap, item.getUnitMeasureId(), diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productrecpt/vo/MesWmProductRecptPageReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productreceipt/vo/MesWmProductReceiptPageReqVO.java index 3a973a2..27cdeef 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productrecpt/vo/MesWmProductRecptPageReqVO.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productreceipt/vo/MesWmProductReceiptPageReqVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.mes.controller.admin.wm.productrecpt.vo; +package cn.iocoder.yudao.module.mes.controller.admin.wm.productreceipt.vo; import cn.iocoder.yudao.framework.common.pojo.PageParam; import io.swagger.v3.oas.annotations.media.Schema; @@ -10,7 +10,7 @@ import lombok.ToString; @Data @EqualsAndHashCode(callSuper = true) @ToString(callSuper = true) -public class MesWmProductRecptPageReqVO extends PageParam { +public class MesWmProductReceiptPageReqVO extends PageParam { @Schema(description = "收货单编码", example = "PR202603010001") private String code; diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productrecpt/vo/MesWmProductRecptRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productreceipt/vo/MesWmProductReceiptRespVO.java index bf31195..617bde9 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productrecpt/vo/MesWmProductRecptRespVO.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productreceipt/vo/MesWmProductReceiptRespVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.mes.controller.admin.wm.productrecpt.vo; +package cn.iocoder.yudao.module.mes.controller.admin.wm.productreceipt.vo; import cn.idev.excel.annotation.ExcelIgnoreUnannotated; import cn.idev.excel.annotation.ExcelProperty; @@ -10,7 +10,7 @@ import java.time.LocalDateTime; @Schema(description = "管理后台 - MES 产品收货单 Response VO") @Data @ExcelIgnoreUnannotated -public class MesWmProductRecptRespVO { +public class MesWmProductReceiptRespVO { @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") @ExcelProperty("编号") diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productrecpt/vo/MesWmProductRecptSaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productreceipt/vo/MesWmProductReceiptSaveReqVO.java index 904b98e..19d8e34 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productrecpt/vo/MesWmProductRecptSaveReqVO.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productreceipt/vo/MesWmProductReceiptSaveReqVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.mes.controller.admin.wm.productrecpt.vo; +package cn.iocoder.yudao.module.mes.controller.admin.wm.productreceipt.vo; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotEmpty; @@ -9,7 +9,7 @@ import java.time.LocalDateTime; @Schema(description = "管理后台 - MES 产品收货单新增/修改 Request VO") @Data -public class MesWmProductRecptSaveReqVO { +public class MesWmProductReceiptSaveReqVO { @Schema(description = "编号", example = "1024") private Long id; diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productrecpt/vo/detail/MesWmProductRecptDetailRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productreceipt/vo/detail/MesWmProductReceiptDetailRespVO.java index 64b0d5c..1bbff03 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productrecpt/vo/detail/MesWmProductRecptDetailRespVO.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productreceipt/vo/detail/MesWmProductReceiptDetailRespVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.mes.controller.admin.wm.productrecpt.vo.detail; +package cn.iocoder.yudao.module.mes.controller.admin.wm.productreceipt.vo.detail; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -8,7 +8,7 @@ import java.time.LocalDateTime; @Schema(description = "管理后台 - MES 产品收货单明细 Response VO") @Data -public class MesWmProductRecptDetailRespVO { +public class MesWmProductReceiptDetailRespVO { @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") private Long id; @@ -17,7 +17,7 @@ public class MesWmProductRecptDetailRespVO { private Long lineId; @Schema(description = "收货单编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") - private Long recptId; + private Long receiptId; @Schema(description = "物料编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") private Long itemId; diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productrecpt/vo/detail/MesWmProductRecptDetailSaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productreceipt/vo/detail/MesWmProductReceiptDetailSaveReqVO.java index 33be93f..dedda4b 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productrecpt/vo/detail/MesWmProductRecptDetailSaveReqVO.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productreceipt/vo/detail/MesWmProductReceiptDetailSaveReqVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.mes.controller.admin.wm.productrecpt.vo.detail; +package cn.iocoder.yudao.module.mes.controller.admin.wm.productreceipt.vo.detail; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotNull; @@ -8,7 +8,7 @@ import java.math.BigDecimal; @Schema(description = "管理后台 - MES 产品收货单明细新增/修改 Request VO") @Data -public class MesWmProductRecptDetailSaveReqVO { +public class MesWmProductReceiptDetailSaveReqVO { @Schema(description = "编号", example = "1024") private Long id; @@ -19,7 +19,7 @@ public class MesWmProductRecptDetailSaveReqVO { @Schema(description = "收货单编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") @NotNull(message = "收货单编号不能为空") - private Long recptId; + private Long receiptId; @Schema(description = "物料编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") @NotNull(message = "物料编号不能为空") diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productrecpt/vo/line/MesWmProductRecptLinePageReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productreceipt/vo/line/MesWmProductReceiptLinePageReqVO.java index c5311e6..c539376 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productrecpt/vo/line/MesWmProductRecptLinePageReqVO.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productreceipt/vo/line/MesWmProductReceiptLinePageReqVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.mes.controller.admin.wm.productrecpt.vo.line; +package cn.iocoder.yudao.module.mes.controller.admin.wm.productreceipt.vo.line; import cn.iocoder.yudao.framework.common.pojo.PageParam; import io.swagger.v3.oas.annotations.media.Schema; @@ -10,9 +10,9 @@ import lombok.ToString; @Data @EqualsAndHashCode(callSuper = true) @ToString(callSuper = true) -public class MesWmProductRecptLinePageReqVO extends PageParam { +public class MesWmProductReceiptLinePageReqVO extends PageParam { @Schema(description = "收货单编号", example = "1") - private Long recptId; + private Long receiptId; } diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productrecpt/vo/line/MesWmProductRecptLineRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productreceipt/vo/line/MesWmProductReceiptLineRespVO.java index 1f06a4e..58ece5e 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productrecpt/vo/line/MesWmProductRecptLineRespVO.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productreceipt/vo/line/MesWmProductReceiptLineRespVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.mes.controller.admin.wm.productrecpt.vo.line; +package cn.iocoder.yudao.module.mes.controller.admin.wm.productreceipt.vo.line; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -8,13 +8,13 @@ import java.time.LocalDateTime; @Schema(description = "管理后台 - MES 产品收货单行 Response VO") @Data -public class MesWmProductRecptLineRespVO { +public class MesWmProductReceiptLineRespVO { @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") private Long id; @Schema(description = "收货单编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") - private Long recptId; + private Long receiptId; @Schema(description = "物料编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") private Long itemId; diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productrecpt/vo/line/MesWmProductRecptLineSaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productreceipt/vo/line/MesWmProductReceiptLineSaveReqVO.java index 2605814..5a97412 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productrecpt/vo/line/MesWmProductRecptLineSaveReqVO.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productreceipt/vo/line/MesWmProductReceiptLineSaveReqVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.mes.controller.admin.wm.productrecpt.vo.line; +package cn.iocoder.yudao.module.mes.controller.admin.wm.productreceipt.vo.line; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotNull; @@ -9,14 +9,14 @@ import java.math.BigDecimal; @Schema(description = "管理后台 - MES 产品收货单行新增/修改 Request VO") @Data -public class MesWmProductRecptLineSaveReqVO { +public class MesWmProductReceiptLineSaveReqVO { @Schema(description = "编号", example = "1024") private Long id; @Schema(description = "收货单编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") @NotNull(message = "收货单编号不能为空") - private Long recptId; + private Long receiptId; @Schema(description = "物料编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") @NotNull(message = "物料编号不能为空") diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/productrecpt/MesWmProductRecptDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/productreceipt/MesWmProductReceiptDO.java index 95a3eb4..df83299 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/productrecpt/MesWmProductRecptDO.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/productreceipt/MesWmProductReceiptDO.java @@ -1,9 +1,9 @@ -package cn.iocoder.yudao.module.mes.dal.dataobject.wm.productrecpt; +package cn.iocoder.yudao.module.mes.dal.dataobject.wm.productreceipt; 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.pro.workorder.MesProWorkOrderDO; -import cn.iocoder.yudao.module.mes.enums.wm.MesWmProductRecptStatusEnum; +import cn.iocoder.yudao.module.mes.enums.wm.MesWmProductReceiptStatusEnum; import com.baomidou.mybatisplus.annotation.KeySequence; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -14,15 +14,15 @@ import java.time.LocalDateTime; /** * MES 产品收货（入库）单 DO */ -@TableName("mes_wm_product_recpt") -@KeySequence("mes_wm_product_recpt_seq") +@TableName("mes_wm_product_receipt") +@KeySequence("mes_wm_product_receipt_seq") @Data @EqualsAndHashCode(callSuper = true) @ToString(callSuper = true) @Builder @NoArgsConstructor @AllArgsConstructor -public class MesWmProductRecptDO extends BaseDO { +public class MesWmProductReceiptDO extends BaseDO { /** * 编号 @@ -56,7 +56,7 @@ public class MesWmProductRecptDO extends BaseDO { /** * 状态 * - * 枚举 {@link MesWmProductRecptStatusEnum} + * 枚举 {@link MesWmProductReceiptStatusEnum} */ private Integer status; /** diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/productrecpt/MesWmProductRecptDetailDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/productreceipt/MesWmProductReceiptDetailDO.java index b8272ff..91c1c87 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/productrecpt/MesWmProductRecptDetailDO.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/productreceipt/MesWmProductReceiptDetailDO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.mes.dal.dataobject.wm.productrecpt; +package cn.iocoder.yudao.module.mes.dal.dataobject.wm.productreceipt; import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; import cn.iocoder.yudao.module.mes.dal.dataobject.md.item.MesMdItemDO; @@ -15,15 +15,15 @@ import java.math.BigDecimal; /** * MES 产品收货（入库）单明细 DO */ -@TableName("mes_wm_product_recpt_detail") -@KeySequence("mes_wm_product_recpt_detail_seq") +@TableName("mes_wm_product_receipt_detail") +@KeySequence("mes_wm_product_receipt_detail_seq") @Data @EqualsAndHashCode(callSuper = true) @ToString(callSuper = true) @Builder @NoArgsConstructor @AllArgsConstructor -public class MesWmProductRecptDetailDO extends BaseDO { +public class MesWmProductReceiptDetailDO extends BaseDO { /** * 编号 @@ -33,15 +33,15 @@ public class MesWmProductRecptDetailDO extends BaseDO { /** * 收货单行编号 * - * 关联 {@link MesWmProductRecptLineDO#getId()} + * 关联 {@link MesWmProductReceiptLineDO#getId()} */ private Long lineId; /** * 收货单编号 * - * 关联 {@link MesWmProductRecptDO#getId()} + * 关联 {@link MesWmProductReceiptDO#getId()} */ - private Long recptId; + private Long receiptId; /** * 物料编号 * diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/productrecpt/MesWmProductRecptLineDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/productreceipt/MesWmProductReceiptLineDO.java index e3eaaf1..65faa51 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/productrecpt/MesWmProductRecptLineDO.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/productreceipt/MesWmProductReceiptLineDO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.mes.dal.dataobject.wm.productrecpt; +package cn.iocoder.yudao.module.mes.dal.dataobject.wm.productreceipt; import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; import cn.iocoder.yudao.module.mes.dal.dataobject.md.item.MesMdItemDO; @@ -12,15 +12,15 @@ import java.math.BigDecimal; /** * MES 产品收货（入库）单行 DO */ -@TableName("mes_wm_product_recpt_line") -@KeySequence("mes_wm_product_recpt_line_seq") +@TableName("mes_wm_product_receipt_line") +@KeySequence("mes_wm_product_receipt_line_seq") @Data @EqualsAndHashCode(callSuper = true) @ToString(callSuper = true) @Builder @NoArgsConstructor @AllArgsConstructor -public class MesWmProductRecptLineDO extends BaseDO { +public class MesWmProductReceiptLineDO extends BaseDO { /** * 编号 @@ -30,9 +30,9 @@ public class MesWmProductRecptLineDO extends BaseDO { /** * 收货单编号 * - * 关联 {@link MesWmProductRecptDO#getId()} + * 关联 {@link MesWmProductReceiptDO#getId()} */ - private Long recptId; + private Long receiptId; /** * 物料编号 * diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/productrecpt/MesWmProductRecptDetailMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/productreceipt/MesWmProductReceiptDetailMapper.java index c4084bb..76f85ab 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/productrecpt/MesWmProductRecptDetailMapper.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/productreceipt/MesWmProductReceiptDetailMapper.java @@ -1,7 +1,7 @@ -package cn.iocoder.yudao.module.mes.dal.mysql.wm.productrecpt; +package cn.iocoder.yudao.module.mes.dal.mysql.wm.productreceipt; import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; -import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productrecpt.MesWmProductRecptDetailDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productreceipt.MesWmProductReceiptDetailDO; import org.apache.ibatis.annotations.Mapper; import java.util.List; @@ -10,22 +10,22 @@ import java.util.List; * MES 产品收货单明细 Mapper */ @Mapper -public interface MesWmProductRecptDetailMapper extends BaseMapperX { +public interface MesWmProductReceiptDetailMapper extends BaseMapperX { - default List selectListByRecptId(Long recptId) { - return selectList(MesWmProductRecptDetailDO::getRecptId, recptId); + default List selectListByRecptId(Long receiptId) { + return selectList(MesWmProductReceiptDetailDO::getReceiptId, receiptId); } - default List selectListByLineId(Long lineId) { - return selectList(MesWmProductRecptDetailDO::getLineId, lineId); + default List selectListByLineId(Long lineId) { + return selectList(MesWmProductReceiptDetailDO::getLineId, lineId); } - default void deleteByRecptId(Long recptId) { - delete(MesWmProductRecptDetailDO::getRecptId, recptId); + default void deleteByRecptId(Long receiptId) { + delete(MesWmProductReceiptDetailDO::getReceiptId, receiptId); } default void deleteByLineId(Long lineId) { - delete(MesWmProductRecptDetailDO::getLineId, lineId); + delete(MesWmProductReceiptDetailDO::getLineId, lineId); } } diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/productreceipt/MesWmProductReceiptLineMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/productreceipt/MesWmProductReceiptLineMapper.java new file mode 100644 index 0000000..11ba3c2 --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/productreceipt/MesWmProductReceiptLineMapper.java @@ -0,0 +1,32 @@ +package cn.iocoder.yudao.module.mes.dal.mysql.wm.productreceipt; + +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.productreceipt.vo.line.MesWmProductReceiptLinePageReqVO; +import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productreceipt.MesWmProductReceiptLineDO; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +/** + * MES 产品收货单行 Mapper + */ +@Mapper +public interface MesWmProductReceiptLineMapper extends BaseMapperX { + + default PageResult selectPage(MesWmProductReceiptLinePageReqVO reqVO) { + return selectPage(reqVO, new LambdaQueryWrapperX() + .eqIfPresent(MesWmProductReceiptLineDO::getReceiptId, reqVO.getReceiptId()) + .orderByDesc(MesWmProductReceiptLineDO::getId)); + } + + default List selectListByRecptId(Long receiptId) { + return selectList(MesWmProductReceiptLineDO::getReceiptId, receiptId); + } + + default void deleteByRecptId(Long receiptId) { + delete(MesWmProductReceiptLineDO::getReceiptId, receiptId); + } + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/productreceipt/MesWmProductReceiptMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/productreceipt/MesWmProductReceiptMapper.java new file mode 100644 index 0000000..00f5f02 --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/productreceipt/MesWmProductReceiptMapper.java @@ -0,0 +1,29 @@ +package cn.iocoder.yudao.module.mes.dal.mysql.wm.productreceipt; + +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.productreceipt.vo.MesWmProductReceiptPageReqVO; +import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productreceipt.MesWmProductReceiptDO; +import org.apache.ibatis.annotations.Mapper; + +/** + * MES 产品收货单 Mapper + */ +@Mapper +public interface MesWmProductReceiptMapper extends BaseMapperX { + + default PageResult selectPage(MesWmProductReceiptPageReqVO reqVO) { + return selectPage(reqVO, new LambdaQueryWrapperX() + .likeIfPresent(MesWmProductReceiptDO::getCode, reqVO.getCode()) + .likeIfPresent(MesWmProductReceiptDO::getName, reqVO.getName()) + .eqIfPresent(MesWmProductReceiptDO::getWorkOrderId, reqVO.getWorkOrderId()) + .eqIfPresent(MesWmProductReceiptDO::getItemId, reqVO.getItemId()) + .orderByDesc(MesWmProductReceiptDO::getId)); + } + + default MesWmProductReceiptDO selectByCode(String code) { + return selectOne(MesWmProductReceiptDO::getCode, code); + } + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/productrecpt/MesWmProductRecptLineMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/productrecpt/MesWmProductRecptLineMapper.java deleted file mode 100644 index dad722a..0000000 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/productrecpt/MesWmProductRecptLineMapper.java +++ /dev/null @@ -1,32 +0,0 @@ -package cn.iocoder.yudao.module.mes.dal.mysql.wm.productrecpt; - -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.productrecpt.vo.line.MesWmProductRecptLinePageReqVO; -import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productrecpt.MesWmProductRecptLineDO; -import org.apache.ibatis.annotations.Mapper; - -import java.util.List; - -/** - * MES 产品收货单行 Mapper - */ -@Mapper -public interface MesWmProductRecptLineMapper extends BaseMapperX { - - default PageResult selectPage(MesWmProductRecptLinePageReqVO reqVO) { - return selectPage(reqVO, new LambdaQueryWrapperX() - .eqIfPresent(MesWmProductRecptLineDO::getRecptId, reqVO.getRecptId()) - .orderByDesc(MesWmProductRecptLineDO::getId)); - } - - default List selectListByRecptId(Long recptId) { - return selectList(MesWmProductRecptLineDO::getRecptId, recptId); - } - - default void deleteByRecptId(Long recptId) { - delete(MesWmProductRecptLineDO::getRecptId, recptId); - } - -} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/productrecpt/MesWmProductRecptMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/productrecpt/MesWmProductRecptMapper.java deleted file mode 100644 index 3e2ae75..0000000 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/productrecpt/MesWmProductRecptMapper.java +++ /dev/null @@ -1,29 +0,0 @@ -package cn.iocoder.yudao.module.mes.dal.mysql.wm.productrecpt; - -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.productrecpt.vo.MesWmProductRecptPageReqVO; -import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productrecpt.MesWmProductRecptDO; -import org.apache.ibatis.annotations.Mapper; - -/** - * MES 产品收货单 Mapper - */ -@Mapper -public interface MesWmProductRecptMapper extends BaseMapperX { - - default PageResult selectPage(MesWmProductRecptPageReqVO reqVO) { - return selectPage(reqVO, new LambdaQueryWrapperX() - .likeIfPresent(MesWmProductRecptDO::getCode, reqVO.getCode()) - .likeIfPresent(MesWmProductRecptDO::getName, reqVO.getName()) - .eqIfPresent(MesWmProductRecptDO::getWorkOrderId, reqVO.getWorkOrderId()) - .eqIfPresent(MesWmProductRecptDO::getItemId, reqVO.getItemId()) - .orderByDesc(MesWmProductRecptDO::getId)); - } - - default MesWmProductRecptDO selectByCode(String code) { - return selectOne(MesWmProductRecptDO::getCode, code); - } - -} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/wm/MesWmProductRecptStatusEnum.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/wm/MesWmProductReceiptStatusEnum.java index b47aa07..a4e1d56 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/wm/MesWmProductRecptStatusEnum.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/wm/MesWmProductReceiptStatusEnum.java @@ -1,9 +1,9 @@ package cn.iocoder.yudao.module.mes.enums.wm; import cn.iocoder.yudao.framework.common.core.ArrayValuable; -import cn.iocoder.yudao.module.mes.controller.admin.wm.productrecpt.vo.MesWmProductRecptSaveReqVO; +import cn.iocoder.yudao.module.mes.controller.admin.wm.productreceipt.vo.MesWmProductReceiptSaveReqVO; import cn.iocoder.yudao.module.mes.enums.MesOrderStatusConstants; -import cn.iocoder.yudao.module.mes.service.wm.productrecpt.MesWmProductRecptService; +import cn.iocoder.yudao.module.mes.service.wm.productreceipt.MesWmProductReceiptService; import lombok.AllArgsConstructor; import lombok.Getter; @@ -16,40 +16,40 @@ import java.util.Arrays; */ @Getter @AllArgsConstructor -public enum MesWmProductRecptStatusEnum implements ArrayValuable { +public enum MesWmProductReceiptStatusEnum implements ArrayValuable { /** * 草稿 * - * 对应方法：{@link MesWmProductRecptService#createProductRecpt(MesWmProductRecptSaveReqVO)} + * 对应方法：{@link MesWmProductReceiptService#createProductReceipt(MesWmProductReceiptSaveReqVO)} */ PREPARE(MesOrderStatusConstants.PREPARE, "草稿"), /** * 待上架 * - * 对应方法：{@link MesWmProductRecptService#submitProductRecpt(Long)} + * 对应方法：{@link MesWmProductReceiptService#submitProductReceipt(Long)} */ APPROVING(MesOrderStatusConstants.APPROVING, "待上架"), /** * 待执行入库 * - * 对应方法：{@link MesWmProductRecptService#stockProductRecpt(Long)} + * 对应方法：{@link MesWmProductReceiptService#stockProductReceipt(Long)} */ APPROVED(MesOrderStatusConstants.APPROVED, "待执行入库"), /** * 已完成 * - * 对应方法：{@link MesWmProductRecptService#executeProductRecpt(Long)} + * 对应方法：{@link MesWmProductReceiptService#executeProductReceipt(Long)} */ FINISHED(MesOrderStatusConstants.FINISHED, "已完成"), /** * 已取消 * - * 对应方法：{@link MesWmProductRecptService#cancelProductRecpt(Long)} + * 对应方法：{@link MesWmProductReceiptService#cancelProductReceipt(Long)} */ CANCELED(MesOrderStatusConstants.CANCELLED, "已取消"); - public static final Integer[] ARRAYS = Arrays.stream(values()).map(MesWmProductRecptStatusEnum::getStatus).toArray(Integer[]::new); + public static final Integer[] ARRAYS = Arrays.stream(values()).map(MesWmProductReceiptStatusEnum::getStatus).toArray(Integer[]::new); /** * 状态值 diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productrecpt/MesWmProductRecptDetailService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productreceipt/MesWmProductReceiptDetailService.java index 2c59240..a42dbae 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productrecpt/MesWmProductRecptDetailService.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productreceipt/MesWmProductReceiptDetailService.java @@ -1,7 +1,7 @@ -package cn.iocoder.yudao.module.mes.service.wm.productrecpt; +package cn.iocoder.yudao.module.mes.service.wm.productreceipt; -import cn.iocoder.yudao.module.mes.controller.admin.wm.productrecpt.vo.detail.MesWmProductRecptDetailSaveReqVO; -import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productrecpt.MesWmProductRecptDetailDO; +import cn.iocoder.yudao.module.mes.controller.admin.wm.productreceipt.vo.detail.MesWmProductReceiptDetailSaveReqVO; +import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productreceipt.MesWmProductReceiptDetailDO; import jakarta.validation.Valid; import java.util.List; @@ -9,7 +9,7 @@ import java.util.List; /** * MES 产品收货单明细 Service 接口 */ -public interface MesWmProductRecptDetailService { +public interface MesWmProductReceiptDetailService { /** * 创建产品收货单明细 @@ -17,21 +17,21 @@ public interface MesWmProductRecptDetailService { * @param createReqVO 创建信息 * @return 编号 */ - Long createProductRecptDetail(@Valid MesWmProductRecptDetailSaveReqVO createReqVO); + Long createProductReceiptDetail(@Valid MesWmProductReceiptDetailSaveReqVO createReqVO); /** * 修改产品收货单明细 * * @param updateReqVO 修改信息 */ - void updateProductRecptDetail(@Valid MesWmProductRecptDetailSaveReqVO updateReqVO); + void updateProductReceiptDetail(@Valid MesWmProductReceiptDetailSaveReqVO updateReqVO); /** * 删除产品收货单明细 * * @param id 编号 */ - void deleteProductRecptDetail(Long id); + void deleteProductReceiptDetail(Long id); /** * 获得产品收货单明细 @@ -39,15 +39,15 @@ public interface MesWmProductRecptDetailService { * @param id 编号 * @return 产品收货单明细 */ - MesWmProductRecptDetailDO getProductRecptDetail(Long id); + MesWmProductReceiptDetailDO getProductReceiptDetail(Long id); /** * 按收货单编号获得明细列表 * - * @param recptId 收货单编号 + * @param receiptId 收货单编号 * @return 明细列表 */ - List getProductRecptDetailListByRecptId(Long recptId); + List getProductReceiptDetailListByRecptId(Long receiptId); /** * 按收货单行编号获得明细列表 @@ -55,20 +55,20 @@ public interface MesWmProductRecptDetailService { * @param lineId 行编号 * @return 明细列表 */ - List getProductRecptDetailListByLineId(Long lineId); + List getProductReceiptDetailListByLineId(Long lineId); /** * 按收货单行编号批量删除明细 * * @param lineId 行编号 */ - void deleteProductRecptDetailByLineId(Long lineId); + void deleteProductReceiptDetailByLineId(Long lineId); /** * 按收货单编号批量删除明细 * - * @param recptId 收货单编号 + * @param receiptId 收货单编号 */ - void deleteProductRecptDetailByRecptId(Long recptId); + void deleteProductReceiptDetailByRecptId(Long receiptId); } diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productrecpt/MesWmProductRecptDetailServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productreceipt/MesWmProductReceiptDetailServiceImpl.java index 27bac05..26038c2 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productrecpt/MesWmProductRecptDetailServiceImpl.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productreceipt/MesWmProductReceiptDetailServiceImpl.java @@ -1,9 +1,9 @@ -package cn.iocoder.yudao.module.mes.service.wm.productrecpt; +package cn.iocoder.yudao.module.mes.service.wm.productreceipt; import cn.iocoder.yudao.framework.common.util.object.BeanUtils; -import cn.iocoder.yudao.module.mes.controller.admin.wm.productrecpt.vo.detail.MesWmProductRecptDetailSaveReqVO; -import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productrecpt.MesWmProductRecptDetailDO; -import cn.iocoder.yudao.module.mes.dal.mysql.wm.productrecpt.MesWmProductRecptDetailMapper; +import cn.iocoder.yudao.module.mes.controller.admin.wm.productreceipt.vo.detail.MesWmProductReceiptDetailSaveReqVO; +import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productreceipt.MesWmProductReceiptDetailDO; +import cn.iocoder.yudao.module.mes.dal.mysql.wm.productreceipt.MesWmProductReceiptDetailMapper; import cn.iocoder.yudao.module.mes.service.wm.warehouse.MesWmWarehouseAreaService; import jakarta.annotation.Resource; import org.springframework.context.annotation.Lazy; @@ -20,81 +20,81 @@ import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.*; */ @Service @Validated -public class MesWmProductRecptDetailServiceImpl implements MesWmProductRecptDetailService { +public class MesWmProductReceiptDetailServiceImpl implements MesWmProductReceiptDetailService { @Resource - private MesWmProductRecptDetailMapper productRecptDetailMapper; + private MesWmProductReceiptDetailMapper productReceiptDetailMapper; @Resource @Lazy - private MesWmProductRecptService productRecptService; + private MesWmProductReceiptService productReceiptService; @Resource private MesWmWarehouseAreaService warehouseAreaService; @Override - public Long createProductRecptDetail(MesWmProductRecptDetailSaveReqVO createReqVO) { + public Long createProductReceiptDetail(MesWmProductReceiptDetailSaveReqVO createReqVO) { // 校验父单据存在且为可编辑状态 - productRecptService.validateProductRecptEditable(createReqVO.getRecptId()); + productReceiptService.validateProductReceiptEditable(createReqVO.getReceiptId()); // 校验库区关系 warehouseAreaService.validateWarehouseAreaExists( createReqVO.getWarehouseId(), createReqVO.getLocationId(), createReqVO.getAreaId()); - MesWmProductRecptDetailDO detail = BeanUtils.toBean(createReqVO, MesWmProductRecptDetailDO.class); - productRecptDetailMapper.insert(detail); + MesWmProductReceiptDetailDO detail = BeanUtils.toBean(createReqVO, MesWmProductReceiptDetailDO.class); + productReceiptDetailMapper.insert(detail); return detail.getId(); } @Override - public void updateProductRecptDetail(MesWmProductRecptDetailSaveReqVO updateReqVO) { + public void updateProductReceiptDetail(MesWmProductReceiptDetailSaveReqVO updateReqVO) { // 校验存在 - MesWmProductRecptDetailDO detail = validateProductRecptDetailExists(updateReqVO.getId()); + MesWmProductReceiptDetailDO detail = validateProductReceiptDetailExists(updateReqVO.getId()); // 校验父单据存在且为可编辑状态 - productRecptService.validateProductRecptEditable(detail.getRecptId()); + productReceiptService.validateProductReceiptEditable(detail.getReceiptId()); // 校验库区关系 warehouseAreaService.validateWarehouseAreaExists( updateReqVO.getWarehouseId(), updateReqVO.getLocationId(), updateReqVO.getAreaId()); // 更新 - MesWmProductRecptDetailDO updateObj = BeanUtils.toBean(updateReqVO, MesWmProductRecptDetailDO.class); - productRecptDetailMapper.updateById(updateObj); + MesWmProductReceiptDetailDO updateObj = BeanUtils.toBean(updateReqVO, MesWmProductReceiptDetailDO.class); + productReceiptDetailMapper.updateById(updateObj); } @Override - public void deleteProductRecptDetail(Long id) { + public void deleteProductReceiptDetail(Long id) { // 校验存在 - validateProductRecptDetailExists(id); + validateProductReceiptDetailExists(id); // 删除 - productRecptDetailMapper.deleteById(id); + productReceiptDetailMapper.deleteById(id); } @Override - public MesWmProductRecptDetailDO getProductRecptDetail(Long id) { - return productRecptDetailMapper.selectById(id); + public MesWmProductReceiptDetailDO getProductReceiptDetail(Long id) { + return productReceiptDetailMapper.selectById(id); } @Override - public List getProductRecptDetailListByRecptId(Long recptId) { - return productRecptDetailMapper.selectListByRecptId(recptId); + public List getProductReceiptDetailListByRecptId(Long receiptId) { + return productReceiptDetailMapper.selectListByRecptId(receiptId); } @Override - public List getProductRecptDetailListByLineId(Long lineId) { - return productRecptDetailMapper.selectListByLineId(lineId); + public List getProductReceiptDetailListByLineId(Long lineId) { + return productReceiptDetailMapper.selectListByLineId(lineId); } @Override - public void deleteProductRecptDetailByLineId(Long lineId) { - productRecptDetailMapper.deleteByLineId(lineId); + public void deleteProductReceiptDetailByLineId(Long lineId) { + productReceiptDetailMapper.deleteByLineId(lineId); } @Override - public void deleteProductRecptDetailByRecptId(Long recptId) { - productRecptDetailMapper.deleteByRecptId(recptId); + public void deleteProductReceiptDetailByRecptId(Long receiptId) { + productReceiptDetailMapper.deleteByRecptId(receiptId); } - private MesWmProductRecptDetailDO validateProductRecptDetailExists(Long id) { - MesWmProductRecptDetailDO detail = productRecptDetailMapper.selectById(id); + private MesWmProductReceiptDetailDO validateProductReceiptDetailExists(Long id) { + MesWmProductReceiptDetailDO detail = productReceiptDetailMapper.selectById(id); if (detail == null) { throw exception(WM_PRODUCT_RECPT_DETAIL_NOT_EXISTS); } diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productrecpt/MesWmProductRecptLineService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productreceipt/MesWmProductReceiptLineService.java index 2590cd7..2cfeebf 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productrecpt/MesWmProductRecptLineService.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productreceipt/MesWmProductReceiptLineService.java @@ -1,9 +1,9 @@ -package cn.iocoder.yudao.module.mes.service.wm.productrecpt; +package cn.iocoder.yudao.module.mes.service.wm.productreceipt; import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.mes.controller.admin.wm.productrecpt.vo.line.MesWmProductRecptLinePageReqVO; -import cn.iocoder.yudao.module.mes.controller.admin.wm.productrecpt.vo.line.MesWmProductRecptLineSaveReqVO; -import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productrecpt.MesWmProductRecptLineDO; +import cn.iocoder.yudao.module.mes.controller.admin.wm.productreceipt.vo.line.MesWmProductReceiptLinePageReqVO; +import cn.iocoder.yudao.module.mes.controller.admin.wm.productreceipt.vo.line.MesWmProductReceiptLineSaveReqVO; +import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productreceipt.MesWmProductReceiptLineDO; import jakarta.validation.Valid; import java.util.List; @@ -11,7 +11,7 @@ import java.util.List; /** * MES 产品收货单行 Service 接口 */ -public interface MesWmProductRecptLineService { +public interface MesWmProductReceiptLineService { /** * 创建产品收货单行 @@ -19,21 +19,21 @@ public interface MesWmProductRecptLineService { * @param createReqVO 创建信息 * @return 编号 */ - Long createProductRecptLine(@Valid MesWmProductRecptLineSaveReqVO createReqVO); + Long createProductReceiptLine(@Valid MesWmProductReceiptLineSaveReqVO createReqVO); /** * 修改产品收货单行 * * @param updateReqVO 修改信息 */ - void updateProductRecptLine(@Valid MesWmProductRecptLineSaveReqVO updateReqVO); + void updateProductReceiptLine(@Valid MesWmProductReceiptLineSaveReqVO updateReqVO); /** * 删除产品收货单行（级联删除明细） * * @param id 编号 */ - void deleteProductRecptLine(Long id); + void deleteProductReceiptLine(Long id); /** * 获得产品收货单行 @@ -41,7 +41,7 @@ public interface MesWmProductRecptLineService { * @param id 编号 * @return 产品收货单行 */ - MesWmProductRecptLineDO getProductRecptLine(Long id); + MesWmProductReceiptLineDO getProductReceiptLine(Long id); /** * 获得产品收货单行分页 @@ -49,21 +49,21 @@ public interface MesWmProductRecptLineService { * @param pageReqVO 分页参数 * @return 产品收货单行分页 */ - PageResult getProductRecptLinePage(MesWmProductRecptLinePageReqVO pageReqVO); + PageResult getProductReceiptLinePage(MesWmProductReceiptLinePageReqVO pageReqVO); /** * 按收货单编号获得行列表 * - * @param recptId 收货单编号 + * @param receiptId 收货单编号 * @return 行列表 */ - List getProductRecptLineListByRecptId(Long recptId); + List getProductReceiptLineListByRecptId(Long receiptId); /** * 按收货单编号批量删除行 * - * @param recptId 收货单编号 + * @param receiptId 收货单编号 */ - void deleteProductRecptLineByRecptId(Long recptId); + void deleteProductReceiptLineByRecptId(Long receiptId); } diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productrecpt/MesWmProductRecptLineServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productreceipt/MesWmProductReceiptLineServiceImpl.java index 98ccb7e..02248fc 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productrecpt/MesWmProductRecptLineServiceImpl.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productreceipt/MesWmProductReceiptLineServiceImpl.java @@ -1,11 +1,11 @@ -package cn.iocoder.yudao.module.mes.service.wm.productrecpt; +package cn.iocoder.yudao.module.mes.service.wm.productreceipt; 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.productrecpt.vo.line.MesWmProductRecptLinePageReqVO; -import cn.iocoder.yudao.module.mes.controller.admin.wm.productrecpt.vo.line.MesWmProductRecptLineSaveReqVO; -import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productrecpt.MesWmProductRecptLineDO; -import cn.iocoder.yudao.module.mes.dal.mysql.wm.productrecpt.MesWmProductRecptLineMapper; +import cn.iocoder.yudao.module.mes.controller.admin.wm.productreceipt.vo.line.MesWmProductReceiptLinePageReqVO; +import cn.iocoder.yudao.module.mes.controller.admin.wm.productreceipt.vo.line.MesWmProductReceiptLineSaveReqVO; +import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productreceipt.MesWmProductReceiptLineDO; +import cn.iocoder.yudao.module.mes.dal.mysql.wm.productreceipt.MesWmProductReceiptLineMapper; import jakarta.annotation.Resource; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -22,75 +22,75 @@ import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.WM_PRODUCT_RE */ @Service @Validated -public class MesWmProductRecptLineServiceImpl implements MesWmProductRecptLineService { +public class MesWmProductReceiptLineServiceImpl implements MesWmProductReceiptLineService { @Resource - private MesWmProductRecptLineMapper productRecptLineMapper; + private MesWmProductReceiptLineMapper productReceiptLineMapper; @Resource @Lazy - private MesWmProductRecptService productRecptService; + private MesWmProductReceiptService productReceiptService; @Resource - private MesWmProductRecptDetailService productRecptDetailService; + private MesWmProductReceiptDetailService productReceiptDetailService; @Override - public Long createProductRecptLine(MesWmProductRecptLineSaveReqVO createReqVO) { + public Long createProductReceiptLine(MesWmProductReceiptLineSaveReqVO createReqVO) { // 校验父单据存在且为可编辑状态 - productRecptService.validateProductRecptEditable(createReqVO.getRecptId()); + productReceiptService.validateProductReceiptEditable(createReqVO.getReceiptId()); // 新增 - MesWmProductRecptLineDO line = BeanUtils.toBean(createReqVO, MesWmProductRecptLineDO.class); - productRecptLineMapper.insert(line); + MesWmProductReceiptLineDO line = BeanUtils.toBean(createReqVO, MesWmProductReceiptLineDO.class); + productReceiptLineMapper.insert(line); return line.getId(); } @Override - public void updateProductRecptLine(MesWmProductRecptLineSaveReqVO updateReqVO) { + public void updateProductReceiptLine(MesWmProductReceiptLineSaveReqVO updateReqVO) { // 校验存在 - MesWmProductRecptLineDO line = validateProductRecptLineExists(updateReqVO.getId()); + MesWmProductReceiptLineDO line = validateProductReceiptLineExists(updateReqVO.getId()); // 校验父单据存在且为可编辑状态 - productRecptService.validateProductRecptEditable(line.getRecptId()); + productReceiptService.validateProductReceiptEditable(line.getReceiptId()); // 更新 - MesWmProductRecptLineDO updateObj = BeanUtils.toBean(updateReqVO, MesWmProductRecptLineDO.class); - productRecptLineMapper.updateById(updateObj); + MesWmProductReceiptLineDO updateObj = BeanUtils.toBean(updateReqVO, MesWmProductReceiptLineDO.class); + productReceiptLineMapper.updateById(updateObj); } @Override @Transactional(rollbackFor = Exception.class) - public void deleteProductRecptLine(Long id) { + public void deleteProductReceiptLine(Long id) { // 校验存在 - validateProductRecptLineExists(id); + validateProductReceiptLineExists(id); // 级联删除明细 - productRecptDetailService.deleteProductRecptDetailByLineId(id); + productReceiptDetailService.deleteProductReceiptDetailByLineId(id); // 删除 - productRecptLineMapper.deleteById(id); + productReceiptLineMapper.deleteById(id); } @Override - public MesWmProductRecptLineDO getProductRecptLine(Long id) { - return productRecptLineMapper.selectById(id); + public MesWmProductReceiptLineDO getProductReceiptLine(Long id) { + return productReceiptLineMapper.selectById(id); } @Override - public PageResult getProductRecptLinePage(MesWmProductRecptLinePageReqVO pageReqVO) { - return productRecptLineMapper.selectPage(pageReqVO); + public PageResult getProductReceiptLinePage(MesWmProductReceiptLinePageReqVO pageReqVO) { + return productReceiptLineMapper.selectPage(pageReqVO); } @Override - public List getProductRecptLineListByRecptId(Long recptId) { - return productRecptLineMapper.selectListByRecptId(recptId); + public List getProductReceiptLineListByRecptId(Long receiptId) { + return productReceiptLineMapper.selectListByRecptId(receiptId); } @Override - public void deleteProductRecptLineByRecptId(Long recptId) { - productRecptLineMapper.deleteByRecptId(recptId); + public void deleteProductReceiptLineByRecptId(Long receiptId) { + productReceiptLineMapper.deleteByRecptId(receiptId); } - private MesWmProductRecptLineDO validateProductRecptLineExists(Long id) { - MesWmProductRecptLineDO line = productRecptLineMapper.selectById(id); + private MesWmProductReceiptLineDO validateProductReceiptLineExists(Long id) { + MesWmProductReceiptLineDO line = productReceiptLineMapper.selectById(id); if (line == null) { throw exception(WM_PRODUCT_RECPT_LINE_NOT_EXISTS); } diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productrecpt/MesWmProductRecptService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productreceipt/MesWmProductReceiptService.java index 0e069d8..a826093 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productrecpt/MesWmProductRecptService.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productreceipt/MesWmProductReceiptService.java @@ -1,15 +1,15 @@ -package cn.iocoder.yudao.module.mes.service.wm.productrecpt; +package cn.iocoder.yudao.module.mes.service.wm.productreceipt; import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.mes.controller.admin.wm.productrecpt.vo.MesWmProductRecptPageReqVO; -import cn.iocoder.yudao.module.mes.controller.admin.wm.productrecpt.vo.MesWmProductRecptSaveReqVO; -import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productrecpt.MesWmProductRecptDO; +import cn.iocoder.yudao.module.mes.controller.admin.wm.productreceipt.vo.MesWmProductReceiptPageReqVO; +import cn.iocoder.yudao.module.mes.controller.admin.wm.productreceipt.vo.MesWmProductReceiptSaveReqVO; +import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productreceipt.MesWmProductReceiptDO; import jakarta.validation.Valid; /** * MES 产品收货单 Service 接口 */ -public interface MesWmProductRecptService { +public interface MesWmProductReceiptService { /** * 创建产品收货单 @@ -17,21 +17,21 @@ public interface MesWmProductRecptService { * @param createReqVO 创建信息 * @return 编号 */ - Long createProductRecpt(@Valid MesWmProductRecptSaveReqVO createReqVO); + Long createProductReceipt(@Valid MesWmProductReceiptSaveReqVO createReqVO); /** * 修改产品收货单 * * @param updateReqVO 修改信息 */ - void updateProductRecpt(@Valid MesWmProductRecptSaveReqVO updateReqVO); + void updateProductReceipt(@Valid MesWmProductReceiptSaveReqVO updateReqVO); /** * 删除产品收货单（级联删除行+明细） * * @param id 编号 */ - void deleteProductRecpt(Long id); + void deleteProductReceipt(Long id); /** * 获得产品收货单 @@ -39,7 +39,7 @@ public interface MesWmProductRecptService { * @param id 编号 * @return 产品收货单 */ - MesWmProductRecptDO getProductRecpt(Long id); + MesWmProductReceiptDO getProductReceipt(Long id); /** * 获得产品收货单分页 @@ -47,35 +47,35 @@ public interface MesWmProductRecptService { * @param pageReqVO 分页参数 * @return 产品收货单分页 */ - PageResult getProductRecptPage(MesWmProductRecptPageReqVO pageReqVO); + PageResult getProductReceiptPage(MesWmProductReceiptPageReqVO pageReqVO); /** * 提交产品收货单（草稿 → 待上架） * * @param id 编号 */ - void submitProductRecpt(Long id); + void submitProductReceipt(Long id); /** * 执行上架（待上架 → 待入库） * * @param id 编号 */ - void stockProductRecpt(Long id); + void stockProductReceipt(Long id); /** * 执行入库（待入库 → 已完成），更新库存台账 * * @param id 编号 */ - void executeProductRecpt(Long id); + void executeProductReceipt(Long id); /** * 取消产品收货单（任意非已完成/已取消状态 → 已取消） * * @param id 编号 */ - void cancelProductRecpt(Long id); + void cancelProductReceipt(Long id); /** * 校验产品收货单存在且处于可编辑状态（草稿或待上架） @@ -83,7 +83,7 @@ public interface MesWmProductRecptService { * @param id 编号 * @return 产品收货单 */ - MesWmProductRecptDO validateProductRecptEditable(Long id); + MesWmProductReceiptDO validateProductReceiptEditable(Long id); /** * 校验产品收货单明细数量（每行明细数量之和是否等于行收货数量） @@ -91,6 +91,6 @@ public interface MesWmProductRecptService { * @param id 编号 * @return 是否匹配 */ - Boolean checkProductRecptQuantity(Long id); + Boolean checkProductReceiptQuantity(Long id); } diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productrecpt/MesWmProductRecptServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productreceipt/MesWmProductReceiptServiceImpl.java index 72adc3c..5800357 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productrecpt/MesWmProductRecptServiceImpl.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productreceipt/MesWmProductReceiptServiceImpl.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.mes.service.wm.productrecpt; +package cn.iocoder.yudao.module.mes.service.wm.productreceipt; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ObjUtil; @@ -6,14 +6,14 @@ import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils; import cn.iocoder.yudao.framework.common.util.object.BeanUtils; import cn.iocoder.yudao.framework.common.util.object.ObjectUtils; -import cn.iocoder.yudao.module.mes.controller.admin.wm.productrecpt.vo.MesWmProductRecptPageReqVO; -import cn.iocoder.yudao.module.mes.controller.admin.wm.productrecpt.vo.MesWmProductRecptSaveReqVO; +import cn.iocoder.yudao.module.mes.controller.admin.wm.productreceipt.vo.MesWmProductReceiptPageReqVO; +import cn.iocoder.yudao.module.mes.controller.admin.wm.productreceipt.vo.MesWmProductReceiptSaveReqVO; import cn.iocoder.yudao.module.mes.dal.dataobject.pro.workorder.MesProWorkOrderDO; -import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productrecpt.MesWmProductRecptDO; -import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productrecpt.MesWmProductRecptDetailDO; -import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productrecpt.MesWmProductRecptLineDO; -import cn.iocoder.yudao.module.mes.dal.mysql.wm.productrecpt.MesWmProductRecptMapper; -import cn.iocoder.yudao.module.mes.enums.wm.MesWmProductRecptStatusEnum; +import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productreceipt.MesWmProductReceiptDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productreceipt.MesWmProductReceiptDetailDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productreceipt.MesWmProductReceiptLineDO; +import cn.iocoder.yudao.module.mes.dal.mysql.wm.productreceipt.MesWmProductReceiptMapper; +import cn.iocoder.yudao.module.mes.enums.wm.MesWmProductReceiptStatusEnum; import cn.iocoder.yudao.module.mes.service.wm.materialstock.MesWmMaterialStockService; import jakarta.annotation.Resource; import org.springframework.stereotype.Service; @@ -31,16 +31,16 @@ import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.*; */ @Service @Validated -public class MesWmProductRecptServiceImpl implements MesWmProductRecptService { +public class MesWmProductReceiptServiceImpl implements MesWmProductReceiptService { @Resource - private MesWmProductRecptMapper productRecptMapper; + private MesWmProductReceiptMapper productReceiptMapper; @Resource - private MesWmProductRecptLineService productRecptLineService; + private MesWmProductReceiptLineService productReceiptLineService; @Resource - private MesWmProductRecptDetailService productRecptDetailService; + private MesWmProductReceiptDetailService productReceiptDetailService; @Resource private MesWmMaterialStockService materialStockService; @@ -49,7 +49,7 @@ public class MesWmProductRecptServiceImpl implements MesWmProductRecptService { private cn.iocoder.yudao.module.mes.service.pro.workorder.MesProWorkOrderService workOrderService; @Override - public Long createProductRecpt(MesWmProductRecptSaveReqVO createReqVO) { + public Long createProductReceipt(MesWmProductReceiptSaveReqVO createReqVO) { // 校验编码唯一 validateCodeUnique(null, createReqVO.getCode()); // 校验工单存在并设置 itemId @@ -57,19 +57,19 @@ public class MesWmProductRecptServiceImpl implements MesWmProductRecptService { workOrderService.validateWorkOrderExists(createReqVO.getWorkOrderId()) : null; // 插入 - MesWmProductRecptDO recpt = BeanUtils.toBean(createReqVO, MesWmProductRecptDO.class); + MesWmProductReceiptDO receipt = BeanUtils.toBean(createReqVO, MesWmProductReceiptDO.class); if (workOrder != null) { - recpt.setItemId(workOrder.getProductId()); + receipt.setItemId(workOrder.getProductId()); } - recpt.setStatus(MesWmProductRecptStatusEnum.PREPARE.getStatus()); - productRecptMapper.insert(recpt); - return recpt.getId(); + receipt.setStatus(MesWmProductReceiptStatusEnum.PREPARE.getStatus()); + productReceiptMapper.insert(receipt); + return receipt.getId(); } @Override - public void updateProductRecpt(MesWmProductRecptSaveReqVO updateReqVO) { + public void updateProductReceipt(MesWmProductReceiptSaveReqVO updateReqVO) { // 校验存在 + 草稿状态 - validateProductRecptExistsAndDraft(updateReqVO.getId()); + validateProductReceiptExistsAndDraft(updateReqVO.getId()); // 校验编码唯一 validateCodeUnique(updateReqVO.getId(), updateReqVO.getCode()); // 校验工单存在 @@ -77,73 +77,73 @@ public class MesWmProductRecptServiceImpl implements MesWmProductRecptService { workOrderService.validateWorkOrderExists(updateReqVO.getWorkOrderId()) : null; // 更新 - MesWmProductRecptDO updateObj = BeanUtils.toBean(updateReqVO, MesWmProductRecptDO.class); + MesWmProductReceiptDO updateObj = BeanUtils.toBean(updateReqVO, MesWmProductReceiptDO.class); if (workOrder != null) { updateObj.setItemId(workOrder.getProductId()); } - productRecptMapper.updateById(updateObj); + productReceiptMapper.updateById(updateObj); } @Override @Transactional(rollbackFor = Exception.class) - public void deleteProductRecpt(Long id) { + public void deleteProductReceipt(Long id) { // 校验存在 + 草稿状态 - validateProductRecptExistsAndDraft(id); + validateProductReceiptExistsAndDraft(id); // 级联删除明细和行 - productRecptDetailService.deleteProductRecptDetailByRecptId(id); - productRecptLineService.deleteProductRecptLineByRecptId(id); + productReceiptDetailService.deleteProductReceiptDetailByRecptId(id); + productReceiptLineService.deleteProductReceiptLineByRecptId(id); // 删除 - productRecptMapper.deleteById(id); + productReceiptMapper.deleteById(id); } @Override - public MesWmProductRecptDO getProductRecpt(Long id) { - return productRecptMapper.selectById(id); + public MesWmProductReceiptDO getProductReceipt(Long id) { + return productReceiptMapper.selectById(id); } @Override - public PageResult getProductRecptPage(MesWmProductRecptPageReqVO pageReqVO) { - return productRecptMapper.selectPage(pageReqVO); + public PageResult getProductReceiptPage(MesWmProductReceiptPageReqVO pageReqVO) { + return productReceiptMapper.selectPage(pageReqVO); } @Override @Transactional(rollbackFor = Exception.class) - public void submitProductRecpt(Long id) { + public void submitProductReceipt(Long id) { // 校验存在 + 草稿状态 - validateProductRecptExistsAndDraft(id); + validateProductReceiptExistsAndDraft(id); // 校验至少有一条行 - List lines = productRecptLineService.getProductRecptLineListByRecptId(id); + List lines = productReceiptLineService.getProductReceiptLineListByRecptId(id); if (CollUtil.isEmpty(lines)) { throw exception(WM_PRODUCT_RECPT_NO_LINE); } // 提交（草稿 → 待上架） - productRecptMapper.updateById(new MesWmProductRecptDO() - .setId(id).setStatus(MesWmProductRecptStatusEnum.APPROVING.getStatus())); + productReceiptMapper.updateById(new MesWmProductReceiptDO() + .setId(id).setStatus(MesWmProductReceiptStatusEnum.APPROVING.getStatus())); } @Override @Transactional(rollbackFor = Exception.class) - public void stockProductRecpt(Long id) { + public void stockProductReceipt(Long id) { // 校验存在 - MesWmProductRecptDO recpt = validateProductRecptExists(id); - if (ObjUtil.notEqual(MesWmProductRecptStatusEnum.APPROVING.getStatus(), recpt.getStatus())) { + MesWmProductReceiptDO receipt = validateProductReceiptExists(id); + if (ObjUtil.notEqual(MesWmProductReceiptStatusEnum.APPROVING.getStatus(), receipt.getStatus())) { throw exception(WM_PRODUCT_RECPT_STATUS_ERROR); } // 执行上架（待上架 → 待入库） - productRecptMapper.updateById(new MesWmProductRecptDO() - .setId(id).setStatus(MesWmProductRecptStatusEnum.APPROVED.getStatus())); + productReceiptMapper.updateById(new MesWmProductReceiptDO() + .setId(id).setStatus(MesWmProductReceiptStatusEnum.APPROVED.getStatus())); } @Override - public Boolean checkProductRecptQuantity(Long id) { - List lines = productRecptLineService.getProductRecptLineListByRecptId(id); - for (MesWmProductRecptLineDO line : lines) { - List details = productRecptDetailService.getProductRecptDetailListByLineId(line.getId()); + public Boolean checkProductReceiptQuantity(Long id) { + List lines = productReceiptLineService.getProductReceiptLineListByRecptId(id); + for (MesWmProductReceiptLineDO line : lines) { + List details = productReceiptDetailService.getProductReceiptDetailListByLineId(line.getId()); BigDecimal totalDetailQty = CollectionUtils.getSumValue(details, - MesWmProductRecptDetailDO::getQuantity, BigDecimal::add, BigDecimal.ZERO); + MesWmProductReceiptDetailDO::getQuantity, BigDecimal::add, BigDecimal.ZERO); if (line.getQuantity() != null && totalDetailQty.compareTo(line.getQuantity()) != 0) { return false; } @@ -153,79 +153,79 @@ public class MesWmProductRecptServiceImpl implements MesWmProductRecptService { @Override @Transactional(rollbackFor = Exception.class) - public void executeProductRecpt(Long id) { + public void executeProductReceipt(Long id) { // 校验存在 - MesWmProductRecptDO recpt = validateProductRecptExists(id); - if (ObjUtil.notEqual(MesWmProductRecptStatusEnum.APPROVED.getStatus(), recpt.getStatus())) { + MesWmProductReceiptDO receipt = validateProductReceiptExists(id); + if (ObjUtil.notEqual(MesWmProductReceiptStatusEnum.APPROVED.getStatus(), receipt.getStatus())) { throw exception(WM_PRODUCT_RECPT_STATUS_ERROR); } // 遍历所有明细，更新库存台账 // TODO @芋艿：【后面优化】 - List details = productRecptDetailService.getProductRecptDetailListByRecptId(id); - for (MesWmProductRecptDetailDO detail : details) { + List details = productReceiptDetailService.getProductReceiptDetailListByRecptId(id); + for (MesWmProductReceiptDetailDO detail : details) { materialStockService.increaseStock( detail.getItemId(), detail.getWarehouseId(), detail.getLocationId(), detail.getAreaId(), detail.getBatchId(), detail.getQuantity(), null, null, null); } // 更新收货单状态 - productRecptMapper.updateById(new MesWmProductRecptDO() - .setId(id).setStatus(MesWmProductRecptStatusEnum.FINISHED.getStatus())); + productReceiptMapper.updateById(new MesWmProductReceiptDO() + .setId(id).setStatus(MesWmProductReceiptStatusEnum.FINISHED.getStatus())); } @Override @Transactional(rollbackFor = Exception.class) - public void cancelProductRecpt(Long id) { + public void cancelProductReceipt(Long id) { // 校验存在 - MesWmProductRecptDO recpt = validateProductRecptExists(id); + MesWmProductReceiptDO receipt = validateProductReceiptExists(id); // 已完成和已取消不允许取消 - if (ObjectUtils.equalsAny(recpt.getStatus(), - MesWmProductRecptStatusEnum.FINISHED.getStatus(), - MesWmProductRecptStatusEnum.CANCELED.getStatus())) { + if (ObjectUtils.equalsAny(receipt.getStatus(), + MesWmProductReceiptStatusEnum.FINISHED.getStatus(), + MesWmProductReceiptStatusEnum.CANCELED.getStatus())) { throw exception(WM_PRODUCT_RECPT_CANCEL_NOT_ALLOWED); } // 取消 - productRecptMapper.updateById(new MesWmProductRecptDO() - .setId(id).setStatus(MesWmProductRecptStatusEnum.CANCELED.getStatus())); + productReceiptMapper.updateById(new MesWmProductReceiptDO() + .setId(id).setStatus(MesWmProductReceiptStatusEnum.CANCELED.getStatus())); } @Override - public MesWmProductRecptDO validateProductRecptEditable(Long id) { - MesWmProductRecptDO recpt = validateProductRecptExists(id); - if (ObjUtil.notEqual(recpt.getStatus(), MesWmProductRecptStatusEnum.PREPARE.getStatus()) - && ObjUtil.notEqual(recpt.getStatus(), MesWmProductRecptStatusEnum.APPROVING.getStatus())) { + public MesWmProductReceiptDO validateProductReceiptEditable(Long id) { + MesWmProductReceiptDO receipt = validateProductReceiptExists(id); + if (ObjUtil.notEqual(receipt.getStatus(), MesWmProductReceiptStatusEnum.PREPARE.getStatus()) + && ObjUtil.notEqual(receipt.getStatus(), MesWmProductReceiptStatusEnum.APPROVING.getStatus())) { throw exception(WM_PRODUCT_RECPT_STATUS_NOT_PREPARE); } - return recpt; + return receipt; } - private MesWmProductRecptDO validateProductRecptExists(Long id) { - MesWmProductRecptDO recpt = productRecptMapper.selectById(id); - if (recpt == null) { + private MesWmProductReceiptDO validateProductReceiptExists(Long id) { + MesWmProductReceiptDO receipt = productReceiptMapper.selectById(id); + if (receipt == null) { throw exception(WM_PRODUCT_RECPT_NOT_EXISTS); } - return recpt; + return receipt; } /** * 校验产品收货单存在且为草稿状态 */ - private MesWmProductRecptDO validateProductRecptExistsAndDraft(Long id) { - MesWmProductRecptDO recpt = validateProductRecptExists(id); - if (ObjUtil.notEqual(MesWmProductRecptStatusEnum.PREPARE.getStatus(), recpt.getStatus())) { + private MesWmProductReceiptDO validateProductReceiptExistsAndDraft(Long id) { + MesWmProductReceiptDO receipt = validateProductReceiptExists(id); + if (ObjUtil.notEqual(MesWmProductReceiptStatusEnum.PREPARE.getStatus(), receipt.getStatus())) { throw exception(WM_PRODUCT_RECPT_STATUS_NOT_PREPARE); } - return recpt; + return receipt; } private void validateCodeUnique(Long id, String code) { - MesWmProductRecptDO recpt = productRecptMapper.selectByCode(code); - if (recpt == null) { + MesWmProductReceiptDO receipt = productReceiptMapper.selectByCode(code); + if (receipt == null) { return; } - if (ObjUtil.notEqual(id, recpt.getId())) { + if (ObjUtil.notEqual(id, receipt.getId())) { throw exception(WM_PRODUCT_RECPT_CODE_DUPLICATE); } } diff --git a/yudao-ui/yudao-ui-admin-vue3/src/api/mes/wm/productrecpt/detail/index.ts b/yudao-ui/yudao-ui-admin-vue3/src/api/mes/wm/productreceipt/detail/index.ts index d7e29fb..d7e29fb 100644 --- a/yudao-ui/yudao-ui-admin-vue3/src/api/mes/wm/productrecpt/detail/index.ts +++ b/yudao-ui/yudao-ui-admin-vue3/src/api/mes/wm/productreceipt/detail/index.ts diff --git a/yudao-ui/yudao-ui-admin-vue3/src/api/mes/wm/productrecpt/index.ts b/yudao-ui/yudao-ui-admin-vue3/src/api/mes/wm/productreceipt/index.ts index 6602c20..6602c20 100644 --- a/yudao-ui/yudao-ui-admin-vue3/src/api/mes/wm/productrecpt/index.ts +++ b/yudao-ui/yudao-ui-admin-vue3/src/api/mes/wm/productreceipt/index.ts diff --git a/yudao-ui/yudao-ui-admin-vue3/src/api/mes/wm/productrecpt/line/index.ts b/yudao-ui/yudao-ui-admin-vue3/src/api/mes/wm/productreceipt/line/index.ts index c879e98..c879e98 100644 --- a/yudao-ui/yudao-ui-admin-vue3/src/api/mes/wm/productrecpt/line/index.ts +++ b/yudao-ui/yudao-ui-admin-vue3/src/api/mes/wm/productreceipt/line/index.ts