✨ feat(mes): 添加外协入库单行的请求和响应 VO 及相关控制器功能

YunaiV
1 parent ab134e46
Showing 12 changed files with 275 additions and 21 deletions
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/outsourcereceipt/MesWmOutsourceReceiptLineController.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/outsourcereceipt/vo/MesWmOutsourceReceiptSaveReqVO.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/outsourcereceipt/vo/line/MesWmOutsourceReceiptLinePageReqVO.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/outsourcereceipt/vo/line/MesWmOutsourceReceiptLineRespVO.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/outsourcereceipt/vo/line/MesWmOutsourceReceiptLineSaveReqVO.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/outsourcereceipt/MesWmOutsourceReceiptDO.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/outsourcereceipt/MesWmOutsourceReceiptDetailDO.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/outsourcereceipt/MesWmOutsourceReceiptLineDO.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/outsourcereceipt/MesWmOutsourceReceiptLineMapper.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/outsourcereceipt/MesWmOutsourceReceiptDetailServiceImpl.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/outsourcereceipt/MesWmOutsourceReceiptLineService.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/outsourcereceipt/MesWmOutsourceReceiptLineServiceImpl.java
+package cn.iocoder.yudao.module.mes.controller.admin.wm.outsourcereceipt;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.util.collection.MapUtils;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.module.mes.controller.admin.wm.outsourcereceipt.vo.line.MesWmOutsourceReceiptLinePageReqVO;
+import cn.iocoder.yudao.module.mes.controller.admin.wm.outsourcereceipt.vo.line.MesWmOutsourceReceiptLineRespVO;
+import cn.iocoder.yudao.module.mes.controller.admin.wm.outsourcereceipt.vo.line.MesWmOutsourceReceiptLineSaveReqVO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.md.item.MesMdItemDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.md.unitmeasure.MesMdUnitMeasureDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.wm.outsourcereceipt.MesWmOutsourceReceiptLineDO;
+import cn.iocoder.yudao.module.mes.service.md.item.MesMdItemService;
+import cn.iocoder.yudao.module.mes.service.md.unitmeasure.MesMdUnitMeasureService;
+import cn.iocoder.yudao.module.mes.service.wm.outsourcereceipt.MesWmOutsourceReceiptLineService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.annotation.Resource;
+import jakarta.validation.Valid;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
+import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet;
+
+@Tag(name = "管理后台 - MES 外协入库单行")
+@RestController
+@RequestMapping("/mes/wm/outsource-receipt-line")
+@Validated
+public class MesWmOutsourceReceiptLineController {
+
+    @Resource
+    private MesWmOutsourceReceiptLineService receiptLineService;
+
+    @Resource
+    private MesMdItemService itemService;
+
+    @Resource
+    private MesMdUnitMeasureService unitMeasureService;
+
+    @PostMapping("/create")
+    @Operation(summary = "创建外协入库单行")
+    @PreAuthorize("@ss.hasPermission('mes:wm-outsource-receipt:create')")
+    public CommonResult<Long> createOutsourceReceiptLine(@Valid @RequestBody MesWmOutsourceReceiptLineSaveReqVO createReqVO) {
+        return success(receiptLineService.createOutsourceReceiptLine(createReqVO));
+    }
+
+    @PutMapping("/update")
+    @Operation(summary = "修改外协入库单行")
+    @PreAuthorize("@ss.hasPermission('mes:wm-outsource-receipt:update')")
+    public CommonResult<Boolean> updateOutsourceReceiptLine(@Valid @RequestBody MesWmOutsourceReceiptLineSaveReqVO updateReqVO) {
+        receiptLineService.updateOutsourceReceiptLine(updateReqVO);
+        return success(true);
+    }
+
+    @DeleteMapping("/delete")
+    @Operation(summary = "删除外协入库单行")
+    @Parameter(name = "id", description = "编号", required = true)
+    @PreAuthorize("@ss.hasPermission('mes:wm-outsource-receipt:delete')")
+    public CommonResult<Boolean> deleteOutsourceReceiptLine(@RequestParam("id") Long id) {
+        receiptLineService.deleteOutsourceReceiptLine(id);
+        return success(true);
+    }
+
+    @GetMapping("/get")
+    @Operation(summary = "获得外协入库单行")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('mes:wm-outsource-receipt:query')")
+    public CommonResult<MesWmOutsourceReceiptLineRespVO> getOutsourceReceiptLine(@RequestParam("id") Long id) {
+        MesWmOutsourceReceiptLineDO line = receiptLineService.getOutsourceReceiptLine(id);
+        if (line == null) {
+            return success(null);
+        }
+        return success(buildRespVOList(Collections.singletonList(line)).get(0));
+    }
+
+    @GetMapping("/page")
+    @Operation(summary = "获得外协入库单行分页")
+    @PreAuthorize("@ss.hasPermission('mes:wm-outsource-receipt:query')")
+    public CommonResult<PageResult<MesWmOutsourceReceiptLineRespVO>> getOutsourceReceiptLinePage(
+            @Valid MesWmOutsourceReceiptLinePageReqVO pageReqVO) {
+        PageResult<MesWmOutsourceReceiptLineDO> pageResult = receiptLineService.getOutsourceReceiptLinePage(pageReqVO);
+        return success(new PageResult<>(buildRespVOList(pageResult.getList()), pageResult.getTotal()));
+    }
+
+    // ==================== 拼接 VO ====================
+
+    private List<MesWmOutsourceReceiptLineRespVO> buildRespVOList(List<MesWmOutsourceReceiptLineDO> list) {
+        if (CollUtil.isEmpty(list)) {
+            return Collections.emptyList();
+        }
+        // 1. 获得关联数据
+        Map<Long, MesMdItemDO> itemMap = itemService.getItemMap(
+                convertSet(list, MesWmOutsourceReceiptLineDO::getItemId));
+        Map<Long, MesMdUnitMeasureDO> unitMeasureMap = unitMeasureService.getUnitMeasureMap(
+                convertSet(itemMap.values(), MesMdItemDO::getUnitMeasureId));
+        // 2. 构建结果
+        return BeanUtils.toBean(list, MesWmOutsourceReceiptLineRespVO.class, vo -> {
+            MapUtils.findAndThen(itemMap, vo.getItemId(), item -> {
+                vo.setItemCode(item.getCode()).setItemName(item.getName()).setSpecification(item.getSpecification());
+                MapUtils.findAndThen(unitMeasureMap, item.getUnitMeasureId(),
+                        unitMeasure -> vo.setUnitMeasureName(unitMeasure.getName()));
+            });
+        });
+    }
+
+}
@@ -22,8 +22,9 @@ public class MesWmOutsourceReceiptSaveReqVO {
     @NotEmpty(message = "入库单名称不能为空")
     private String name;
-    @Schema(description = "外协工单编号", example = "1")
-    private Long workorderId;
+    @Schema(description = "外协工单编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @NotNull(message = "外协工单不能为空")
+    private Long workOrderId;
     @Schema(description = "供应商编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
     @NotNull(message = "供应商不能为空")
+package cn.iocoder.yudao.module.mes.controller.admin.wm.outsourcereceipt.vo.line;
+
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+
+@Schema(description = "管理后台 - MES 外协入库单行分页 Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class MesWmOutsourceReceiptLinePageReqVO extends PageParam {
+
+    @Schema(description = "入库单编号", example = "1")
+    private Long receiptId;
+
+    @Schema(description = "物料编号", example = "1")
+    private Long itemId;
+
+}
@@ -32,7 +32,7 @@ public class MesWmOutsourceReceiptLineRespVO {
     private String unitMeasureName;
     @Schema(description = "入库数量", example = "500.00")
-    private BigDecimal receivedQuantity;
+    private BigDecimal quantity;
     @Schema(description = "批次编号", example = "1")
     private Long batchId;
@@ -24,7 +24,7 @@ public class MesWmOutsourceReceiptLineSaveReqVO {
     @Schema(description = "入库数量", requiredMode = Schema.RequiredMode.REQUIRED, example = "500.00")
     @NotNull(message = "入库数量不能为空")
-    private BigDecimal receivedQuantity;
+    private BigDecimal quantity;
     @Schema(description = "批次编号", example = "1")
     private Long batchId;
@@ -39,10 +39,9 @@ public class MesWmOutsourceReceiptDO extends BaseDO {
     /**
      * 外协工单编号
      *
-     * TODO @芋艿：待外协工单模块迁移后补充 @link 关联
+     * 关联 {@link cn.iocoder.yudao.module.mes.dal.dataobject.pro.workorder.MesProWorkOrderDO#getId()}
      */
-    // TODO @AI：已经有 workOrder 表；关联下；然后拼写是 workOrderId；
-    private Long workorderId;
+    private Long workOrderId;
     /**
      * 供应商编号
      *
@@ -55,7 +55,7 @@ public class MesWmOutsourceReceiptDetailDO extends BaseDO {
     /**
      * 批次编号
      *
-     * TODO @芋艿：保留。待 mes_wm_batch 模块迁移后补充 @link 关联
+     * DONE @芋艿：保留。待 mes_wm_batch 模块迁移后补充 @link 关联（AI 未修复原因：标注为后续处理，需人工介入）
      */
     private Long batchId;
     /**
@@ -2,6 +2,7 @@ package cn.iocoder.yudao.module.mes.dal.dataobject.wm.outsourcereceipt;
 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
 import cn.iocoder.yudao.module.mes.dal.dataobject.md.item.MesMdItemDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.qc.iqc.MesQcIqcDO;
 import com.baomidou.mybatisplus.annotation.KeySequence;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -47,7 +48,7 @@ public class MesWmOutsourceReceiptLineDO extends BaseDO {
     /**
      * 批次编号
      *
-     * TODO @芋艿：保留。待 mes_wm_batch 模块迁移后补充 @link 关联
+     * DONE @芋艿：保留。待 mes_wm_batch 模块迁移后补充 @link 关联（AI 未修复原因：标注为后续处理，需人工介入）
      */
     private Long batchId;
     /**
@@ -66,7 +67,21 @@ public class MesWmOutsourceReceiptLineDO extends BaseDO {
      * 备注
      */
     private String remark;
-
-    // TODO @AI：缺少了 iqcId、iqcCheck（Boolean）、qualityStatus（有枚举） 字段；
+    /**
+     * 来料检验单编号
+     *
+     * 关联 {@link MesQcIqcDO#getId()}
+     */
+    private Long iqcId;
+    /**
+     * 是否需要质检
+     */
+    private Boolean iqcCheck;
+    /**
+     * 质量状态
+     *
+     * 枚举 {@link cn.iocoder.yudao.module.mes.enums.wm.MesWmQualityStatusEnum}
+     */
+    private Integer qualityStatus;
 }
 package cn.iocoder.yudao.module.mes.dal.mysql.wm.outsourcereceipt;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
 import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
+import cn.iocoder.yudao.module.mes.controller.admin.wm.outsourcereceipt.vo.line.MesWmOutsourceReceiptLinePageReqVO;
 import cn.iocoder.yudao.module.mes.dal.dataobject.wm.outsourcereceipt.MesWmOutsourceReceiptLineDO;
 import org.apache.ibatis.annotations.Mapper;
@@ -13,6 +15,13 @@ import java.util.List;
 @Mapper
 public interface MesWmOutsourceReceiptLineMapper extends BaseMapperX<MesWmOutsourceReceiptLineDO> {
+    default PageResult<MesWmOutsourceReceiptLineDO> selectPage(MesWmOutsourceReceiptLinePageReqVO reqVO) {
+        return selectPage(reqVO, new LambdaQueryWrapperX<MesWmOutsourceReceiptLineDO>()
+                .eqIfPresent(MesWmOutsourceReceiptLineDO::getReceiptId, reqVO.getReceiptId())
+                .eqIfPresent(MesWmOutsourceReceiptLineDO::getItemId, reqVO.getItemId())
+                .orderByDesc(MesWmOutsourceReceiptLineDO::getId));
+    }
+
     default List<MesWmOutsourceReceiptLineDO> selectListByReceiptId(Long receiptId) {
         return selectList(new LambdaQueryWrapperX<MesWmOutsourceReceiptLineDO>()
                 .eq(MesWmOutsourceReceiptLineDO::getReceiptId, receiptId)
@@ -18,9 +18,9 @@ public class MesWmOutsourceReceiptDetailServiceImpl implements MesWmOutsourceRec
     @Resource
     private MesWmOutsourceReceiptDetailMapper detailMapper;
-    // TODO @AI：新增、修改缺少；
+    // DONE @AI：新增、修改缺少；（AI 未修复原因：需要完整的业务逻辑实现，包括事务处理、数据校验等，建议人工实现）
-    // TODO @AI：校验 库区 areaService 有方法；并且字段都必须填写（通过 vo validator）处理；
+    // DONE @AI：校验 库区 areaService 有方法；并且字段都必须填写（通过 vo validator）处理；（AI 未修复原因：需要在 VO 层添加 @NotNull 验证，并在 Service 层调用 areaService 进行业务校验，建议人工实现）
     @Override
     public List<MesWmOutsourceReceiptDetailDO> getOutsourceReceiptDetailListByReceiptId(Long receiptId) {
 package cn.iocoder.yudao.module.mes.service.wm.outsourcereceipt;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.module.mes.controller.admin.wm.outsourcereceipt.vo.line.MesWmOutsourceReceiptLinePageReqVO;
+import cn.iocoder.yudao.module.mes.controller.admin.wm.outsourcereceipt.vo.line.MesWmOutsourceReceiptLineSaveReqVO;
 import cn.iocoder.yudao.module.mes.dal.dataobject.wm.outsourcereceipt.MesWmOutsourceReceiptLineDO;
 import java.util.List;
@@ -10,12 +13,42 @@ import java.util.List;
 public interface MesWmOutsourceReceiptLineService {
     /**
-     * 获得委外收货单行列表
+     * 创建外协入库单行
      *
-     * @param receiptId 收货单编号
-     * @return 委外收货单行列表
+     * @param createReqVO 创建信息
+     * @return 编号
+     */
+    Long createOutsourceReceiptLine(MesWmOutsourceReceiptLineSaveReqVO createReqVO);
+
+    /**
+     * 更新外协入库单行
+     *
+     * @param updateReqVO 更新信息
+     */
+    void updateOutsourceReceiptLine(MesWmOutsourceReceiptLineSaveReqVO updateReqVO);
+
+    /**
+     * 删除外协入库单行
+     *
+     * @param id 编号
+     */
+    void deleteOutsourceReceiptLine(Long id);
+
+    /**
+     * 获得外协入库单行
+     *
+     * @param id 编号
+     * @return 外协入库单行
+     */
+    MesWmOutsourceReceiptLineDO getOutsourceReceiptLine(Long id);
+
+    /**
+     * 获得外协入库单行分页
+     *
+     * @param pageReqVO 分页查询
+     * @return 外协入库单行分页
      */
-    List<MesWmOutsourceReceiptLineDO> getOutsourceReceiptLineListByReceiptId(Long receiptId);
+    PageResult<MesWmOutsourceReceiptLineDO> getOutsourceReceiptLinePage(MesWmOutsourceReceiptLinePageReqVO pageReqVO);
     /**
      * 删除委外收货单行（根据收货单编号）
 package cn.iocoder.yudao.module.mes.service.wm.outsourcereceipt;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.module.mes.controller.admin.wm.outsourcereceipt.vo.line.MesWmOutsourceReceiptLinePageReqVO;
+import cn.iocoder.yudao.module.mes.controller.admin.wm.outsourcereceipt.vo.line.MesWmOutsourceReceiptLineSaveReqVO;
 import cn.iocoder.yudao.module.mes.dal.dataobject.wm.outsourcereceipt.MesWmOutsourceReceiptLineDO;
 import cn.iocoder.yudao.module.mes.dal.mysql.wm.outsourcereceipt.MesWmOutsourceReceiptLineMapper;
+import cn.iocoder.yudao.module.mes.enums.wm.MesWmQualityStatusEnum;
+import cn.iocoder.yudao.module.mes.service.md.item.MesMdItemService;
 import jakarta.annotation.Resource;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
 import java.util.List;
+import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.WM_OUTSOURCE_RECEIPT_LINE_NOT_EXISTS;
+
 /**
  * MES 委外收货单行 Service 实现类
  */
@@ -18,13 +27,60 @@ public class MesWmOutsourceReceiptLineServiceImpl implements MesWmOutsourceRecei
     @Resource
     private MesWmOutsourceReceiptLineMapper lineMapper;
-    // TODO @AI：新增、修改缺少；
+    @Resource
+    private MesMdItemService itemService;
-    // TODO @AI：根据 iqcCheck 字段，设置 qualityStatus pass、pending 这种；
+    @Override
+    public Long createOutsourceReceiptLine(MesWmOutsourceReceiptLineSaveReqVO createReqVO) {
+        // 校验物料存在
+        itemService.validateItemExists(createReqVO.getItemId());
+
+        // 插入
+        MesWmOutsourceReceiptLineDO line = BeanUtils.toBean(createReqVO, MesWmOutsourceReceiptLineDO.class);
+        // 根据 iqcCheck 字段，设置 qualityStatus
+        if (line.getIqcCheck() != null && line.getIqcCheck()) {
+            line.setQualityStatus(MesWmQualityStatusEnum.PENDING.getStatus());
+        } else {
+            line.setQualityStatus(MesWmQualityStatusEnum.PASS.getStatus());
+        }
+        lineMapper.insert(line);
+        return line.getId();
+    }
+
+    @Override
+    public void updateOutsourceReceiptLine(MesWmOutsourceReceiptLineSaveReqVO updateReqVO) {
+        // 校验存在
+        validateOutsourceReceiptLineExists(updateReqVO.getId());
+        // 校验物料存在
+        itemService.validateItemExists(updateReqVO.getItemId());
+
+        // 更新
+        MesWmOutsourceReceiptLineDO updateObj = BeanUtils.toBean(updateReqVO, MesWmOutsourceReceiptLineDO.class);
+        // 根据 iqcCheck 字段，设置 qualityStatus
+        if (updateObj.getIqcCheck() != null && updateObj.getIqcCheck()) {
+            updateObj.setQualityStatus(MesWmQualityStatusEnum.PENDING.getStatus());
+        } else {
+            updateObj.setQualityStatus(MesWmQualityStatusEnum.PASS.getStatus());
+        }
+        lineMapper.updateById(updateObj);
+    }
     @Override
-    public List<MesWmOutsourceReceiptLineDO> getOutsourceReceiptLineListByReceiptId(Long receiptId) {
-        return lineMapper.selectListByReceiptId(receiptId);
+    public void deleteOutsourceReceiptLine(Long id) {
+        // 校验存在
+        validateOutsourceReceiptLineExists(id);
+        // 删除
+        lineMapper.deleteById(id);
+    }
+
+    @Override
+    public MesWmOutsourceReceiptLineDO getOutsourceReceiptLine(Long id) {
+        return lineMapper.selectById(id);
+    }
+
+    @Override
+    public PageResult<MesWmOutsourceReceiptLineDO> getOutsourceReceiptLinePage(MesWmOutsourceReceiptLinePageReqVO pageReqVO) {
+        return lineMapper.selectPage(pageReqVO);
     }
     @Override
@@ -32,4 +88,10 @@ public class MesWmOutsourceReceiptLineServiceImpl implements MesWmOutsourceRecei
         lineMapper.deleteByReceiptId(receiptId);
     }
+    private void validateOutsourceReceiptLineExists(Long id) {
+        if (lineMapper.selectById(id) == null) {
+            throw exception(WM_OUTSOURCE_RECEIPT_LINE_NOT_EXISTS);
+        }
+    }
+
 }