diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/cal/plan/MesCalPlanController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/cal/plan/MesCalPlanController.java index 9d8ff07..5a1a782 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/cal/plan/MesCalPlanController.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/cal/plan/MesCalPlanController.java @@ -9,7 +9,7 @@ import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils; import cn.iocoder.yudao.module.mes.controller.admin.cal.plan.vo.MesCalPlanPageReqVO; import cn.iocoder.yudao.module.mes.controller.admin.cal.plan.vo.MesCalPlanRespVO; import cn.iocoder.yudao.module.mes.controller.admin.cal.plan.vo.MesCalPlanSaveReqVO; -import cn.iocoder.yudao.module.mes.dal.dataobject.cal.MesCalPlanDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.cal.plan.MesCalPlanDO; import cn.iocoder.yudao.module.mes.service.cal.plan.MesCalPlanService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/cal/plan/MesCalPlanShiftController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/cal/plan/MesCalPlanShiftController.java index 48c0dae..1f6013e 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/cal/plan/MesCalPlanShiftController.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/cal/plan/MesCalPlanShiftController.java @@ -6,7 +6,7 @@ import cn.iocoder.yudao.framework.common.util.object.BeanUtils; import cn.iocoder.yudao.module.mes.controller.admin.cal.plan.vo.shift.MesCalPlanShiftPageReqVO; import cn.iocoder.yudao.module.mes.controller.admin.cal.plan.vo.shift.MesCalPlanShiftRespVO; import cn.iocoder.yudao.module.mes.controller.admin.cal.plan.vo.shift.MesCalPlanShiftSaveReqVO; -import cn.iocoder.yudao.module.mes.dal.dataobject.cal.MesCalPlanShiftDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.cal.plan.MesCalPlanShiftDO; import cn.iocoder.yudao.module.mes.service.cal.plan.MesCalPlanShiftService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/cal/plan/MesCalPlanTeamController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/cal/plan/MesCalPlanTeamController.java index 5544ac6..529fbbb 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/cal/plan/MesCalPlanTeamController.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/cal/plan/MesCalPlanTeamController.java @@ -4,7 +4,7 @@ import cn.iocoder.yudao.framework.common.pojo.CommonResult; import cn.iocoder.yudao.framework.common.util.object.BeanUtils; import cn.iocoder.yudao.module.mes.controller.admin.cal.plan.vo.team.MesCalPlanTeamRespVO; import cn.iocoder.yudao.module.mes.controller.admin.cal.plan.vo.team.MesCalPlanTeamSaveReqVO; -import cn.iocoder.yudao.module.mes.dal.dataobject.cal.MesCalPlanTeamDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.cal.plan.MesCalPlanTeamDO; import cn.iocoder.yudao.module.mes.service.cal.plan.MesCalPlanTeamService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/MesProWorkorderBomController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/MesProWorkorderBomController.java index a7f1f8d..6f886c7 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/MesProWorkorderBomController.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/MesProWorkorderBomController.java @@ -5,15 +5,15 @@ 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.pro.workorder.vo.bom.MesProWorkorderBomPageReqVO; -import cn.iocoder.yudao.module.mes.controller.admin.pro.workorder.vo.bom.MesProWorkorderBomRespVO; -import cn.iocoder.yudao.module.mes.controller.admin.pro.workorder.vo.bom.MesProWorkorderBomSaveReqVO; +import cn.iocoder.yudao.module.mes.controller.admin.pro.workorder.vo.bom.MesProWorkOrderBomPageReqVO; +import cn.iocoder.yudao.module.mes.controller.admin.pro.workorder.vo.bom.MesProWorkOrderBomRespVO; +import cn.iocoder.yudao.module.mes.controller.admin.pro.workorder.vo.bom.MesProWorkOrderBomSaveReqVO; 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.MesProWorkorderBomDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.pro.workorder.MesProWorkOrderBomDO; 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.MesProWorkorderBomService; +import cn.iocoder.yudao.module.mes.service.pro.workorder.MesProWorkOrderBomService; 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 生产工单 BOM") @RestController -@RequestMapping("/mes/pro/workorder-bom") +@RequestMapping("/mes/pro/work-order-bom") @Validated -public class MesProWorkorderBomController { +public class MesProWorkOrderBomController { @Resource - private MesProWorkorderBomService workorderBomService; + private MesProWorkOrderBomService workOrderBomService; @Resource private MesMdItemService itemService; @@ -47,67 +47,64 @@ public class MesProWorkorderBomController { @PostMapping("/create") @Operation(summary = "创建工单 BOM") - @PreAuthorize("@ss.hasPermission('mes:pro-workorder:update')") - public CommonResult createWorkorderBom(@Valid @RequestBody MesProWorkorderBomSaveReqVO createReqVO) { - return success(workorderBomService.createWorkorderBom(createReqVO)); + @PreAuthorize("@ss.hasPermission('mes:pro-work-order:update')") + public CommonResult createWorkOrderBom(@Valid @RequestBody MesProWorkOrderBomSaveReqVO createReqVO) { + return success(workOrderBomService.createWorkOrderBom(createReqVO)); } @PutMapping("/update") @Operation(summary = "更新工单 BOM") - @PreAuthorize("@ss.hasPermission('mes:pro-workorder:update')") - public CommonResult updateWorkorderBom(@Valid @RequestBody MesProWorkorderBomSaveReqVO updateReqVO) { - workorderBomService.updateWorkorderBom(updateReqVO); + @PreAuthorize("@ss.hasPermission('mes:pro-work-order:update')") + public CommonResult updateWorkOrderBom(@Valid @RequestBody MesProWorkOrderBomSaveReqVO updateReqVO) { + workOrderBomService.updateWorkOrderBom(updateReqVO); return success(true); } @DeleteMapping("/delete") @Operation(summary = "删除工单 BOM") @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('mes:pro-workorder:update')") - public CommonResult deleteWorkorderBom(@RequestParam("id") Long id) { - workorderBomService.deleteWorkorderBom(id); + @PreAuthorize("@ss.hasPermission('mes:pro-work-order:update')") + public CommonResult deleteWorkOrderBom(@RequestParam("id") Long id) { + workOrderBomService.deleteWorkOrderBom(id); return success(true); } @GetMapping("/get") @Operation(summary = "获得工单 BOM") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('mes:pro-workorder:query')") - public CommonResult getWorkorderBom(@RequestParam("id") Long id) { - MesProWorkorderBomDO workorderBom = workorderBomService.getWorkorderBom(id); - if (workorderBom == null) { + @PreAuthorize("@ss.hasPermission('mes:pro-work-order:query')") + public CommonResult getWorkOrderBom(@RequestParam("id") Long id) { + MesProWorkOrderBomDO workOrderBom = workOrderBomService.getWorkOrderBom(id); + if (workOrderBom == null) { return success(null); } - return success(buildWorkorderBomRespVOList(List.of(workorderBom)).get(0)); + return success(buildWorkOrderBomRespVOList(List.of(workOrderBom)).get(0)); } @GetMapping("/page") @Operation(summary = "获得工单 BOM 分页") - @PreAuthorize("@ss.hasPermission('mes:pro-workorder:query')") - public CommonResult> getWorkorderBomPage(@Valid MesProWorkorderBomPageReqVO pageReqVO) { - PageResult pageResult = workorderBomService.getWorkorderBomPage(pageReqVO); - return success(new PageResult<>(buildWorkorderBomRespVOList(pageResult.getList()), pageResult.getTotal())); + @PreAuthorize("@ss.hasPermission('mes:pro-work-order:query')") + public CommonResult> getWorkOrderBomPage(@Valid MesProWorkOrderBomPageReqVO pageReqVO) { + PageResult pageResult = workOrderBomService.getWorkOrderBomPage(pageReqVO); + return success(new PageResult<>(buildWorkOrderBomRespVOList(pageResult.getList()), pageResult.getTotal())); } // ==================== 拼接 VO ==================== - private List buildWorkorderBomRespVOList(List list) { + private List buildWorkOrderBomRespVOList(List list) { if (CollUtil.isEmpty(list)) { return Collections.emptyList(); } // 1. 批量获取关联数据 Map itemMap = itemService.getItemMap( - convertSet(list, MesProWorkorderBomDO::getItemId)); + convertSet(list, MesProWorkOrderBomDO::getItemId)); Map unitMeasureMap = unitMeasureService.getUnitMeasureMap( - convertSet(list, MesProWorkorderBomDO::getUnitMeasureId)); + convertSet(list, MesProWorkOrderBomDO::getUnitMeasureId)); // 2. 拼接 VO - return BeanUtils.toBean(list, MesProWorkorderBomRespVO.class, vo -> { - MapUtils.findAndThen(itemMap, vo.getItemId(), item -> { - // TODO @AI：少了 spec 字段？另外，改成链式调用； - vo.setItemName(item.getName()); - vo.setItemCode(item.getCode()); - vo.setItemSpec(item.getSpec()); - }); + return BeanUtils.toBean(list, MesProWorkOrderBomRespVO.class, vo -> { + MapUtils.findAndThen(itemMap, vo.getItemId(), item -> + vo.setItemName(item.getName()).setItemCode(item.getCode()) + .setItemSpec(item.getSpecification())); MapUtils.findAndThen(unitMeasureMap, vo.getUnitMeasureId(), unitMeasure -> vo.setUnitMeasureName(unitMeasure.getName())); }); diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/MesProWorkorderController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/MesProWorkorderController.java index 95f7d29..2757ec1 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/MesProWorkorderController.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/MesProWorkorderController.java @@ -8,19 +8,19 @@ 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.pro.workorder.vo.MesProWorkorderPageReqVO; -import cn.iocoder.yudao.module.mes.controller.admin.pro.workorder.vo.MesProWorkorderRespVO; -import cn.iocoder.yudao.module.mes.controller.admin.pro.workorder.vo.MesProWorkorderSaveReqVO; +import cn.iocoder.yudao.module.mes.controller.admin.pro.workorder.vo.MesProWorkOrderPageReqVO; +import cn.iocoder.yudao.module.mes.controller.admin.pro.workorder.vo.MesProWorkOrderRespVO; +import cn.iocoder.yudao.module.mes.controller.admin.pro.workorder.vo.MesProWorkOrderSaveReqVO; import cn.iocoder.yudao.module.mes.dal.dataobject.md.client.MesMdClientDO; 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.md.vendor.MesMdVendorDO; -import cn.iocoder.yudao.module.mes.dal.dataobject.pro.workorder.MesProWorkorderDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.pro.workorder.MesProWorkOrderDO; import cn.iocoder.yudao.module.mes.service.md.client.MesMdClientService; 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.md.vendor.MesMdVendorService; -import cn.iocoder.yudao.module.mes.service.pro.workorder.MesProWorkorderService; +import cn.iocoder.yudao.module.mes.service.pro.workorder.MesProWorkOrderService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; @@ -42,12 +42,12 @@ import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils. @Tag(name = "管理后台 - MES 生产工单") @RestController -@RequestMapping("/mes/pro/workorder") +@RequestMapping("/mes/pro/work-order") @Validated -public class MesProWorkorderController { +public class MesProWorkOrderController { @Resource - private MesProWorkorderService workorderService; + private MesProWorkOrderService workOrderService; @Resource private MesMdItemService itemService; @@ -63,102 +63,98 @@ public class MesProWorkorderController { @PostMapping("/create") @Operation(summary = "创建生产工单") - @PreAuthorize("@ss.hasPermission('mes:pro-workorder:create')") - public CommonResult createWorkorder(@Valid @RequestBody MesProWorkorderSaveReqVO createReqVO) { - return success(workorderService.createWorkorder(createReqVO)); + @PreAuthorize("@ss.hasPermission('mes:pro-work-order:create')") + public CommonResult createWorkOrder(@Valid @RequestBody MesProWorkOrderSaveReqVO createReqVO) { + return success(workOrderService.createWorkOrder(createReqVO)); } @PutMapping("/update") @Operation(summary = "更新生产工单") - @PreAuthorize("@ss.hasPermission('mes:pro-workorder:update')") - public CommonResult updateWorkorder(@Valid @RequestBody MesProWorkorderSaveReqVO updateReqVO) { - workorderService.updateWorkorder(updateReqVO); + @PreAuthorize("@ss.hasPermission('mes:pro-work-order:update')") + public CommonResult updateWorkOrder(@Valid @RequestBody MesProWorkOrderSaveReqVO updateReqVO) { + workOrderService.updateWorkOrder(updateReqVO); return success(true); } @DeleteMapping("/delete") @Operation(summary = "删除生产工单") @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('mes:pro-workorder:delete')") - public CommonResult deleteWorkorder(@RequestParam("id") Long id) { - workorderService.deleteWorkorder(id); + @PreAuthorize("@ss.hasPermission('mes:pro-work-order:delete')") + public CommonResult deleteWorkOrder(@RequestParam("id") Long id) { + workOrderService.deleteWorkOrder(id); return success(true); } @GetMapping("/get") @Operation(summary = "获得生产工单") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('mes:pro-workorder:query')") - public CommonResult getWorkorder(@RequestParam("id") Long id) { - MesProWorkorderDO workorder = workorderService.getWorkorder(id); - if (workorder == null) { + @PreAuthorize("@ss.hasPermission('mes:pro-work-order:query')") + public CommonResult getWorkOrder(@RequestParam("id") Long id) { + MesProWorkOrderDO workOrder = workOrderService.getWorkOrder(id); + if (workOrder == null) { return success(null); } - return success(buildWorkorderRespVOList(List.of(workorder)).get(0)); + return success(buildWorkOrderRespVOList(List.of(workOrder)).get(0)); } @GetMapping("/page") @Operation(summary = "获得生产工单分页") - @PreAuthorize("@ss.hasPermission('mes:pro-workorder:query')") - public CommonResult> getWorkorderPage(@Valid MesProWorkorderPageReqVO pageReqVO) { - PageResult pageResult = workorderService.getWorkorderPage(pageReqVO); - return success(new PageResult<>(buildWorkorderRespVOList(pageResult.getList()), pageResult.getTotal())); + @PreAuthorize("@ss.hasPermission('mes:pro-work-order:query')") + public CommonResult> getWorkOrderPage(@Valid MesProWorkOrderPageReqVO pageReqVO) { + PageResult pageResult = workOrderService.getWorkOrderPage(pageReqVO); + return success(new PageResult<>(buildWorkOrderRespVOList(pageResult.getList()), pageResult.getTotal())); } @GetMapping("/export-excel") @Operation(summary = "导出生产工单 Excel") - @PreAuthorize("@ss.hasPermission('mes:pro-workorder:export')") + @PreAuthorize("@ss.hasPermission('mes:pro-work-order:export')") @ApiAccessLog(operateType = EXPORT) - public void exportWorkorderExcel(@Valid MesProWorkorderPageReqVO pageReqVO, + public void exportWorkOrderExcel(@Valid MesProWorkOrderPageReqVO pageReqVO, HttpServletResponse response) throws IOException { pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); - List list = workorderService.getWorkorderPage(pageReqVO).getList(); - List voList = buildWorkorderRespVOList(list); - ExcelUtils.write(response, "生产工单.xls", "数据", MesProWorkorderRespVO.class, voList); + List list = workOrderService.getWorkOrderPage(pageReqVO).getList(); + List voList = buildWorkOrderRespVOList(list); + ExcelUtils.write(response, "生产工单.xls", "数据", MesProWorkOrderRespVO.class, voList); } @PutMapping("/finish") @Operation(summary = "完成工单") @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('mes:pro-workorder:update')") - public CommonResult finishWorkorder(@RequestParam("id") Long id) { - workorderService.finishWorkorder(id); + @PreAuthorize("@ss.hasPermission('mes:pro-work-order:update')") + public CommonResult finishWorkOrder(@RequestParam("id") Long id) { + workOrderService.finishWorkOrder(id); return success(true); } @PutMapping("/cancel") @Operation(summary = "取消工单") @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('mes:pro-workorder:update')") - public CommonResult cancelWorkorder(@RequestParam("id") Long id) { - workorderService.cancelWorkorder(id); + @PreAuthorize("@ss.hasPermission('mes:pro-work-order:update')") + public CommonResult cancelWorkOrder(@RequestParam("id") Long id) { + workOrderService.cancelWorkOrder(id); return success(true); } // ==================== 拼接 VO ==================== - @SuppressWarnings("CodeBlock2Expr") - private List buildWorkorderRespVOList(List list) { + private List buildWorkOrderRespVOList(List list) { if (CollUtil.isEmpty(list)) { return Collections.emptyList(); } // 1. 批量获取关联数据 Map itemMap = itemService.getItemMap( - convertSet(list, MesProWorkorderDO::getProductId)); + convertSet(list, MesProWorkOrderDO::getProductId)); Map clientMap = clientService.getClientMap( - convertSet(list, MesProWorkorderDO::getClientId)); + convertSet(list, MesProWorkOrderDO::getClientId)); Map vendorMap = vendorService.getVendorMap( - convertSet(list, MesProWorkorderDO::getVendorId)); + convertSet(list, MesProWorkOrderDO::getVendorId)); Map unitMeasureMap = unitMeasureService.getUnitMeasureMap( - convertSet(list, MesProWorkorderDO::getUnitMeasureId)); + convertSet(list, MesProWorkOrderDO::getUnitMeasureId)); // 2. 拼接 VO - return BeanUtils.toBean(list, MesProWorkorderRespVO.class, vo -> { - MapUtils.findAndThen(itemMap, vo.getProductId(), item -> { - // TODO @AI：少了 spec 字段？另外，改成链式调用； - vo.setProductName(item.getName()); - vo.setProductCode(item.getCode()); - vo.setProductSpec(item.getSpec()); - }); + return BeanUtils.toBean(list, MesProWorkOrderRespVO.class, vo -> { + MapUtils.findAndThen(itemMap, vo.getProductId(), item -> + vo.setProductName(item.getName()).setProductCode(item.getCode()) + .setProductSpec(item.getSpecification())); MapUtils.findAndThen(clientMap, vo.getClientId(), client -> vo.setClientName(client.getName())); MapUtils.findAndThen(vendorMap, vo.getVendorId(), diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/vo/MesProWorkorderPageReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/vo/MesProWorkorderPageReqVO.java index 5ecd1a3..0763204 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/vo/MesProWorkorderPageReqVO.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/vo/MesProWorkorderPageReqVO.java @@ -15,7 +15,7 @@ import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_ @Data @EqualsAndHashCode(callSuper = true) @ToString(callSuper = true) -public class MesProWorkorderPageReqVO extends PageParam { +public class MesProWorkOrderPageReqVO extends PageParam { @Schema(description = "工单编码", example = "WO-001") private String code; diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/vo/MesProWorkorderRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/vo/MesProWorkorderRespVO.java index c4d7b81..af81b21 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/vo/MesProWorkorderRespVO.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/vo/MesProWorkorderRespVO.java @@ -14,7 +14,7 @@ import java.time.LocalDateTime; @Schema(description = "管理后台 - MES 生产工单 Response VO") @Data @ExcelIgnoreUnannotated -public class MesProWorkorderRespVO { +public class MesProWorkOrderRespVO { @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") @ExcelProperty("编号") @@ -30,12 +30,12 @@ public class MesProWorkorderRespVO { @Schema(description = "工单类型", example = "1") @ExcelProperty(value = "工单类型", converter = DictConvert.class) - @DictFormat(DictTypeConstants.MES_PRO_WORKORDER_TYPE) + @DictFormat(DictTypeConstants.MES_PRO_WORK_ORDER_TYPE) private Integer type; @Schema(description = "来源类型", example = "1") @ExcelProperty(value = "来源类型", converter = DictConvert.class) - @DictFormat(DictTypeConstants.MES_PRO_WORKORDER_SOURCE_TYPE) + @DictFormat(DictTypeConstants.MES_PRO_WORK_ORDER_SOURCE_TYPE) private Integer orderSourceType; @Schema(description = "来源单据编号", example = "SO-001") @@ -105,9 +105,6 @@ public class MesProWorkorderRespVO { @Schema(description = "父工单编号", example = "0") private Long parentId; - @Schema(description = "所有父节点编号", example = "0") - private String ancestors; - @Schema(description = "完成时间") @ExcelProperty("完成时间") private LocalDateTime finishDate; @@ -118,7 +115,7 @@ public class MesProWorkorderRespVO { @Schema(description = "工单状态", example = "0") @ExcelProperty(value = "工单状态", converter = DictConvert.class) - @DictFormat(DictTypeConstants.MES_PRO_WORKORDER_STATUS) + @DictFormat(DictTypeConstants.MES_PRO_WORK_ORDER_STATUS) private Integer status; @Schema(description = "备注", example = "备注") diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/vo/MesProWorkorderSaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/vo/MesProWorkorderSaveReqVO.java index 48f5389..bcc1671 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/vo/MesProWorkorderSaveReqVO.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/vo/MesProWorkorderSaveReqVO.java @@ -10,7 +10,7 @@ import java.time.LocalDateTime; @Schema(description = "管理后台 - MES 生产工单新增/修改 Request VO") @Data -public class MesProWorkorderSaveReqVO { +public class MesProWorkOrderSaveReqVO { @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") private Long id; @@ -71,9 +71,6 @@ public class MesProWorkorderSaveReqVO { @Schema(description = "父工单编号", example = "0") private Long parentId; - @Schema(description = "所有父节点编号", example = "0") - private String ancestors; - @Schema(description = "备注", example = "备注") private String remark; diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/vo/bom/MesProWorkorderBomPageReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/vo/bom/MesProWorkorderBomPageReqVO.java index 952f8f7..40fa649 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/vo/bom/MesProWorkorderBomPageReqVO.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/vo/bom/MesProWorkorderBomPageReqVO.java @@ -11,10 +11,10 @@ import lombok.ToString; @Data @EqualsAndHashCode(callSuper = true) @ToString(callSuper = true) -public class MesProWorkorderBomPageReqVO extends PageParam { +public class MesProWorkOrderBomPageReqVO extends PageParam { @Schema(description = "生产工单编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "100") @NotNull(message = "生产工单编号不能为空") - private Long workorderId; + private Long workOrderId; } diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/vo/bom/MesProWorkorderBomRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/vo/bom/MesProWorkorderBomRespVO.java index 17d2713..78feffe 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/vo/bom/MesProWorkorderBomRespVO.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/vo/bom/MesProWorkorderBomRespVO.java @@ -11,14 +11,14 @@ import java.time.LocalDateTime; @Schema(description = "管理后台 - MES 生产工单 BOM Response VO") @Data @ExcelIgnoreUnannotated -public class MesProWorkorderBomRespVO { +public class MesProWorkOrderBomRespVO { @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") @ExcelProperty("编号") private Long id; @Schema(description = "生产工单编号", example = "100") - private Long workorderId; + private Long workOrderId; @Schema(description = "BOM 物料编号", example = "200") private Long itemId; @@ -42,10 +42,6 @@ public class MesProWorkorderBomRespVO { @ExcelProperty("单位") private String unitMeasureName; - @Schema(description = "物料产品标识", example = "ITEM") - @ExcelProperty("物料产品标识") - private String itemOrProduct; - @Schema(description = "预计使用量", example = "10.00") @ExcelProperty("预计使用量") private BigDecimal quantity; diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/vo/bom/MesProWorkorderBomSaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/vo/bom/MesProWorkorderBomSaveReqVO.java index eb270ee..86d4a48 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/vo/bom/MesProWorkorderBomSaveReqVO.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/vo/bom/MesProWorkorderBomSaveReqVO.java @@ -1,7 +1,6 @@ package cn.iocoder.yudao.module.mes.controller.admin.pro.workorder.vo.bom; import io.swagger.v3.oas.annotations.media.Schema; -import jakarta.validation.constraints.NotEmpty; import jakarta.validation.constraints.NotNull; import lombok.Data; @@ -9,14 +8,14 @@ import java.math.BigDecimal; @Schema(description = "管理后台 - MES 生产工单 BOM 新增/修改 Request VO") @Data -public class MesProWorkorderBomSaveReqVO { +public class MesProWorkOrderBomSaveReqVO { @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") private Long id; @Schema(description = "生产工单编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "100") @NotNull(message = "生产工单编号不能为空") - private Long workorderId; + private Long workOrderId; @Schema(description = "BOM 物料编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "200") @NotNull(message = "BOM 物料不能为空") @@ -26,10 +25,6 @@ public class MesProWorkorderBomSaveReqVO { @NotNull(message = "单位不能为空") private Long unitMeasureId; - @Schema(description = "物料产品标识", requiredMode = Schema.RequiredMode.REQUIRED, example = "ITEM") - @NotEmpty(message = "物料产品标识不能为空") - private String itemOrProduct; - @Schema(description = "预计使用量", requiredMode = Schema.RequiredMode.REQUIRED, example = "10.00") @NotNull(message = "预计使用量不能为空") private BigDecimal quantity; diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/MesQcDefectController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/defect/MesQcDefectController.java index 20fc46d..b07779d 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/MesQcDefectController.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/defect/MesQcDefectController.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.mes.controller.admin.qc; +package cn.iocoder.yudao.module.mes.controller.admin.qc.defect; import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog; import cn.iocoder.yudao.framework.common.pojo.CommonResult; @@ -6,9 +6,9 @@ import cn.iocoder.yudao.framework.common.pojo.PageParam; import cn.iocoder.yudao.framework.common.pojo.PageResult; 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.qc.vo.MesQcDefectPageReqVO; -import cn.iocoder.yudao.module.mes.controller.admin.qc.vo.MesQcDefectRespVO; -import cn.iocoder.yudao.module.mes.controller.admin.qc.vo.MesQcDefectSaveReqVO; +import cn.iocoder.yudao.module.mes.controller.admin.qc.defect.vo.MesQcDefectPageReqVO; +import cn.iocoder.yudao.module.mes.controller.admin.qc.defect.vo.MesQcDefectRespVO; +import cn.iocoder.yudao.module.mes.controller.admin.qc.defect.vo.MesQcDefectSaveReqVO; import cn.iocoder.yudao.module.mes.dal.dataobject.qc.MesQcDefectDO; import cn.iocoder.yudao.module.mes.service.qc.MesQcDefectService; import io.swagger.v3.oas.annotations.Operation; diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/vo/MesQcDefectPageReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/defect/vo/MesQcDefectPageReqVO.java index 5605b14..388b02a 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/vo/MesQcDefectPageReqVO.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/defect/vo/MesQcDefectPageReqVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.mes.controller.admin.qc.vo; +package cn.iocoder.yudao.module.mes.controller.admin.qc.defect.vo; import cn.iocoder.yudao.framework.common.pojo.PageParam; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/vo/MesQcDefectRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/defect/vo/MesQcDefectRespVO.java index 6faa701..df80490 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/vo/MesQcDefectRespVO.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/defect/vo/MesQcDefectRespVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.mes.controller.admin.qc.vo; +package cn.iocoder.yudao.module.mes.controller.admin.qc.defect.vo; import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; import cn.iocoder.yudao.framework.excel.core.convert.DictConvert; diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/vo/MesQcDefectSaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/defect/vo/MesQcDefectSaveReqVO.java index 2d56b34..eac79f6 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/vo/MesQcDefectSaveReqVO.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/defect/vo/MesQcDefectSaveReqVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.mes.controller.admin.qc.vo; +package cn.iocoder.yudao.module.mes.controller.admin.qc.defect.vo; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotEmpty; diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/MesQcIndicatorController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/indicator/MesQcIndicatorController.java index d69d19c..0e48132 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/MesQcIndicatorController.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/indicator/MesQcIndicatorController.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.mes.controller.admin.qc; +package cn.iocoder.yudao.module.mes.controller.admin.qc.indicator; import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog; import cn.iocoder.yudao.framework.common.pojo.CommonResult; @@ -6,9 +6,9 @@ import cn.iocoder.yudao.framework.common.pojo.PageParam; import cn.iocoder.yudao.framework.common.pojo.PageResult; 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.qc.vo.MesQcIndicatorPageReqVO; -import cn.iocoder.yudao.module.mes.controller.admin.qc.vo.MesQcIndicatorRespVO; -import cn.iocoder.yudao.module.mes.controller.admin.qc.vo.MesQcIndicatorSaveReqVO; +import cn.iocoder.yudao.module.mes.controller.admin.qc.indicator.vo.MesQcIndicatorPageReqVO; +import cn.iocoder.yudao.module.mes.controller.admin.qc.indicator.vo.MesQcIndicatorRespVO; +import cn.iocoder.yudao.module.mes.controller.admin.qc.indicator.vo.MesQcIndicatorSaveReqVO; import cn.iocoder.yudao.module.mes.dal.dataobject.qc.MesQcIndicatorDO; import cn.iocoder.yudao.module.mes.service.qc.MesQcIndicatorService; import io.swagger.v3.oas.annotations.Operation; diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/vo/MesQcIndicatorPageReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/indicator/vo/MesQcIndicatorPageReqVO.java index f2c3270..7163000 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/vo/MesQcIndicatorPageReqVO.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/indicator/vo/MesQcIndicatorPageReqVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.mes.controller.admin.qc.vo; +package cn.iocoder.yudao.module.mes.controller.admin.qc.indicator.vo; import cn.iocoder.yudao.framework.common.pojo.PageParam; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/vo/MesQcIndicatorRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/indicator/vo/MesQcIndicatorRespVO.java index bdd7ffb..e2d7a76 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/vo/MesQcIndicatorRespVO.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/indicator/vo/MesQcIndicatorRespVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.mes.controller.admin.qc.vo; +package cn.iocoder.yudao.module.mes.controller.admin.qc.indicator.vo; import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; import cn.iocoder.yudao.framework.excel.core.convert.DictConvert; diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/vo/MesQcIndicatorSaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/indicator/vo/MesQcIndicatorSaveReqVO.java index b981f36..778d083 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/vo/MesQcIndicatorSaveReqVO.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/indicator/vo/MesQcIndicatorSaveReqVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.mes.controller.admin.qc.vo; +package cn.iocoder.yudao.module.mes.controller.admin.qc.indicator.vo; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotEmpty; diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/template/MesQcTemplateController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/template/MesQcTemplateController.java new file mode 100644 index 0000000..e9150e6 --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/template/MesQcTemplateController.java @@ -0,0 +1,201 @@ +package cn.iocoder.yudao.module.mes.controller.admin.qc.template; + +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.object.BeanUtils; +import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils; +import cn.iocoder.yudao.module.mes.controller.admin.qc.template.vo.MesQcTemplatePageReqVO; +import cn.iocoder.yudao.module.mes.controller.admin.qc.template.vo.MesQcTemplateRespVO; +import cn.iocoder.yudao.module.mes.controller.admin.qc.template.vo.MesQcTemplateSaveReqVO; +import cn.iocoder.yudao.module.mes.controller.admin.qc.template.vo.indicator.MesQcTemplateIndicatorPageReqVO; +import cn.iocoder.yudao.module.mes.controller.admin.qc.template.vo.indicator.MesQcTemplateIndicatorRespVO; +import cn.iocoder.yudao.module.mes.controller.admin.qc.template.vo.indicator.MesQcTemplateIndicatorSaveReqVO; +import cn.iocoder.yudao.module.mes.controller.admin.qc.template.vo.item.MesQcTemplateItemPageReqVO; +import cn.iocoder.yudao.module.mes.controller.admin.qc.template.vo.item.MesQcTemplateItemRespVO; +import cn.iocoder.yudao.module.mes.controller.admin.qc.template.vo.item.MesQcTemplateItemSaveReqVO; +import cn.iocoder.yudao.module.mes.dal.dataobject.qc.MesQcTemplateDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.qc.MesQcTemplateIndicatorDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.qc.MesQcTemplateItemDO; +import cn.iocoder.yudao.module.mes.service.qc.MesQcTemplateService; +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.List; + +import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT; +import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; + +@Tag(name = "管理后台 - MES 质检方案") +@RestController +@RequestMapping("/mes/qc/template") +@Validated +public class MesQcTemplateController { + + @Resource + private MesQcTemplateService templateService; + + // ========== 质检方案主表 ========== + + @PostMapping("/create") + @Operation(summary = "创建质检方案") + @PreAuthorize("@ss.hasPermission('mes:qc-template:create')") + public CommonResult createTemplate(@Valid @RequestBody MesQcTemplateSaveReqVO createReqVO) { + return success(templateService.createTemplate(createReqVO)); + } + + @PutMapping("/update") + @Operation(summary = "更新质检方案") + @PreAuthorize("@ss.hasPermission('mes:qc-template:update')") + public CommonResult updateTemplate(@Valid @RequestBody MesQcTemplateSaveReqVO updateReqVO) { + templateService.updateTemplate(updateReqVO); + return success(true); + } + + @DeleteMapping("/delete") + @Operation(summary = "删除质检方案") + @Parameter(name = "id", description = "编号", required = true) + @PreAuthorize("@ss.hasPermission('mes:qc-template:delete')") + public CommonResult deleteTemplate(@RequestParam("id") Long id) { + templateService.deleteTemplate(id); + return success(true); + } + + @GetMapping("/get") + @Operation(summary = "获得质检方案") + @Parameter(name = "id", description = "编号", required = true, example = "1024") + @PreAuthorize("@ss.hasPermission('mes:qc-template:query')") + public CommonResult getTemplate(@RequestParam("id") Long id) { + MesQcTemplateDO template = templateService.getTemplate(id); + return success(BeanUtils.toBean(template, MesQcTemplateRespVO.class)); + } + + @GetMapping("/page") + @Operation(summary = "获得质检方案分页") + @PreAuthorize("@ss.hasPermission('mes:qc-template:query')") + public CommonResult> getTemplatePage(@Valid MesQcTemplatePageReqVO pageReqVO) { + PageResult pageResult = templateService.getTemplatePage(pageReqVO); + return success(BeanUtils.toBean(pageResult, MesQcTemplateRespVO.class)); + } + + @GetMapping("/simple-list") + @Operation(summary = "获得质检方案精简列表", description = "主要用于前端的下拉选项") + public CommonResult> getTemplateSimpleList() { + List list = templateService.getTemplateList(); + return success(BeanUtils.toBean(list, MesQcTemplateRespVO.class)); + } + + @GetMapping("/export-excel") + @Operation(summary = "导出质检方案 Excel") + @PreAuthorize("@ss.hasPermission('mes:qc-template:export')") + @ApiAccessLog(operateType = EXPORT) + public void exportTemplateExcel(@Valid MesQcTemplatePageReqVO pageReqVO, + HttpServletResponse response) throws IOException { + pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); + List list = templateService.getTemplatePage(pageReqVO).getList(); + ExcelUtils.write(response, "质检方案.xls", "数据", MesQcTemplateRespVO.class, + BeanUtils.toBean(list, MesQcTemplateRespVO.class)); + } + + // ========== 质检方案-检测指标项 ========== + + // TODO @AI：是不是拆分成独立的 controller；类似别的模块 + + @PostMapping("/indicator/create") + @Operation(summary = "创建质检方案-检测指标项") + @PreAuthorize("@ss.hasPermission('mes:qc-template:create')") + public CommonResult createTemplateIndicator(@Valid @RequestBody MesQcTemplateIndicatorSaveReqVO createReqVO) { + return success(templateService.createTemplateIndicator(createReqVO)); + } + + @PutMapping("/indicator/update") + @Operation(summary = "更新质检方案-检测指标项") + @PreAuthorize("@ss.hasPermission('mes:qc-template:update')") + public CommonResult updateTemplateIndicator(@Valid @RequestBody MesQcTemplateIndicatorSaveReqVO updateReqVO) { + templateService.updateTemplateIndicator(updateReqVO); + return success(true); + } + + @DeleteMapping("/indicator/delete") + @Operation(summary = "删除质检方案-检测指标项") + @Parameter(name = "id", description = "编号", required = true) + @PreAuthorize("@ss.hasPermission('mes:qc-template:update')") + public CommonResult deleteTemplateIndicator(@RequestParam("id") Long id) { + templateService.deleteTemplateIndicator(id); + return success(true); + } + + @GetMapping("/indicator/get") + @Operation(summary = "获得质检方案-检测指标项") + @Parameter(name = "id", description = "编号", required = true, example = "1024") + @PreAuthorize("@ss.hasPermission('mes:qc-template:query')") + public CommonResult getTemplateIndicator(@RequestParam("id") Long id) { + MesQcTemplateIndicatorDO indicator = templateService.getTemplateIndicator(id); + return success(BeanUtils.toBean(indicator, MesQcTemplateIndicatorRespVO.class)); + } + + @GetMapping("/indicator/page") + @Operation(summary = "获得质检方案-检测指标项分页") + @PreAuthorize("@ss.hasPermission('mes:qc-template:query')") + public CommonResult> getTemplateIndicatorPage( + @Valid MesQcTemplateIndicatorPageReqVO pageReqVO) { + PageResult pageResult = templateService.getTemplateIndicatorPage(pageReqVO); + return success(BeanUtils.toBean(pageResult, MesQcTemplateIndicatorRespVO.class)); + } + + // ========== 质检方案-产品关联 ========== + + // TODO @AI：是不是拆分成独立的 controller；类似别的模块 + + @PostMapping("/item/create") + @Operation(summary = "创建质检方案-产品关联") + @PreAuthorize("@ss.hasPermission('mes:qc-template:create')") + public CommonResult createTemplateItem(@Valid @RequestBody MesQcTemplateItemSaveReqVO createReqVO) { + return success(templateService.createTemplateItem(createReqVO)); + } + + @PutMapping("/item/update") + @Operation(summary = "更新质检方案-产品关联") + @PreAuthorize("@ss.hasPermission('mes:qc-template:update')") + public CommonResult updateTemplateItem(@Valid @RequestBody MesQcTemplateItemSaveReqVO updateReqVO) { + templateService.updateTemplateItem(updateReqVO); + return success(true); + } + + @DeleteMapping("/item/delete") + @Operation(summary = "删除质检方案-产品关联") + @Parameter(name = "id", description = "编号", required = true) + @PreAuthorize("@ss.hasPermission('mes:qc-template:update')") + public CommonResult deleteTemplateItem(@RequestParam("id") Long id) { + templateService.deleteTemplateItem(id); + return success(true); + } + + @GetMapping("/item/get") + @Operation(summary = "获得质检方案-产品关联") + @Parameter(name = "id", description = "编号", required = true, example = "1024") + @PreAuthorize("@ss.hasPermission('mes:qc-template:query')") + public CommonResult getTemplateItem(@RequestParam("id") Long id) { + MesQcTemplateItemDO item = templateService.getTemplateItem(id); + return success(BeanUtils.toBean(item, MesQcTemplateItemRespVO.class)); + } + + @GetMapping("/item/page") + @Operation(summary = "获得质检方案-产品关联分页") + @PreAuthorize("@ss.hasPermission('mes:qc-template:query')") + public CommonResult> getTemplateItemPage( + @Valid MesQcTemplateItemPageReqVO pageReqVO) { + PageResult pageResult = templateService.getTemplateItemPage(pageReqVO); + return success(BeanUtils.toBean(pageResult, MesQcTemplateItemRespVO.class)); + } + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/template/vo/MesQcTemplatePageReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/template/vo/MesQcTemplatePageReqVO.java new file mode 100644 index 0000000..b2b81f0 --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/template/vo/MesQcTemplatePageReqVO.java @@ -0,0 +1,29 @@ +package cn.iocoder.yudao.module.mes.controller.admin.qc.template.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 MesQcTemplatePageReqVO extends PageParam { + + @Schema(description = "方案编号", example = "QCT001") + private String code; + + @Schema(description = "方案名称", example = "出货检验") + private String name; + + // TODO @AI：会用 List + @Schema(description = "检测种类（模糊匹配）", example = "IQC") + private String types; + + // TODO @AI：使用 Boolean； + @Schema(description = "是否启用（Y/N）", example = "Y") + private String enableFlag; + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/template/vo/MesQcTemplateRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/template/vo/MesQcTemplateRespVO.java new file mode 100644 index 0000000..366e6aa --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/template/vo/MesQcTemplateRespVO.java @@ -0,0 +1,45 @@ +package cn.iocoder.yudao.module.mes.controller.admin.qc.template.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 MesQcTemplateRespVO { + + @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") + @ExcelProperty("编号") + private Long id; + + @Schema(description = "方案编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "QCT001") + @ExcelProperty("方案编号") + private String code; + + @Schema(description = "方案名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "成品出货检验方案") + @ExcelProperty("方案名称") + private String name; + + // TODO @AI：会用 List；这里不用 （逗号分隔：IQC,IPQC,OQC,RQC） 注释； + @Schema(description = "检测种类（逗号分隔：IQC,IPQC,OQC,RQC）", requiredMode = Schema.RequiredMode.REQUIRED, example = "IQC,OQC") + @ExcelProperty("检测种类") + private String types; + + // TODO @AI：Boolean； + @Schema(description = "是否启用（Y/N）", requiredMode = Schema.RequiredMode.REQUIRED, example = "Y") + @ExcelProperty("是否启用") + private String enableFlag; + + @Schema(description = "备注", example = "备注") + @ExcelProperty("备注") + private String remark; + + @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/qc/template/vo/MesQcTemplateSaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/template/vo/MesQcTemplateSaveReqVO.java new file mode 100644 index 0000000..3c05c78 --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/template/vo/MesQcTemplateSaveReqVO.java @@ -0,0 +1,35 @@ +package cn.iocoder.yudao.module.mes.controller.admin.qc.template.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotEmpty; +import lombok.Data; + +@Schema(description = "管理后台 - MES 质检方案新增/修改 Request VO") +@Data +public class MesQcTemplateSaveReqVO { + + @Schema(description = "编号", example = "1024") + private Long id; + + @Schema(description = "方案编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "QCT001") + @NotEmpty(message = "方案编号不能为空") + private String code; + + @Schema(description = "方案名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "成品出货检验方案") + @NotEmpty(message = "方案名称不能为空") + private String name; + + // TODO @AI：会用 List；这里不用 （逗号分隔：IQC,IPQC,OQC,RQC） 注释； + @Schema(description = "检测种类（逗号分隔：IQC,IPQC,OQC,RQC）", requiredMode = Schema.RequiredMode.REQUIRED, example = "IQC,OQC") + @NotEmpty(message = "检测种类不能为空") + private String types; + + // TODO @AI：Boolean； + @Schema(description = "是否启用（Y/N）", requiredMode = Schema.RequiredMode.REQUIRED, example = "Y") + @NotEmpty(message = "是否启用不能为空") + private String enableFlag; + + @Schema(description = "备注", example = "备注") + private String remark; + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/template/vo/indicator/MesQcTemplateIndicatorPageReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/template/vo/indicator/MesQcTemplateIndicatorPageReqVO.java new file mode 100644 index 0000000..87be92f --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/template/vo/indicator/MesQcTemplateIndicatorPageReqVO.java @@ -0,0 +1,20 @@ +package cn.iocoder.yudao.module.mes.controller.admin.qc.template.vo.indicator; + +import cn.iocoder.yudao.framework.common.pojo.PageParam; +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotNull; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; + +@Schema(description = "管理后台 - MES 质检方案-检测指标项分页 Request VO") +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class MesQcTemplateIndicatorPageReqVO extends PageParam { + + @Schema(description = "质检方案ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") + @NotNull(message = "质检方案ID不能为空") + private Long templateId; + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/template/vo/indicator/MesQcTemplateIndicatorRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/template/vo/indicator/MesQcTemplateIndicatorRespVO.java new file mode 100644 index 0000000..2829b58 --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/template/vo/indicator/MesQcTemplateIndicatorRespVO.java @@ -0,0 +1,58 @@ +package cn.iocoder.yudao.module.mes.controller.admin.qc.template.vo.indicator; + +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.math.BigDecimal; +import java.time.LocalDateTime; + +@Schema(description = "管理后台 - MES 质检方案-检测指标项 Response VO") +@Data +@ExcelIgnoreUnannotated +public class MesQcTemplateIndicatorRespVO { + + @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") + @ExcelProperty("编号") + private Long id; + + @Schema(description = "质检方案ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") + private Long templateId; + + @Schema(description = "质检指标ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") + @ExcelProperty("质检指标ID") + private Long indicatorId; + + @Schema(description = "检测方法/检测要求", example = "目视检查外观") + @ExcelProperty("检测方法") + private String checkMethod; + + @Schema(description = "标准值", example = "10.0000") + @ExcelProperty("标准值") + private BigDecimal standardValue; + + @Schema(description = "单位", example = "mm") + @ExcelProperty("单位") + private String unit; + + @Schema(description = "误差上限", example = "10.5000") + @ExcelProperty("误差上限") + private BigDecimal thresholdMax; + + @Schema(description = "误差下限", example = "9.5000") + @ExcelProperty("误差下限") + private BigDecimal thresholdMin; + + @Schema(description = "说明图URL", example = "https://example.com/doc.png") + private String docUrl; + + @Schema(description = "备注", example = "备注") + @ExcelProperty("备注") + private String remark; + + @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/qc/template/vo/indicator/MesQcTemplateIndicatorSaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/template/vo/indicator/MesQcTemplateIndicatorSaveReqVO.java new file mode 100644 index 0000000..0e39f86 --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/template/vo/indicator/MesQcTemplateIndicatorSaveReqVO.java @@ -0,0 +1,48 @@ +package cn.iocoder.yudao.module.mes.controller.admin.qc.template.vo.indicator; + +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 MesQcTemplateIndicatorSaveReqVO { + + @Schema(description = "编号", example = "1024") + private Long id; + + @Schema(description = "质检方案ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") + @NotNull(message = "质检方案ID不能为空") + private Long templateId; + + /** + * TODO @芋艿：等 qc_indicator 完成后，改为选择器，此处改为 @NotNull 强校验 + */ + @Schema(description = "质检指标ID（关联 mes_qc_indicator）", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") + @NotNull(message = "质检指标ID不能为空") + private Long indicatorId; + + @Schema(description = "检测方法/检测要求", example = "目视检查外观") + private String checkMethod; + + @Schema(description = "标准值", example = "10.0000") + private BigDecimal standardValue; + + @Schema(description = "单位", example = "mm") + private String unit; + + @Schema(description = "误差上限", example = "10.5000") + private BigDecimal thresholdMax; + + @Schema(description = "误差下限", example = "9.5000") + private BigDecimal thresholdMin; + + @Schema(description = "说明图URL", example = "https://example.com/doc.png") + private String docUrl; + + @Schema(description = "备注", example = "备注") + private String remark; + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/template/vo/item/MesQcTemplateItemPageReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/template/vo/item/MesQcTemplateItemPageReqVO.java new file mode 100644 index 0000000..0ef17e3 --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/template/vo/item/MesQcTemplateItemPageReqVO.java @@ -0,0 +1,20 @@ +package cn.iocoder.yudao.module.mes.controller.admin.qc.template.vo.item; + +import cn.iocoder.yudao.framework.common.pojo.PageParam; +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotNull; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; + +@Schema(description = "管理后台 - MES 质检方案-产品关联分页 Request VO") +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class MesQcTemplateItemPageReqVO extends PageParam { + + @Schema(description = "质检方案ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") + @NotNull(message = "质检方案ID不能为空") + private Long templateId; + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/template/vo/item/MesQcTemplateItemRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/template/vo/item/MesQcTemplateItemRespVO.java new file mode 100644 index 0000000..3b49f6e --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/template/vo/item/MesQcTemplateItemRespVO.java @@ -0,0 +1,58 @@ +package cn.iocoder.yudao.module.mes.controller.admin.qc.template.vo.item; + +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.math.BigDecimal; +import java.time.LocalDateTime; + +@Schema(description = "管理后台 - MES 质检方案-产品关联 Response VO") +@Data +@ExcelIgnoreUnannotated +public class MesQcTemplateItemRespVO { + + @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") + @ExcelProperty("编号") + private Long id; + + @Schema(description = "质检方案ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") + private Long templateId; + + @Schema(description = "产品物料ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") + @ExcelProperty("产品物料ID") + private Long itemId; + + @Schema(description = "最低检测数", example = "5") + @ExcelProperty("最低检测数") + private Integer quantityCheck; + + // TODO @AI：VO 里，（0=不启用） 去掉 + @Schema(description = "最大不合格数（0=不启用）", example = "0") + @ExcelProperty("最大不合格数") + private Integer quantityUnqualified; + + // TODO @AI：VO 里，（0=不允许） 去掉 + @Schema(description = "最大致命缺陷率（%，0=不允许）", example = "0") + @ExcelProperty("致命缺陷率%") + private BigDecimal criticalRate; + + // TODO @AI：VO 里，（0=不允许） 去掉 + @Schema(description = "最大严重缺陷率（%，0=不允许）", example = "0") + @ExcelProperty("严重缺陷率%") + private BigDecimal majorRate; + + @Schema(description = "最大轻微缺陷率（%）", example = "100") + @ExcelProperty("轻微缺陷率%") + private BigDecimal minorRate; + + @Schema(description = "备注", example = "备注") + @ExcelProperty("备注") + private String remark; + + @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/qc/template/vo/item/MesQcTemplateItemSaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/template/vo/item/MesQcTemplateItemSaveReqVO.java new file mode 100644 index 0000000..fe235fc --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/template/vo/item/MesQcTemplateItemSaveReqVO.java @@ -0,0 +1,45 @@ +package cn.iocoder.yudao.module.mes.controller.admin.qc.template.vo.item; + +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 MesQcTemplateItemSaveReqVO { + + @Schema(description = "编号", example = "1024") + private Long id; + + @Schema(description = "质检方案ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") + @NotNull(message = "质检方案ID不能为空") + private Long templateId; + + @Schema(description = "产品物料ID（关联 mes_md_item）", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") + @NotNull(message = "产品物料ID不能为空") + private Long itemId; + + @Schema(description = "最低检测数", example = "5") + private Integer quantityCheck; + + // TODO @AI：VO 里，（0=不启用） 去掉 + @Schema(description = "最大不合格数（0=不启用）", example = "0") + private Integer quantityUnqualified; + + // TODO @AI：VO 里，（0=不允许） 去掉 + @Schema(description = "最大致命缺陷率（%，0=不允许）", example = "0") + private BigDecimal criticalRate; + + // TODO @AI：VO 里，（0=不允许） 去掉 + @Schema(description = "最大严重缺陷率（%，0=不允许）", example = "0") + private BigDecimal majorRate; + + @Schema(description = "最大轻微缺陷率（%）", example = "100") + private BigDecimal minorRate; + + @Schema(description = "备注", example = "备注") + private String remark; + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/cal/MesCalPlanDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/cal/plan/MesCalPlanDO.java index 6e88aab..56d0049 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/cal/MesCalPlanDO.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/cal/plan/MesCalPlanDO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.mes.dal.dataobject.cal; +package cn.iocoder.yudao.module.mes.dal.dataobject.cal.plan; import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; import cn.iocoder.yudao.module.mes.enums.cal.MesCalCalendarTypeEnum; diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/cal/MesCalPlanShiftDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/cal/plan/MesCalPlanShiftDO.java index 2165f9c..e287f11 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/cal/MesCalPlanShiftDO.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/cal/plan/MesCalPlanShiftDO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.mes.dal.dataobject.cal; +package cn.iocoder.yudao.module.mes.dal.dataobject.cal.plan; import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; import com.baomidou.mybatisplus.annotation.KeySequence; diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/cal/MesCalPlanTeamDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/cal/plan/MesCalPlanTeamDO.java index 784724c..b66c0dc 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/cal/MesCalPlanTeamDO.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/cal/plan/MesCalPlanTeamDO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.mes.dal.dataobject.cal; +package cn.iocoder.yudao.module.mes.dal.dataobject.cal.plan; import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; import com.baomidou.mybatisplus.annotation.KeySequence; @@ -35,7 +35,7 @@ public class MesCalPlanTeamDO extends BaseDO { /** * 班组编号 * - * TODO @芋艿：关联 cal_team 表，等 cal_team 迁移后补充 + * TODO @AI：关联 cal_team 表，等 cal_team 迁移后补充 */ private Long teamId; /** diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/pro/workorder/MesProWorkorderBomDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/pro/workorder/MesProWorkorderBomDO.java index 38318c3..1019a49 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/pro/workorder/MesProWorkorderBomDO.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/pro/workorder/MesProWorkorderBomDO.java @@ -15,15 +15,15 @@ import java.math.BigDecimal; * * @author 芋道源码 */ -@TableName("mes_pro_workorder_bom") -@KeySequence("mes_pro_workorder_bom_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 +@TableName("mes_pro_work_order_bom") +@KeySequence("mes_pro_work_order_bom_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 @Data @EqualsAndHashCode(callSuper = true) @ToString(callSuper = true) @Builder @NoArgsConstructor @AllArgsConstructor -public class MesProWorkorderBomDO extends BaseDO { +public class MesProWorkOrderBomDO extends BaseDO { /** * 编号 @@ -33,9 +33,9 @@ public class MesProWorkorderBomDO extends BaseDO { /** * 生产工单编号 * - * 关联 {@link MesProWorkorderDO#getId()} + * 关联 {@link MesProWorkOrderDO#getId()} */ - private Long workorderId; + private Long workOrderId; /** * BOM 物料编号 * @@ -48,11 +48,6 @@ public class MesProWorkorderBomDO extends BaseDO { * 关联 {@link MesMdUnitMeasureDO#getId()} */ private Long unitMeasureId; - // TODO @AI：需要存储么？还是使用 itemId 的冗余？ - /** - * 物料产品标识 - */ - private String itemOrProduct; /** * 预计使用量 */ diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/pro/workorder/MesProWorkorderDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/pro/workorder/MesProWorkorderDO.java index c8332e1..68ad55f 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/pro/workorder/MesProWorkorderDO.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/pro/workorder/MesProWorkorderDO.java @@ -5,9 +5,9 @@ import cn.iocoder.yudao.module.mes.dal.dataobject.md.client.MesMdClientDO; 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.md.vendor.MesMdVendorDO; -import cn.iocoder.yudao.module.mes.enums.pro.MesProWorkorderSourceTypeEnum; -import cn.iocoder.yudao.module.mes.enums.pro.MesProWorkorderStatusEnum; -import cn.iocoder.yudao.module.mes.enums.pro.MesProWorkorderTypeEnum; +import cn.iocoder.yudao.module.mes.enums.pro.MesProWorkOrderSourceTypeEnum; +import cn.iocoder.yudao.module.mes.enums.pro.MesProWorkOrderStatusEnum; +import cn.iocoder.yudao.module.mes.enums.pro.MesProWorkOrderTypeEnum; import com.baomidou.mybatisplus.annotation.KeySequence; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -21,15 +21,15 @@ import java.time.LocalDateTime; * * @author 芋道源码 */ -@TableName("mes_pro_workorder") -@KeySequence("mes_pro_workorder_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 +@TableName("mes_pro_work_order") +@KeySequence("mes_pro_work_order_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 @Data @EqualsAndHashCode(callSuper = true) @ToString(callSuper = true) @Builder @NoArgsConstructor @AllArgsConstructor -public class MesProWorkorderDO extends BaseDO { +public class MesProWorkOrderDO extends BaseDO { /** * 编号 @@ -47,13 +47,13 @@ public class MesProWorkorderDO extends BaseDO { /** * 工单类型 * - * 枚举 {@link MesProWorkorderTypeEnum} + * 枚举 {@link MesProWorkOrderTypeEnum} */ private Integer type; /** * 来源类型 * - * 枚举 {@link MesProWorkorderSourceTypeEnum} + * 枚举 {@link MesProWorkOrderSourceTypeEnum} */ private Integer orderSourceType; /** @@ -111,14 +111,9 @@ public class MesProWorkorderDO extends BaseDO { /** * 父工单编号 * - * 关联 {@link MesProWorkorderDO#getId()} + * 关联 {@link MesProWorkOrderDO#getId()} */ private Long parentId; - // TODO @AI：panrentId？不用父节点编号； - /** - * 所有父节点编号 - */ - private String ancestors; /** * 完成时间 */ @@ -130,7 +125,7 @@ public class MesProWorkorderDO extends BaseDO { /** * 工单状态 * - * 枚举 {@link MesProWorkorderStatusEnum} + * 枚举 {@link MesProWorkOrderStatusEnum} */ private Integer status; /** diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/cal/plan/MesCalPlanMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/cal/plan/MesCalPlanMapper.java index 9d2ecad..fe27ac8 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/cal/plan/MesCalPlanMapper.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/cal/plan/MesCalPlanMapper.java @@ -4,7 +4,7 @@ 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.cal.plan.vo.MesCalPlanPageReqVO; -import cn.iocoder.yudao.module.mes.dal.dataobject.cal.MesCalPlanDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.cal.plan.MesCalPlanDO; import org.apache.ibatis.annotations.Mapper; /** diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/cal/plan/MesCalPlanShiftMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/cal/plan/MesCalPlanShiftMapper.java index ce87857..d778a21 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/cal/plan/MesCalPlanShiftMapper.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/cal/plan/MesCalPlanShiftMapper.java @@ -4,7 +4,7 @@ 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.cal.plan.vo.shift.MesCalPlanShiftPageReqVO; -import cn.iocoder.yudao.module.mes.dal.dataobject.cal.MesCalPlanShiftDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.cal.plan.MesCalPlanShiftDO; import org.apache.ibatis.annotations.Mapper; import java.util.List; diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/cal/plan/MesCalPlanTeamMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/cal/plan/MesCalPlanTeamMapper.java index b4c880e..45450b8 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/cal/plan/MesCalPlanTeamMapper.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/cal/plan/MesCalPlanTeamMapper.java @@ -2,7 +2,7 @@ package cn.iocoder.yudao.module.mes.dal.mysql.cal.plan; import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; -import cn.iocoder.yudao.module.mes.dal.dataobject.cal.MesCalPlanTeamDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.cal.plan.MesCalPlanTeamDO; import org.apache.ibatis.annotations.Mapper; import java.util.List; diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/pro/workorder/MesProWorkorderBomMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/pro/workorder/MesProWorkorderBomMapper.java index 089d6f2..28f6f60 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/pro/workorder/MesProWorkorderBomMapper.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/pro/workorder/MesProWorkorderBomMapper.java @@ -3,8 +3,8 @@ package cn.iocoder.yudao.module.mes.dal.mysql.pro.workorder; 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.pro.workorder.vo.bom.MesProWorkorderBomPageReqVO; -import cn.iocoder.yudao.module.mes.dal.dataobject.pro.workorder.MesProWorkorderBomDO; +import cn.iocoder.yudao.module.mes.controller.admin.pro.workorder.vo.bom.MesProWorkOrderBomPageReqVO; +import cn.iocoder.yudao.module.mes.dal.dataobject.pro.workorder.MesProWorkOrderBomDO; import org.apache.ibatis.annotations.Mapper; import java.util.List; @@ -15,20 +15,20 @@ import java.util.List; * @author 芋道源码 */ @Mapper -public interface MesProWorkorderBomMapper extends BaseMapperX { +public interface MesProWorkOrderBomMapper extends BaseMapperX { - default PageResult selectPage(MesProWorkorderBomPageReqVO reqVO) { - return selectPage(reqVO, new LambdaQueryWrapperX() - .eqIfPresent(MesProWorkorderBomDO::getWorkorderId, reqVO.getWorkorderId()) - .orderByDesc(MesProWorkorderBomDO::getId)); + default PageResult selectPage(MesProWorkOrderBomPageReqVO reqVO) { + return selectPage(reqVO, new LambdaQueryWrapperX() + .eqIfPresent(MesProWorkOrderBomDO::getWorkOrderId, reqVO.getWorkOrderId()) + .orderByDesc(MesProWorkOrderBomDO::getId)); } - default List selectListByWorkorderId(Long workorderId) { - return selectList(MesProWorkorderBomDO::getWorkorderId, workorderId); + default List selectListByWorkOrderId(Long workOrderId) { + return selectList(MesProWorkOrderBomDO::getWorkOrderId, workOrderId); } - default void deleteByWorkorderId(Long workorderId) { - delete(MesProWorkorderBomDO::getWorkorderId, workorderId); + default void deleteByWorkOrderId(Long workOrderId) { + delete(MesProWorkOrderBomDO::getWorkOrderId, workOrderId); } } diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/pro/workorder/MesProWorkorderMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/pro/workorder/MesProWorkorderMapper.java index e76b8b9..c4539b6 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/pro/workorder/MesProWorkorderMapper.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/pro/workorder/MesProWorkorderMapper.java @@ -3,8 +3,8 @@ package cn.iocoder.yudao.module.mes.dal.mysql.pro.workorder; 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.pro.workorder.vo.MesProWorkorderPageReqVO; -import cn.iocoder.yudao.module.mes.dal.dataobject.pro.workorder.MesProWorkorderDO; +import cn.iocoder.yudao.module.mes.controller.admin.pro.workorder.vo.MesProWorkOrderPageReqVO; +import cn.iocoder.yudao.module.mes.dal.dataobject.pro.workorder.MesProWorkOrderDO; import org.apache.ibatis.annotations.Mapper; /** @@ -13,23 +13,23 @@ import org.apache.ibatis.annotations.Mapper; * @author 芋道源码 */ @Mapper -public interface MesProWorkorderMapper extends BaseMapperX { +public interface MesProWorkOrderMapper extends BaseMapperX { - default PageResult selectPage(MesProWorkorderPageReqVO reqVO) { - return selectPage(reqVO, new LambdaQueryWrapperX() - .likeIfPresent(MesProWorkorderDO::getCode, reqVO.getCode()) - .likeIfPresent(MesProWorkorderDO::getName, reqVO.getName()) - .eqIfPresent(MesProWorkorderDO::getType, reqVO.getType()) - .eqIfPresent(MesProWorkorderDO::getOrderSourceType, reqVO.getOrderSourceType()) - .eqIfPresent(MesProWorkorderDO::getProductId, reqVO.getProductId()) - .eqIfPresent(MesProWorkorderDO::getClientId, reqVO.getClientId()) - .eqIfPresent(MesProWorkorderDO::getStatus, reqVO.getStatus()) - .betweenIfPresent(MesProWorkorderDO::getRequestDate, reqVO.getRequestDate()) - .orderByDesc(MesProWorkorderDO::getId)); + default PageResult selectPage(MesProWorkOrderPageReqVO reqVO) { + return selectPage(reqVO, new LambdaQueryWrapperX() + .likeIfPresent(MesProWorkOrderDO::getCode, reqVO.getCode()) + .likeIfPresent(MesProWorkOrderDO::getName, reqVO.getName()) + .eqIfPresent(MesProWorkOrderDO::getType, reqVO.getType()) + .eqIfPresent(MesProWorkOrderDO::getOrderSourceType, reqVO.getOrderSourceType()) + .eqIfPresent(MesProWorkOrderDO::getProductId, reqVO.getProductId()) + .eqIfPresent(MesProWorkOrderDO::getClientId, reqVO.getClientId()) + .eqIfPresent(MesProWorkOrderDO::getStatus, reqVO.getStatus()) + .betweenIfPresent(MesProWorkOrderDO::getRequestDate, reqVO.getRequestDate()) + .orderByDesc(MesProWorkOrderDO::getId)); } - default MesProWorkorderDO selectByCode(String code) { - return selectOne(MesProWorkorderDO::getCode, code); + default MesProWorkOrderDO selectByCode(String code) { + return selectOne(MesProWorkOrderDO::getCode, code); } } diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/qc/MesQcDefectMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/qc/MesQcDefectMapper.java index 6ff07a3..1c2251c 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/qc/MesQcDefectMapper.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/qc/MesQcDefectMapper.java @@ -3,7 +3,7 @@ package cn.iocoder.yudao.module.mes.dal.mysql.qc; 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.qc.vo.MesQcDefectPageReqVO; +import cn.iocoder.yudao.module.mes.controller.admin.qc.defect.vo.MesQcDefectPageReqVO; import cn.iocoder.yudao.module.mes.dal.dataobject.qc.MesQcDefectDO; import org.apache.ibatis.annotations.Mapper; diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/qc/MesQcIndicatorMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/qc/MesQcIndicatorMapper.java index 247b1d0..4bac9b4 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/qc/MesQcIndicatorMapper.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/qc/MesQcIndicatorMapper.java @@ -3,7 +3,7 @@ package cn.iocoder.yudao.module.mes.dal.mysql.qc; 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.qc.vo.MesQcIndicatorPageReqVO; +import cn.iocoder.yudao.module.mes.controller.admin.qc.indicator.vo.MesQcIndicatorPageReqVO; import cn.iocoder.yudao.module.mes.dal.dataobject.qc.MesQcIndicatorDO; import org.apache.ibatis.annotations.Mapper; diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/DictTypeConstants.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/DictTypeConstants.java index 8350ae2..73fcdb5 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/DictTypeConstants.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/DictTypeConstants.java @@ -23,5 +23,6 @@ public interface DictTypeConstants { String MES_PRO_WORKORDER_STATUS = "mes_pro_workorder_status"; // MES 生产工单状态 String MES_PRO_WORKORDER_SOURCE_TYPE = "mes_pro_workorder_source_type"; // MES 工单来源类型 String MES_PRO_WORKORDER_TYPE = "mes_pro_workorder_type"; // MES 工单类型 + String MES_QC_TYPE = "mes_qc_type"; // MES 检测种类（IQC/IPQC/OQC/RQC） } diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/ErrorCodeConstants.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/ErrorCodeConstants.java index dfd05ce..4cf14ef 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/ErrorCodeConstants.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/ErrorCodeConstants.java @@ -145,8 +145,14 @@ public interface ErrorCodeConstants { // ========== MES 生产管理-生产任务（1-040-503-000） ========== ErrorCode PRO_TASK_NOT_EXISTS = new ErrorCode(1_040_503_000, "生产任务不存在"); - // ========== MES 质量管理-检验模板（1-040-600-000） ========== - ErrorCode QC_TEMPLATE_NOT_EXISTS = new ErrorCode(1_040_600_000, "检验模板不存在"); + // ========== MES 质量管理-质检方案（1-040-600-000） ========== + ErrorCode QC_TEMPLATE_NOT_EXISTS = new ErrorCode(1_040_600_000, "质检方案不存在"); + ErrorCode QC_TEMPLATE_CODE_DUPLICATE = new ErrorCode(1_040_600_001, "质检方案编号已存在"); + // ========== MES 质量管理-质检方案检测指标项（1-040-600-100） ========== + ErrorCode QC_TEMPLATE_INDICATOR_NOT_EXISTS = new ErrorCode(1_040_600_100, "质检方案检测指标项不存在"); + // ========== MES 质量管理-质检方案产品关联（1-040-600-200） ========== + ErrorCode QC_TEMPLATE_ITEM_NOT_EXISTS = new ErrorCode(1_040_600_200, "质检方案产品关联不存在"); + ErrorCode QC_TEMPLATE_ITEM_DUPLICATE = new ErrorCode(1_040_600_201, "该产品已关联此质检方案"); // ========== MES 质量管理-质检指标（1-040-601-000） ========== ErrorCode QC_INDICATOR_NOT_EXISTS = new ErrorCode(1_040_601_000, "质检指标不存在"); diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/pro/MesProWorkorderSourceTypeEnum.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/pro/MesProWorkorderSourceTypeEnum.java index 7ee14b9..47836b7 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/pro/MesProWorkorderSourceTypeEnum.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/pro/MesProWorkorderSourceTypeEnum.java @@ -13,12 +13,12 @@ import java.util.Arrays; */ @Getter @AllArgsConstructor -public enum MesProWorkorderSourceTypeEnum implements ArrayValuable { +public enum MesProWorkOrderSourceTypeEnum implements ArrayValuable { ORDER(1, "客户订单"), STORE(2, "库存备货"); - public static final Integer[] ARRAYS = Arrays.stream(values()).map(MesProWorkorderSourceTypeEnum::getType).toArray(Integer[]::new); + public static final Integer[] ARRAYS = Arrays.stream(values()).map(MesProWorkOrderSourceTypeEnum::getType).toArray(Integer[]::new); /** * 类型值 diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/pro/MesProWorkorderStatusEnum.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/pro/MesProWorkorderStatusEnum.java index 31ed0b7..1bd2ffa 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/pro/MesProWorkorderStatusEnum.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/pro/MesProWorkorderStatusEnum.java @@ -13,14 +13,14 @@ import java.util.Arrays; */ @Getter @AllArgsConstructor -public enum MesProWorkorderStatusEnum implements ArrayValuable { +public enum MesProWorkOrderStatusEnum implements ArrayValuable { PREPARE(0, "草稿"), CONFIRMED(1, "已确认"), FINISHED(2, "已完成"), CANCELED(3, "已取消"); - public static final Integer[] ARRAYS = Arrays.stream(values()).map(MesProWorkorderStatusEnum::getStatus).toArray(Integer[]::new); + public static final Integer[] ARRAYS = Arrays.stream(values()).map(MesProWorkOrderStatusEnum::getStatus).toArray(Integer[]::new); /** * 状态值 diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/pro/MesProWorkorderTypeEnum.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/pro/MesProWorkorderTypeEnum.java index 7681445..3c7b150 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/pro/MesProWorkorderTypeEnum.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/pro/MesProWorkorderTypeEnum.java @@ -13,13 +13,13 @@ import java.util.Arrays; */ @Getter @AllArgsConstructor -public enum MesProWorkorderTypeEnum implements ArrayValuable { +public enum MesProWorkOrderTypeEnum implements ArrayValuable { SELF(1, "自行生产"), OUTSOURCE(2, "代工"), PURCHASE(3, "采购"); - public static final Integer[] ARRAYS = Arrays.stream(values()).map(MesProWorkorderTypeEnum::getType).toArray(Integer[]::new); + public static final Integer[] ARRAYS = Arrays.stream(values()).map(MesProWorkOrderTypeEnum::getType).toArray(Integer[]::new); /** * 类型值 diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/cal/plan/MesCalPlanService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/cal/plan/MesCalPlanService.java index f42f0a1..1f97e55 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/cal/plan/MesCalPlanService.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/cal/plan/MesCalPlanService.java @@ -3,7 +3,7 @@ package cn.iocoder.yudao.module.mes.service.cal.plan; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.module.mes.controller.admin.cal.plan.vo.MesCalPlanPageReqVO; import cn.iocoder.yudao.module.mes.controller.admin.cal.plan.vo.MesCalPlanSaveReqVO; -import cn.iocoder.yudao.module.mes.dal.dataobject.cal.MesCalPlanDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.cal.plan.MesCalPlanDO; import jakarta.validation.Valid; /** diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/cal/plan/MesCalPlanServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/cal/plan/MesCalPlanServiceImpl.java index d28b262..2e94f0b 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/cal/plan/MesCalPlanServiceImpl.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/cal/plan/MesCalPlanServiceImpl.java @@ -4,7 +4,7 @@ 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.cal.plan.vo.MesCalPlanPageReqVO; import cn.iocoder.yudao.module.mes.controller.admin.cal.plan.vo.MesCalPlanSaveReqVO; -import cn.iocoder.yudao.module.mes.dal.dataobject.cal.MesCalPlanDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.cal.plan.MesCalPlanDO; import cn.iocoder.yudao.module.mes.dal.mysql.cal.plan.MesCalPlanMapper; import cn.iocoder.yudao.module.mes.enums.cal.MesCalPlanStatusEnum; import cn.iocoder.yudao.module.mes.enums.cal.MesCalShiftTypeEnum; diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/cal/plan/MesCalPlanShiftService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/cal/plan/MesCalPlanShiftService.java index c014a48..7fa3f39 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/cal/plan/MesCalPlanShiftService.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/cal/plan/MesCalPlanShiftService.java @@ -3,7 +3,7 @@ package cn.iocoder.yudao.module.mes.service.cal.plan; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.module.mes.controller.admin.cal.plan.vo.shift.MesCalPlanShiftPageReqVO; import cn.iocoder.yudao.module.mes.controller.admin.cal.plan.vo.shift.MesCalPlanShiftSaveReqVO; -import cn.iocoder.yudao.module.mes.dal.dataobject.cal.MesCalPlanShiftDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.cal.plan.MesCalPlanShiftDO; import jakarta.validation.Valid; import java.util.List; diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/cal/plan/MesCalPlanShiftServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/cal/plan/MesCalPlanShiftServiceImpl.java index a2e5692..910452e 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/cal/plan/MesCalPlanShiftServiceImpl.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/cal/plan/MesCalPlanShiftServiceImpl.java @@ -5,8 +5,8 @@ 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.cal.plan.vo.shift.MesCalPlanShiftPageReqVO; import cn.iocoder.yudao.module.mes.controller.admin.cal.plan.vo.shift.MesCalPlanShiftSaveReqVO; -import cn.iocoder.yudao.module.mes.dal.dataobject.cal.MesCalPlanDO; -import cn.iocoder.yudao.module.mes.dal.dataobject.cal.MesCalPlanShiftDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.cal.plan.MesCalPlanDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.cal.plan.MesCalPlanShiftDO; import cn.iocoder.yudao.module.mes.dal.mysql.cal.plan.MesCalPlanMapper; import cn.iocoder.yudao.module.mes.dal.mysql.cal.plan.MesCalPlanShiftMapper; import cn.iocoder.yudao.module.mes.enums.cal.MesCalShiftTypeEnum; diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/cal/plan/MesCalPlanTeamService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/cal/plan/MesCalPlanTeamService.java index 4d6cbf6..4a2392b 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/cal/plan/MesCalPlanTeamService.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/cal/plan/MesCalPlanTeamService.java @@ -1,7 +1,7 @@ package cn.iocoder.yudao.module.mes.service.cal.plan; import cn.iocoder.yudao.module.mes.controller.admin.cal.plan.vo.team.MesCalPlanTeamSaveReqVO; -import cn.iocoder.yudao.module.mes.dal.dataobject.cal.MesCalPlanTeamDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.cal.plan.MesCalPlanTeamDO; import jakarta.validation.Valid; import java.util.List; diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/cal/plan/MesCalPlanTeamServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/cal/plan/MesCalPlanTeamServiceImpl.java index bc50a96..fefe767 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/cal/plan/MesCalPlanTeamServiceImpl.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/cal/plan/MesCalPlanTeamServiceImpl.java @@ -2,7 +2,7 @@ package cn.iocoder.yudao.module.mes.service.cal.plan; import cn.iocoder.yudao.framework.common.util.object.BeanUtils; import cn.iocoder.yudao.module.mes.controller.admin.cal.plan.vo.team.MesCalPlanTeamSaveReqVO; -import cn.iocoder.yudao.module.mes.dal.dataobject.cal.MesCalPlanTeamDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.cal.plan.MesCalPlanTeamDO; import cn.iocoder.yudao.module.mes.dal.mysql.cal.plan.MesCalPlanTeamMapper; import jakarta.annotation.Resource; import org.springframework.context.annotation.Lazy; diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/md/item/MesMdItemService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/md/item/MesMdItemService.java index f2b7c26..1fe85c0 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/md/item/MesMdItemService.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/md/item/MesMdItemService.java @@ -52,6 +52,14 @@ public interface MesMdItemService { MesMdItemDO getItem(Long id); /** + * 校验物料产品存在 + * + * @param id 编号 + * @return 物料产品 + */ + MesMdItemDO validateItemExists(Long id); + + /** * 获得物料产品分页 * * @param pageReqVO 分页查询 diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/md/item/MesMdItemServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/md/item/MesMdItemServiceImpl.java index 106fb88..34d0655 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/md/item/MesMdItemServiceImpl.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/md/item/MesMdItemServiceImpl.java @@ -112,10 +112,13 @@ public class MesMdItemServiceImpl implements MesMdItemService { itemMapper.deleteById(id); } - private void validateItemExists(Long id) { - if (itemMapper.selectById(id) == null) { + @Override + public MesMdItemDO validateItemExists(Long id) { + MesMdItemDO item = itemMapper.selectById(id); + if (item == null) { throw exception(MD_ITEM_NOT_EXISTS); } + return item; } private void validateItemCodeUnique(Long id, String code) { diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/workorder/MesProWorkorderBomService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/workorder/MesProWorkorderBomService.java index b101a02..901c9c0 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/workorder/MesProWorkorderBomService.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/workorder/MesProWorkorderBomService.java @@ -1,9 +1,9 @@ package cn.iocoder.yudao.module.mes.service.pro.workorder; import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.mes.controller.admin.pro.workorder.vo.bom.MesProWorkorderBomPageReqVO; -import cn.iocoder.yudao.module.mes.controller.admin.pro.workorder.vo.bom.MesProWorkorderBomSaveReqVO; -import cn.iocoder.yudao.module.mes.dal.dataobject.pro.workorder.MesProWorkorderBomDO; +import cn.iocoder.yudao.module.mes.controller.admin.pro.workorder.vo.bom.MesProWorkOrderBomPageReqVO; +import cn.iocoder.yudao.module.mes.controller.admin.pro.workorder.vo.bom.MesProWorkOrderBomSaveReqVO; +import cn.iocoder.yudao.module.mes.dal.dataobject.pro.workorder.MesProWorkOrderBomDO; import jakarta.validation.Valid; import java.util.List; @@ -13,7 +13,7 @@ import java.util.List; * * @author 芋道源码 */ -public interface MesProWorkorderBomService { +public interface MesProWorkOrderBomService { /** * 创建工单 BOM @@ -21,21 +21,21 @@ public interface MesProWorkorderBomService { * @param createReqVO 创建信息 * @return 编号 */ - Long createWorkorderBom(@Valid MesProWorkorderBomSaveReqVO createReqVO); + Long createWorkOrderBom(@Valid MesProWorkOrderBomSaveReqVO createReqVO); /** * 更新工单 BOM * * @param updateReqVO 更新信息 */ - void updateWorkorderBom(@Valid MesProWorkorderBomSaveReqVO updateReqVO); + void updateWorkOrderBom(@Valid MesProWorkOrderBomSaveReqVO updateReqVO); /** * 删除工单 BOM * * @param id 编号 */ - void deleteWorkorderBom(Long id); + void deleteWorkOrderBom(Long id); /** * 获得工单 BOM @@ -43,7 +43,7 @@ public interface MesProWorkorderBomService { * @param id 编号 * @return 工单 BOM */ - MesProWorkorderBomDO getWorkorderBom(Long id); + MesProWorkOrderBomDO getWorkOrderBom(Long id); /** * 获得工单 BOM 分页 @@ -51,21 +51,21 @@ public interface MesProWorkorderBomService { * @param pageReqVO 分页查询 * @return 工单 BOM 分页 */ - PageResult getWorkorderBomPage(MesProWorkorderBomPageReqVO pageReqVO); + PageResult getWorkOrderBomPage(MesProWorkOrderBomPageReqVO pageReqVO); /** * 根据工单编号获得 BOM 列表 * - * @param workorderId 工单编号 + * @param workOrderId 工单编号 * @return BOM 列表 */ - List getWorkorderBomListByWorkorderId(Long workorderId); + List getWorkOrderBomListByWorkOrderId(Long workOrderId); /** * 根据工单编号删除 BOM * - * @param workorderId 工单编号 + * @param workOrderId 工单编号 */ - void deleteWorkorderBomByWorkorderId(Long workorderId); + void deleteWorkOrderBomByWorkOrderId(Long workOrderId); } diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/workorder/MesProWorkorderBomServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/workorder/MesProWorkorderBomServiceImpl.java index 105ec8e..1b369be 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/workorder/MesProWorkorderBomServiceImpl.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/workorder/MesProWorkorderBomServiceImpl.java @@ -2,18 +2,19 @@ package cn.iocoder.yudao.module.mes.service.pro.workorder; 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.pro.workorder.vo.bom.MesProWorkorderBomPageReqVO; -import cn.iocoder.yudao.module.mes.controller.admin.pro.workorder.vo.bom.MesProWorkorderBomSaveReqVO; -import cn.iocoder.yudao.module.mes.dal.dataobject.pro.workorder.MesProWorkorderBomDO; -import cn.iocoder.yudao.module.mes.dal.mysql.pro.workorder.MesProWorkorderBomMapper; +import cn.iocoder.yudao.module.mes.controller.admin.pro.workorder.vo.bom.MesProWorkOrderBomPageReqVO; +import cn.iocoder.yudao.module.mes.controller.admin.pro.workorder.vo.bom.MesProWorkOrderBomSaveReqVO; +import cn.iocoder.yudao.module.mes.dal.dataobject.pro.workorder.MesProWorkOrderBomDO; +import cn.iocoder.yudao.module.mes.dal.mysql.pro.workorder.MesProWorkOrderBomMapper; import jakarta.annotation.Resource; +import org.springframework.context.annotation.Lazy; 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.PRO_WORKORDER_BOM_NOT_EXISTS; +import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.PRO_WORK_ORDER_BOM_NOT_EXISTS; /** * MES 生产工单 BOM Service 实现类 @@ -22,60 +23,65 @@ import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.PRO_WORKORDER */ @Service @Validated -public class MesProWorkorderBomServiceImpl implements MesProWorkorderBomService { +public class MesProWorkOrderBomServiceImpl implements MesProWorkOrderBomService { @Resource - private MesProWorkorderBomMapper workorderBomMapper; + private MesProWorkOrderBomMapper workOrderBomMapper; + + @Resource + @Lazy // 延迟加载，避免循环依赖 + private MesProWorkOrderService workOrderService; @Override - public Long createWorkorderBom(MesProWorkorderBomSaveReqVO createReqVO) { - // TODO @AI：是不是要校验 workorder 存在？另外，大小写应该是 workOrder？ - MesProWorkorderBomDO workorderBom = BeanUtils.toBean(createReqVO, MesProWorkorderBomDO.class); - workorderBomMapper.insert(workorderBom); - return workorderBom.getId(); + public Long createWorkOrderBom(MesProWorkOrderBomSaveReqVO createReqVO) { + // 校验工单存在 + workOrderService.validateWorkOrderExists(createReqVO.getWorkOrderId()); + MesProWorkOrderBomDO workOrderBom = BeanUtils.toBean(createReqVO, MesProWorkOrderBomDO.class); + workOrderBomMapper.insert(workOrderBom); + return workOrderBom.getId(); } @Override - public void updateWorkorderBom(MesProWorkorderBomSaveReqVO updateReqVO) { + public void updateWorkOrderBom(MesProWorkOrderBomSaveReqVO updateReqVO) { // 校验存在 - validateWorkorderBomExists(updateReqVO.getId()); + validateWorkOrderBomExists(updateReqVO.getId()); // 更新 - MesProWorkorderBomDO updateObj = BeanUtils.toBean(updateReqVO, MesProWorkorderBomDO.class); - workorderBomMapper.updateById(updateObj); + MesProWorkOrderBomDO updateObj = BeanUtils.toBean(updateReqVO, MesProWorkOrderBomDO.class); + workOrderBomMapper.updateById(updateObj); } @Override - public void deleteWorkorderBom(Long id) { + public void deleteWorkOrderBom(Long id) { // 校验存在 - validateWorkorderBomExists(id); + validateWorkOrderBomExists(id); // 删除 - workorderBomMapper.deleteById(id); + workOrderBomMapper.deleteById(id); } - private void validateWorkorderBomExists(Long id) { - if (workorderBomMapper.selectById(id) == null) { - throw exception(PRO_WORKORDER_BOM_NOT_EXISTS); + private void validateWorkOrderBomExists(Long id) { + if (workOrderBomMapper.selectById(id) == null) { + throw exception(PRO_WORK_ORDER_BOM_NOT_EXISTS); } } @Override - public MesProWorkorderBomDO getWorkorderBom(Long id) { - return workorderBomMapper.selectById(id); + public MesProWorkOrderBomDO getWorkOrderBom(Long id) { + return workOrderBomMapper.selectById(id); } @Override - public PageResult getWorkorderBomPage(MesProWorkorderBomPageReqVO pageReqVO) { - return workorderBomMapper.selectPage(pageReqVO); + public PageResult getWorkOrderBomPage(MesProWorkOrderBomPageReqVO pageReqVO) { + return workOrderBomMapper.selectPage(pageReqVO); } @Override - public List getWorkorderBomListByWorkorderId(Long workorderId) { - return workorderBomMapper.selectListByWorkorderId(workorderId); + public List getWorkOrderBomListByWorkOrderId(Long workOrderId) { + return workOrderBomMapper.selectListByWorkOrderId(workOrderId); } @Override - public void deleteWorkorderBomByWorkorderId(Long workorderId) { - workorderBomMapper.deleteByWorkorderId(workorderId); + public void deleteWorkOrderBomByWorkOrderId(Long workOrderId) { + workOrderBomMapper.deleteByWorkOrderId(workOrderId); } } diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/workorder/MesProWorkorderService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/workorder/MesProWorkorderService.java index da2e117..02fc879 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/workorder/MesProWorkorderService.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/workorder/MesProWorkorderService.java @@ -1,9 +1,9 @@ package cn.iocoder.yudao.module.mes.service.pro.workorder; import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.mes.controller.admin.pro.workorder.vo.MesProWorkorderPageReqVO; -import cn.iocoder.yudao.module.mes.controller.admin.pro.workorder.vo.MesProWorkorderSaveReqVO; -import cn.iocoder.yudao.module.mes.dal.dataobject.pro.workorder.MesProWorkorderDO; +import cn.iocoder.yudao.module.mes.controller.admin.pro.workorder.vo.MesProWorkOrderPageReqVO; +import cn.iocoder.yudao.module.mes.controller.admin.pro.workorder.vo.MesProWorkOrderSaveReqVO; +import cn.iocoder.yudao.module.mes.dal.dataobject.pro.workorder.MesProWorkOrderDO; import jakarta.validation.Valid; /** @@ -11,7 +11,7 @@ import jakarta.validation.Valid; * * @author 芋道源码 */ -public interface MesProWorkorderService { +public interface MesProWorkOrderService { /** * 创建生产工单 @@ -19,21 +19,29 @@ public interface MesProWorkorderService { * @param createReqVO 创建信息 * @return 编号 */ - Long createWorkorder(@Valid MesProWorkorderSaveReqVO createReqVO); + Long createWorkOrder(@Valid MesProWorkOrderSaveReqVO createReqVO); /** * 更新生产工单 * * @param updateReqVO 更新信息 */ - void updateWorkorder(@Valid MesProWorkorderSaveReqVO updateReqVO); + void updateWorkOrder(@Valid MesProWorkOrderSaveReqVO updateReqVO); /** * 删除生产工单 * * @param id 编号 */ - void deleteWorkorder(Long id); + void deleteWorkOrder(Long id); + + /** + * 校验生产工单存在 + * + * @param id 编号 + * @return 生产工单 + */ + MesProWorkOrderDO validateWorkOrderExists(Long id); /** * 获得生产工单 @@ -41,7 +49,7 @@ public interface MesProWorkorderService { * @param id 编号 * @return 生产工单 */ - MesProWorkorderDO getWorkorder(Long id); + MesProWorkOrderDO getWorkOrder(Long id); /** * 获得生产工单分页 @@ -49,20 +57,20 @@ public interface MesProWorkorderService { * @param pageReqVO 分页查询 * @return 生产工单分页 */ - PageResult getWorkorderPage(MesProWorkorderPageReqVO pageReqVO); + PageResult getWorkOrderPage(MesProWorkOrderPageReqVO pageReqVO); /** * 完成工单 * * @param id 编号 */ - void finishWorkorder(Long id); + void finishWorkOrder(Long id); /** * 取消工单 * * @param id 编号 */ - void cancelWorkorder(Long id); + void cancelWorkOrder(Long id); } diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/workorder/MesProWorkorderServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/workorder/MesProWorkorderServiceImpl.java index 8b83242..108f305 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/workorder/MesProWorkorderServiceImpl.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/workorder/MesProWorkorderServiceImpl.java @@ -4,16 +4,16 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ObjUtil; 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.pro.workorder.vo.MesProWorkorderSaveReqVO; -import cn.iocoder.yudao.module.mes.controller.admin.pro.workorder.vo.MesProWorkorderPageReqVO; +import cn.iocoder.yudao.module.mes.controller.admin.pro.workorder.vo.MesProWorkOrderPageReqVO; +import cn.iocoder.yudao.module.mes.controller.admin.pro.workorder.vo.MesProWorkOrderSaveReqVO; import cn.iocoder.yudao.module.mes.dal.dataobject.md.item.MesMdItemBatchConfigDO; import cn.iocoder.yudao.module.mes.dal.dataobject.md.item.MesMdItemDO; import cn.iocoder.yudao.module.mes.dal.dataobject.md.item.MesMdProductBomDO; -import cn.iocoder.yudao.module.mes.dal.dataobject.pro.workorder.MesProWorkorderBomDO; -import cn.iocoder.yudao.module.mes.dal.dataobject.pro.workorder.MesProWorkorderDO; -import cn.iocoder.yudao.module.mes.dal.mysql.pro.workorder.MesProWorkorderBomMapper; -import cn.iocoder.yudao.module.mes.dal.mysql.pro.workorder.MesProWorkorderMapper; -import cn.iocoder.yudao.module.mes.enums.pro.MesProWorkorderStatusEnum; +import cn.iocoder.yudao.module.mes.dal.dataobject.pro.workorder.MesProWorkOrderBomDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.pro.workorder.MesProWorkOrderDO; +import cn.iocoder.yudao.module.mes.dal.mysql.pro.workorder.MesProWorkOrderBomMapper; +import cn.iocoder.yudao.module.mes.dal.mysql.pro.workorder.MesProWorkOrderMapper; +import cn.iocoder.yudao.module.mes.enums.pro.MesProWorkOrderStatusEnum; import cn.iocoder.yudao.module.mes.service.md.item.MesMdItemBatchConfigService; import cn.iocoder.yudao.module.mes.service.md.item.MesMdItemService; import cn.iocoder.yudao.module.mes.service.md.item.MesMdProductBomService; @@ -25,7 +25,6 @@ import org.springframework.validation.annotation.Validated; import java.math.BigDecimal; import java.time.LocalDateTime; import java.util.List; -import java.util.Objects; import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.*; @@ -37,13 +36,13 @@ import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.*; */ @Service @Validated -public class MesProWorkorderServiceImpl implements MesProWorkorderService { +public class MesProWorkOrderServiceImpl implements MesProWorkOrderService { @Resource - private MesProWorkorderMapper workorderMapper; + private MesProWorkOrderMapper workOrderMapper; @Resource - private MesProWorkorderBomMapper workorderBomMapper; + private MesProWorkOrderBomMapper workOrderBomMapper; @Resource private MesMdItemService itemService; @@ -56,15 +55,11 @@ public class MesProWorkorderServiceImpl implements MesProWorkorderService { @Override @Transactional(rollbackFor = Exception.class) - public Long createWorkorder(MesProWorkorderSaveReqVO createReqVO) { + public Long createWorkOrder(MesProWorkOrderSaveReqVO createReqVO) { // 1.1 校验编码唯一 - validateWorkorderCodeUnique(null, createReqVO.getCode()); + validateWorkOrderCodeUnique(null, createReqVO.getCode()); // 1.2 校验产品存在 - // TODO @AI：getItem 里面要有个校验方法，不然每次都要写 if (item == null) throw exception(MD_ITEM_NOT_EXISTS); - MesMdItemDO product = itemService.getItem(createReqVO.getProductId()); - if (product == null) { - throw exception(MD_ITEM_NOT_EXISTS); - } + itemService.validateItemExists(createReqVO.getProductId()); // 1.3 校验批次配置：如果产品有 clientFlag=true，则 clientId 必填 validateBatchConfig(createReqVO.getProductId(), createReqVO.getClientId()); @@ -72,121 +67,112 @@ public class MesProWorkorderServiceImpl implements MesProWorkorderService { if (createReqVO.getParentId() == null) { createReqVO.setParentId(0L); } - if (createReqVO.getAncestors() == null) { - createReqVO.setAncestors("0"); - } // 2.2 插入工单 - MesProWorkorderDO workorder = BeanUtils.toBean(createReqVO, MesProWorkorderDO.class); - if (workorder.getStatus() == null) { - workorder.setStatus(MesProWorkorderStatusEnum.PREPARE.getStatus()); + MesProWorkOrderDO workOrder = BeanUtils.toBean(createReqVO, MesProWorkOrderDO.class); + if (workOrder.getStatus() == null) { + workOrder.setStatus(MesProWorkOrderStatusEnum.PREPARE.getStatus()); } - workorderMapper.insert(workorder); + workOrderMapper.insert(workOrder); // 3. 自动生成 BOM：根据产品 BOM 生成工单 BOM - generateWorkorderBom(workorder.getId(), createReqVO.getProductId(), createReqVO.getQuantity()); - return workorder.getId(); + generateWorkOrderBom(workOrder.getId(), createReqVO.getProductId(), createReqVO.getQuantity()); + return workOrder.getId(); } @Override @Transactional(rollbackFor = Exception.class) - public void updateWorkorder(MesProWorkorderSaveReqVO updateReqVO) { + public void updateWorkOrder(MesProWorkOrderSaveReqVO updateReqVO) { // 1.1 校验存在 - MesProWorkorderDO oldWorkorder = validateWorkorderExists(updateReqVO.getId()); + MesProWorkOrderDO oldWorkOrder = validateWorkOrderExists(updateReqVO.getId()); // 1.2 校验编码唯一 - validateWorkorderCodeUnique(updateReqVO.getId(), updateReqVO.getCode()); + validateWorkOrderCodeUnique(updateReqVO.getId(), updateReqVO.getCode()); // 1.3 校验批次配置 validateBatchConfig(updateReqVO.getProductId(), updateReqVO.getClientId()); // 2. 判断产品或数量是否变更，如果变更则重新生成 BOM - boolean productChanged = !Objects.equals(oldWorkorder.getProductId(), updateReqVO.getProductId()); - boolean quantityChanged = oldWorkorder.getQuantity().compareTo(updateReqVO.getQuantity()) != 0; + boolean productChanged = ObjUtil.notEqual(oldWorkOrder.getProductId(), updateReqVO.getProductId()); + boolean quantityChanged = oldWorkOrder.getQuantity().compareTo(updateReqVO.getQuantity()) != 0; if (productChanged || quantityChanged) { // 删除旧 BOM 并重新生成 - workorderBomMapper.deleteByWorkorderId(updateReqVO.getId()); - generateWorkorderBom(updateReqVO.getId(), updateReqVO.getProductId(), updateReqVO.getQuantity()); + workOrderBomMapper.deleteByWorkOrderId(updateReqVO.getId()); + generateWorkOrderBom(updateReqVO.getId(), updateReqVO.getProductId(), updateReqVO.getQuantity()); } // 3. 更新 - MesProWorkorderDO updateObj = BeanUtils.toBean(updateReqVO, MesProWorkorderDO.class); - workorderMapper.updateById(updateObj); + MesProWorkOrderDO updateObj = BeanUtils.toBean(updateReqVO, MesProWorkOrderDO.class); + workOrderMapper.updateById(updateObj); } @Override @Transactional(rollbackFor = Exception.class) - public void deleteWorkorder(Long id) { + public void deleteWorkOrder(Long id) { // 1.1 校验存在 - MesProWorkorderDO workorder = validateWorkorderExists(id); + MesProWorkOrderDO workOrder = validateWorkOrderExists(id); // 1.2 只能删除草稿状态的工单 - // TODO @AI：notEquals；ObjUtil - if (!Objects.equals(workorder.getStatus(), MesProWorkorderStatusEnum.PREPARE.getStatus())) { - throw exception(PRO_WORKORDER_NOT_PREPARE); + if (ObjUtil.notEqual(workOrder.getStatus(), MesProWorkOrderStatusEnum.PREPARE.getStatus())) { + throw exception(PRO_WORK_ORDER_NOT_PREPARE); } // 2. 删除工单 + BOM - workorderMapper.deleteById(id); - workorderBomMapper.deleteByWorkorderId(id); + workOrderMapper.deleteById(id); + workOrderBomMapper.deleteByWorkOrderId(id); } @Override - public MesProWorkorderDO getWorkorder(Long id) { - return workorderMapper.selectById(id); + public MesProWorkOrderDO validateWorkOrderExists(Long id) { + MesProWorkOrderDO workOrder = workOrderMapper.selectById(id); + if (workOrder == null) { + throw exception(PRO_WORK_ORDER_NOT_EXISTS); + } + return workOrder; } @Override - public PageResult getWorkorderPage(MesProWorkorderPageReqVO pageReqVO) { - return workorderMapper.selectPage(pageReqVO); + public MesProWorkOrderDO getWorkOrder(Long id) { + return workOrderMapper.selectById(id); } @Override - public void finishWorkorder(Long id) { + public PageResult getWorkOrderPage(MesProWorkOrderPageReqVO pageReqVO) { + return workOrderMapper.selectPage(pageReqVO); + } + + @Override + public void finishWorkOrder(Long id) { // 1. 校验存在 - validateWorkorderExists(id); + validateWorkOrderExists(id); // 2. 更新状态为已完成 - // TODO @AI：链式调用，不用逐个设置； - MesProWorkorderDO updateObj = new MesProWorkorderDO(); - updateObj.setId(id); - updateObj.setStatus(MesProWorkorderStatusEnum.FINISHED.getStatus()); - updateObj.setFinishDate(LocalDateTime.now()); - workorderMapper.updateById(updateObj); + workOrderMapper.updateById(new MesProWorkOrderDO().setId(id) + .setStatus(MesProWorkOrderStatusEnum.FINISHED.getStatus()) + .setFinishDate(LocalDateTime.now())); // TODO @芋艿：pro_task 未迁移，暂不级联更新任务状态 } @Override - public void cancelWorkorder(Long id) { + public void cancelWorkOrder(Long id) { // 1. 校验存在 - validateWorkorderExists(id); + validateWorkOrderExists(id); // 2. 更新状态为已取消 - // TODO @AI：链式调用，不用逐个设置； - MesProWorkorderDO updateObj = new MesProWorkorderDO(); - updateObj.setId(id); - updateObj.setStatus(MesProWorkorderStatusEnum.CANCELED.getStatus()); - updateObj.setCancelDate(LocalDateTime.now()); - workorderMapper.updateById(updateObj); + workOrderMapper.updateById(new MesProWorkOrderDO().setId(id) + .setStatus(MesProWorkOrderStatusEnum.CANCELED.getStatus()) + .setCancelDate(LocalDateTime.now())); // TODO @芋艿：pro_task 未迁移，暂不级联更新任务状态 } // ==================== 校验方法 ==================== - private MesProWorkorderDO validateWorkorderExists(Long id) { - MesProWorkorderDO workorder = workorderMapper.selectById(id); - if (workorder == null) { - throw exception(PRO_WORKORDER_NOT_EXISTS); - } - return workorder; - } - - private void validateWorkorderCodeUnique(Long id, String code) { + private void validateWorkOrderCodeUnique(Long id, String code) { if (code == null) { return; } - MesProWorkorderDO workorder = workorderMapper.selectByCode(code); - if (workorder == null) { + MesProWorkOrderDO workOrder = workOrderMapper.selectByCode(code); + if (workOrder == null) { return; } - if (ObjUtil.notEqual(workorder.getId(), id)) { - throw exception(PRO_WORKORDER_CODE_DUPLICATE); + if (ObjUtil.notEqual(workOrder.getId(), id)) { + throw exception(PRO_WORK_ORDER_CODE_DUPLICATE); } } @@ -203,30 +189,22 @@ public class MesProWorkorderServiceImpl implements MesProWorkorderService { /** * 根据产品 BOM 自动生成工单 BOM 行 * - * @param workorderId 工单编号 + * @param workOrderId 工单编号 * @param productId 产品编号 * @param quantity 工单生产数量 */ - private void generateWorkorderBom(Long workorderId, Long productId, BigDecimal quantity) { + private void generateWorkOrderBom(Long workOrderId, Long productId, BigDecimal quantity) { List productBomList = productBomService.getProductBomListByItemId(productId); if (CollUtil.isEmpty(productBomList)) { return; } for (MesMdProductBomDO productBom : productBomList) { - MesMdItemDO bomItem = itemService.getItem(productBom.getBomItemId()); - // TODO @AI：bomItem 校验必须非空吧？！ - // TODO @AI：联会调用； - MesProWorkorderBomDO workorderBom = new MesProWorkorderBomDO(); - workorderBom.setWorkorderId(workorderId); - workorderBom.setItemId(productBom.getBomItemId()); - workorderBom.setItemOrProduct("ITEM"); - // 预计使用量 = 工单数量 × BOM 用量 - workorderBom.setQuantity(quantity.multiply(productBom.getQuantity())); - // 设置单位：使用物料自身的单位 - if (bomItem != null) { - workorderBom.setUnitMeasureId(bomItem.getUnitMeasureId()); - } - workorderBomMapper.insert(workorderBom); + MesMdItemDO bomItem = itemService.validateItemExists(productBom.getBomItemId()); + workOrderBomMapper.insert(new MesProWorkOrderBomDO() + .setWorkOrderId(workOrderId) + .setItemId(productBom.getBomItemId()) + .setQuantity(quantity.multiply(productBom.getQuantity())) + .setUnitMeasureId(bomItem.getUnitMeasureId())); } } diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/MesQcDefectService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/MesQcDefectService.java index 25630a4..59ebb2d 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/MesQcDefectService.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/MesQcDefectService.java @@ -1,8 +1,8 @@ package cn.iocoder.yudao.module.mes.service.qc; import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.mes.controller.admin.qc.vo.MesQcDefectPageReqVO; -import cn.iocoder.yudao.module.mes.controller.admin.qc.vo.MesQcDefectSaveReqVO; +import cn.iocoder.yudao.module.mes.controller.admin.qc.defect.vo.MesQcDefectPageReqVO; +import cn.iocoder.yudao.module.mes.controller.admin.qc.defect.vo.MesQcDefectSaveReqVO; import cn.iocoder.yudao.module.mes.dal.dataobject.qc.MesQcDefectDO; import jakarta.validation.Valid; diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/MesQcDefectServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/MesQcDefectServiceImpl.java index 7c427f2..2538e05 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/MesQcDefectServiceImpl.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/MesQcDefectServiceImpl.java @@ -4,8 +4,8 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ObjUtil; 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.qc.vo.MesQcDefectPageReqVO; -import cn.iocoder.yudao.module.mes.controller.admin.qc.vo.MesQcDefectSaveReqVO; +import cn.iocoder.yudao.module.mes.controller.admin.qc.defect.vo.MesQcDefectPageReqVO; +import cn.iocoder.yudao.module.mes.controller.admin.qc.defect.vo.MesQcDefectSaveReqVO; import cn.iocoder.yudao.module.mes.dal.dataobject.qc.MesQcDefectDO; import cn.iocoder.yudao.module.mes.dal.mysql.qc.MesQcDefectMapper; import jakarta.annotation.Resource; diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/MesQcIndicatorService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/MesQcIndicatorService.java index 30ca407..f07ee3d 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/MesQcIndicatorService.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/MesQcIndicatorService.java @@ -1,8 +1,8 @@ package cn.iocoder.yudao.module.mes.service.qc; import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.mes.controller.admin.qc.vo.MesQcIndicatorPageReqVO; -import cn.iocoder.yudao.module.mes.controller.admin.qc.vo.MesQcIndicatorSaveReqVO; +import cn.iocoder.yudao.module.mes.controller.admin.qc.indicator.vo.MesQcIndicatorPageReqVO; +import cn.iocoder.yudao.module.mes.controller.admin.qc.indicator.vo.MesQcIndicatorSaveReqVO; import cn.iocoder.yudao.module.mes.dal.dataobject.qc.MesQcIndicatorDO; import jakarta.validation.Valid; diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/MesQcIndicatorServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/MesQcIndicatorServiceImpl.java index 1a15739..1e9a803 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/MesQcIndicatorServiceImpl.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/MesQcIndicatorServiceImpl.java @@ -4,8 +4,8 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ObjUtil; 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.qc.vo.MesQcIndicatorPageReqVO; -import cn.iocoder.yudao.module.mes.controller.admin.qc.vo.MesQcIndicatorSaveReqVO; +import cn.iocoder.yudao.module.mes.controller.admin.qc.indicator.vo.MesQcIndicatorPageReqVO; +import cn.iocoder.yudao.module.mes.controller.admin.qc.indicator.vo.MesQcIndicatorSaveReqVO; import cn.iocoder.yudao.module.mes.dal.dataobject.qc.MesQcIndicatorDO; import cn.iocoder.yudao.module.mes.dal.mysql.qc.MesQcIndicatorMapper; import jakarta.annotation.Resource;