BJ_FS / urbanops

Commit 4e313d8a220b3775061211fcf7e826a60c6957df

Authored by wangqian
1 parent d7f03be7

工单管理物料登录返回物料名称

Inline Side-by-side
Showing 2 changed files with 17 additions and 11 deletions
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/admin/materialdetail/vo/MaterialDetailRespVO.java
  View file @4e313d8
1 1 package com.zteits.urbanops.module.workorder.controller.admin.materialdetail.vo;
2 2  
  3 +import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
  4 +import cn.idev.excel.annotation.ExcelProperty;
3 5 import io.swagger.v3.oas.annotations.media.Schema;
4   -import lombok.*;
5   -import java.util.*;
6   -import org.springframework.format.annotation.DateTimeFormat;
  6 +import lombok.Data;
  7 +
7 8 import java.time.LocalDateTime;
8   -import cn.idev.excel.annotation.*;
9 9  
10 10 @Schema(description = "管理后台 - 工单耗材明细 Response VO")
11 11 @Data
... ... @@ -72,4 +72,10 @@ public class MaterialDetailRespVO {
72 72 @ExcelProperty("创建时间")
73 73 private LocalDateTime createTime;
74 74  
75   -}
76 75 \ No newline at end of file
  76 + @Schema(description = "耗材ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "111")
  77 + private Long materialId;
  78 +
  79 + @Schema(description = "耗材名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "耗材名称")
  80 + @ExcelProperty("耗材名称")
  81 + private String materialName;
  82 +}
... ...
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/materialdetail/MaterialDetailServiceImpl.java
  View file @4e313d8
... ... @@ -120,12 +120,12 @@ public class MaterialDetailServiceImpl implements MaterialDetailService {
120 120 }
121 121 }
122 122 //已登记
123   - for (MaterialDetailDO materialDetailDO : materialDetailList) {
124   - MaterialDetailDO materialDetailDO1 = materialDetailMapper.selectOne(MaterialDetailDO::getMaterialId, materialDetailDO.getMaterialId());
125   - if (materialDetailDO1 != null) {
126   - throw exception0(BAD_REQUEST.getCode(),materialDetailDO.getMaterialName()+"已登记");
127   - }
128   - }
  123 +// for (MaterialDetailDO materialDetailDO : materialDetailList) {
  124 +// MaterialDetailDO materialDetailDO1 = materialDetailMapper.selectOne(MaterialDetailDO::getMaterialId, materialDetailDO.getMaterialId());
  125 +// if (materialDetailDO1 != null) {
  126 +// throw exception0(BAD_REQUEST.getCode(),materialDetailDO.getMaterialName()+"已登记");
  127 +// }
  128 +// }
129 129 //耗材出库
130 130 for (MaterialDetailDO materialDetailDO : materialDetailList) {
131 131 MaterialInventoryOutDto outDto = new MaterialInventoryOutDto();
... ...