feat(mes): 新增设备和点检保养项目精简列表接口及批次号字段

YunaiV
1 parent 4c5e3074
Showing 12 changed files with 60 additions and 1 deletions
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/machinery/MesDvMachineryController.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/subject/MesDvSubjectController.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/MesProWorkorderController.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/vo/MesProWorkorderPageReqVO.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/vo/MesProWorkorderRespVO.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/vo/MesProWorkorderSaveReqVO.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/pro/workorder/MesProWorkorderDO.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/pro/workorder/MesProWorkorderMapper.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/dv/machinery/MesDvMachineryService.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/dv/machinery/MesDvMachineryServiceImpl.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/dv/subject/MesDvSubjectService.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/dv/subject/MesDvSubjectServiceImpl.java
@@ -108,6 +108,14 @@ public class MesDvMachineryController {
                 buildMachineryRespVOList(list));
     }
+    @GetMapping("/simple-list")
+    @Operation(summary = "获得设备精简列表", description = "主要用于前端的下拉选项")
+    @PreAuthorize("@ss.hasPermission('mes:dv-machinery:query')")
+    public CommonResult<List<MesDvMachineryRespVO>> getMachinerySimpleList() {
+        List<MesDvMachineryDO> list = machineryService.getMachinerySimpleList();
+        return success(BeanUtils.toBean(list, MesDvMachineryRespVO.class));
+    }
+
     // ==================== 拼接 VO ====================
     private List<MesDvMachineryRespVO> buildMachineryRespVOList(List<MesDvMachineryDO> list) {
@@ -77,6 +77,14 @@ public class MesDvSubjectController {
         return success(BeanUtils.toBean(pageResult, MesDvSubjectRespVO.class));
     }
+    @GetMapping("/simple-list")
+    @Operation(summary = "获得点检保养项目精简列表", description = "主要用于前端的下拉选项")
+    @PreAuthorize("@ss.hasPermission('mes:dv-subject:query')")
+    public CommonResult<List<MesDvSubjectRespVO>> getSubjectSimpleList() {
+        List<MesDvSubjectDO> list = subjectService.getSubjectSimpleList();
+        return success(BeanUtils.toBean(list, MesDvSubjectRespVO.class));
+    }
+
     @GetMapping("/export-excel")
     @Operation(summary = "导出点检保养项目 Excel")
     @PreAuthorize("@ss.hasPermission('mes:dv-subject:export')")
@@ -167,7 +167,7 @@ public class MesProWorkOrderController {
             MapUtils.findAndThen(clientMap, vo.getClientId(),
                     client -> vo.setClientName(client.getName()).setClientCode(client.getCode()));
             MapUtils.findAndThen(vendorMap, vo.getVendorId(),
-                    vendor -> vo.setVendorName(vendor.getName()));
+                    vendor -> vo.setVendorName(vendor.getName()).setVendorCode(vendor.getCode()));
             MapUtils.findAndThen(unitMeasureMap, vo.getUnitMeasureId(),
                     unitMeasure -> vo.setUnitMeasureName(unitMeasure.getName()));
             MapUtils.findAndThen(parentMap, vo.getParentId(),
@@ -35,6 +35,9 @@ public class MesProWorkOrderPageReqVO extends PageParam {
     @Schema(description = "客户编号", example = "300")
     private Long clientId;
+    @Schema(description = "批次号", example = "BATCH-001")
+    private String batchCode;
+
     @Schema(description = "工单状态", example = "0")
     private Integer status;
@@ -94,10 +94,18 @@ public class MesProWorkOrderRespVO {
     @Schema(description = "供应商编号", example = "400")
     private Long vendorId;
+    @Schema(description = "供应商编码", example = "V-001")
+    @ExcelProperty("供应商编码")
+    private String vendorCode;
+
     @Schema(description = "供应商名称", example = "供应商 A")
     @ExcelProperty("供应商名称")
     private String vendorName;
+    @Schema(description = "批次号", example = "BATCH-001")
+    @ExcelProperty("批次号")
+    private String batchCode;
+
     @Schema(description = "需求日期")
     @ExcelProperty("需求日期")
     private LocalDateTime requestDate;
@@ -61,6 +61,9 @@ public class MesProWorkOrderSaveReqVO {
     @Schema(description = "供应商编号", example = "400")
     private Long vendorId;
+    @Schema(description = "批次号", example = "BATCH-001")
+    private String batchCode;
+
     @Schema(description = "需求日期", requiredMode = Schema.RequiredMode.REQUIRED)
     @NotNull(message = "需求日期不能为空")
     private LocalDateTime requestDate;
@@ -101,6 +101,10 @@ public class MesProWorkOrderDO extends BaseDO {
      */
     private Long vendorId;
     /**
+     * 批次号
+     */
+    private String batchCode;
+    /**
      * 需求日期
      */
     private LocalDateTime requestDate;
@@ -23,6 +23,7 @@ public interface MesProWorkOrderMapper extends BaseMapperX&lt;MesProWorkOrderDO&gt; {
                 .eqIfPresent(MesProWorkOrderDO::getOrderSourceType, reqVO.getOrderSourceType())
                 .eqIfPresent(MesProWorkOrderDO::getProductId, reqVO.getProductId())
                 .eqIfPresent(MesProWorkOrderDO::getClientId, reqVO.getClientId())
+                .likeIfPresent(MesProWorkOrderDO::getBatchCode, reqVO.getBatchCode())
                 .eqIfPresent(MesProWorkOrderDO::getStatus, reqVO.getStatus())
                 .betweenIfPresent(MesProWorkOrderDO::getRequestDate, reqVO.getRequestDate())
                 .orderByDesc(MesProWorkOrderDO::getId));
@@ -73,6 +73,13 @@ public interface MesDvMachineryService {
     void validateMachineryExists(Long id);
     /**
+     * 获得设备精简列表（下拉选项用）
+     *
+     * @return 设备列表
+     */
+    List<MesDvMachineryDO> getMachinerySimpleList();
+
+    /**
      * 获得设备列表
      *
      * @param ids 编号数组
@@ -118,6 +118,11 @@ public class MesDvMachineryServiceImpl implements MesDvMachineryService {
     }
     @Override
+    public List<MesDvMachineryDO> getMachinerySimpleList() {
+        return machineryMapper.selectList();
+    }
+
+    @Override
     public List<MesDvMachineryDO> getMachineryList(Collection<Long> ids) {
         if (CollUtil.isEmpty(ids)) {
             return Collections.emptyList();
@@ -65,6 +65,13 @@ public interface MesDvSubjectService {
     void validateSubjectExists(Long id);
     /**
+     * 获得点检保养项目精简列表（下拉选项用）
+     *
+     * @return 项目列表
+     */
+    List<MesDvSubjectDO> getSubjectSimpleList();
+
+    /**
      * 获得点检保养项目列表
      *
      * @param ids 编号数组
@@ -93,6 +93,11 @@ public class MesDvSubjectServiceImpl implements MesDvSubjectService {
     }
     @Override
+    public List<MesDvSubjectDO> getSubjectSimpleList() {
+        return subjectMapper.selectList();
+    }
+
+    @Override
     public List<MesDvSubjectDO> getSubjectList(Collection<Long> ids) {
         if (CollUtil.isEmpty(ids)) {
             return Collections.emptyList();