实体类增加字段

yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/product/ErpProductUnitController.java

@@ -92,7 +92,12 @@ public class ErpProductUnitController {
     @Operation(summary = "获得产品单位精简列表", description = "只包含被开启的单位，主要用于前端的下拉选项")
     public CommonResult<List<ErpProductUnitRespVO>> getProductUnitSimpleList() {
         List<ErpProductUnitDO> list = productUnitService.getProductUnitListByStatus(CommonStatusEnum.ENABLE.getStatus());
-        return success(convertList(list, unit -> new ErpProductUnitRespVO().setId(unit.getId()).setName(unit.getName())));
+        list.stream().forEach(item -> {
+            item.setValue(item.getId().toString());
+            item.setLabel(item.getName());
+        });
+        List<ErpProductUnitRespVO> erpProductUnitRespVOS = convertList(list, unit -> new ErpProductUnitRespVO().setId(unit.getId()).setName(unit.getName()).setValue(unit.getId().toString()).setLabel(unit.getName()));
+        return success(erpProductUnitRespVOS);
     }
 
     @GetMapping("/export-excel")

yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/product/vo/product/ErpProductPageReqVO.java

@@ -17,6 +17,9 @@ public class ErpProductPageReqVO extends PageParam {
     @Schema(description = "产品名称", example = "李四")
     private String name;
 
+    @Schema(description = "规格型号", example = "")
+    private String deviceSpec;
+
     @Schema(description = "产品分类编号", example = "11161")
     private Long categoryId;
 

yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/product/vo/product/ErpProductRespVO.java

@@ -23,6 +23,10 @@ public class ErpProductRespVO extends ErpProductDO {
     @ExcelProperty("产品名称")
     private String name;
 
+    @Schema(description = "规格型号", example = "")
+    @ExcelProperty("规格型号")
+    private String deviceSpec;
+
     @Schema(description = "产品条码", requiredMode = Schema.RequiredMode.REQUIRED, example = "X110")
     @ExcelProperty("产品条码")
     private String barCode;

yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/product/vo/product/ProductSaveReqVO.java

@@ -1,5 +1,6 @@
 package cn.iocoder.yudao.module.erp.controller.admin.product.vo.product;
 
+import com.alibaba.excel.annotation.ExcelProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
@@ -19,6 +20,9 @@ public class ProductSaveReqVO {
     @NotEmpty(message = "产品名称不能为空")
     private String name;
 
+    @Schema(description = "规格型号", example = "")
+    private String deviceSpec;
+
     @Schema(description = "产品条码", requiredMode = Schema.RequiredMode.REQUIRED, example = "X110")
 //    @NotEmpty(message = "产品条码不能为空")
     private String barCode;

yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/product/vo/unit/ErpProductUnitRespVO.java

@@ -4,6 +4,7 @@ import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat;
 import cn.iocoder.yudao.module.system.enums.DictTypeConstants;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
@@ -43,4 +44,7 @@ public class ErpProductUnitRespVO {
     @ExcelProperty("创建时间")
     private LocalDateTime createTime;
 
+    private String value;
+    private String label;
+
 }

yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/product/ErpProductDO.java

@@ -1,10 +1,12 @@
 package cn.iocoder.yudao.module.erp.dal.dataobject.product;
 
 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import com.alibaba.excel.annotation.ExcelProperty;
 import com.baomidou.mybatisplus.annotation.KeySequence;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 
 import java.math.BigDecimal;
@@ -33,6 +35,11 @@ public class ErpProductDO extends BaseDO {
      * 产品名称
      */
     private String name;
+
+    /**
+     * 规格型号
+     */
+    private String deviceSpec;
     /**
      * 产品条码
      */

yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/product/ErpProductUnitDO.java

@@ -46,6 +46,10 @@ public class ErpProductUnitDO extends BaseDO {
     /**
      * 单位状态
      */
-    private Integer status;
 
+    private Integer status;
+    @TableField(exist = false)
+    private String value;
+    @TableField(exist = false)
+    private String label;
 }

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/criticalcomponent/vo/CriticalComponentExcelVO.java

@@ -28,6 +28,10 @@ public class CriticalComponentExcelVO {
     @ExcelProperty("名称")
     private String name;
 
+    @Schema(description = "规格型号", example = "")
+    @ExcelProperty("规格型号")
+    private String deviceSpec;
+
     @Schema(description = "描述")
     @ExcelProperty("描述")
     private String description;

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/criticalcomponent/vo/CriticalComponentImportExcelVO.java

@@ -27,6 +27,10 @@ public class CriticalComponentImportExcelVO {
     @ExcelProperty("名称")
     private String name;
 
+    @Schema(description = "规格型号", example = "")
+    @ExcelProperty("规格型号")
+    private String deviceSpec;
+
     @ExcelProperty("描述")
     private String description;
 

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/criticalcomponent/vo/CriticalComponentPageReqVO.java

@@ -1,5 +1,6 @@
 package cn.iocoder.yudao.module.mes.controller.admin.criticalcomponent.vo;
 
+import com.alibaba.excel.annotation.ExcelProperty;
 import lombok.*;
 import java.util.*;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -21,6 +22,9 @@ public class CriticalComponentPageReqVO extends PageParam {
     @Schema(description = "名称", example = "张三")
     private String name;
 
+    @Schema(description = "规格型号", example = "")
+    private String deviceSpec;
+
     @Schema(description = "描述", example = "你说的对")
     private String description;
 

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/criticalcomponent/vo/CriticalComponentRespVO.java

@@ -25,6 +25,10 @@ public class CriticalComponentRespVO {
     @ExcelProperty("名称")
     private String name;
 
+    @Schema(description = "规格型号", example = "")
+    @ExcelProperty("规格型号")
+    private String deviceSpec;
+
     @Schema(description = "描述", example = "你说的对")
     @ExcelProperty("描述")
     private String description;

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/criticalcomponent/vo/CriticalComponentSaveReqVO.java

@@ -20,6 +20,9 @@ public class CriticalComponentSaveReqVO {
     @NotEmpty(message = "名称不能为空")
     private String name;
 
+    @Schema(description = "规格型号", example = "")
+    private String deviceSpec;
+
     @Schema(description = "描述", example = "你说的对")
     private String description;
 

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/deviceledger/vo/DeviceLedgerPageReqVO.java

@@ -17,6 +17,9 @@ import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_
 @ToString(callSuper = true)
 public class DeviceLedgerPageReqVO extends PageParam {
 
+    @Schema(description = "设备图片")
+    private String images;
+
     @Schema(description = "设备编号")
     private String deviceCode;
 

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/deviceledger/vo/DeviceLedgerRespVO.java

@@ -30,6 +30,9 @@ public class DeviceLedgerRespVO extends BaseDO {
 //    @ExcelProperty("id")
     private Long id;
 
+    @Schema(description = "设备图片")
+    private String images;
+
     @Schema(description = "设备编号")
     @ExcelProperty("设备编号")
     private String deviceCode;

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/deviceledger/vo/DeviceLedgerSaveReqVO.java

@@ -13,6 +13,9 @@ public class DeviceLedgerSaveReqVO {
     @Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED, example = "24467")
     private Long id;
 
+    @Schema(description = "设备图片")
+    private String images;
+
     @Schema(description = "设备编号")
     private String deviceCode;
 

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/criticalcomponent/CriticalComponentDO.java

@@ -1,5 +1,7 @@
 package cn.iocoder.yudao.module.mes.dal.dataobject.criticalcomponent;
 
+import com.alibaba.excel.annotation.ExcelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 import java.util.*;
 import java.time.LocalDateTime;
@@ -35,6 +37,10 @@ public class CriticalComponentDO extends BaseDO {
      * 名称
      */
     private String name;
+    /**
+     * 规格型号
+     */
+    private String deviceSpec;
     /**
      * 描述
      */

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/deviceledger/DeviceLedgerDO.java

@@ -33,6 +33,11 @@ public class DeviceLedgerDO extends BaseDO {
      */
     @TableId
     private Long id;
+
+    /**
+     * 设备图片
+     */
+    private String images;
     /**
      * 设备编号
      */