BUG修改

win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/controller/item/vo/ItemExportReqVO.java

@@ -70,4 +70,5 @@ public class ItemExportReqVO {
     private Integer concurrencyStamp;
 
 
+
 }

win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/controller/itemaccounts/vo/ItemAccountsBaseVO.java

@@ -164,4 +164,10 @@ public class ItemAccountsBaseVO {
     @Schema(description = "并发乐观锁", requiredMode = Schema.RequiredMode.REQUIRED)
     private Integer concurrencyStamp;
 
+    @Schema(description = "使用地点")
+    private String usePlace;
+
+    @Schema(description = "项目")
+    private String project;
+
 }

win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/controller/itemaccounts/vo/ItemAccountsExcelVO.java

@@ -4,6 +4,7 @@ import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.win.framework.excel.core.annotations.DictFormat;
 import com.win.framework.excel.core.convert.DictConvert;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.math.BigDecimal;
@@ -37,10 +38,24 @@ public class ItemAccountsExcelVO {
 
     @ExcelProperty("库存数量")
     private BigDecimal qty;
+
     @DictFormat("item_account_location_type") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中
     @ExcelProperty(value = "库存类型", converter = DictConvert.class)
     private String type;
 
+    @ExcelProperty("ABC分类")
+    private String classification;
+
+    @ExcelProperty("规格型号")
+    private String specifications;
+
+    @ExcelProperty("使用地点")
+    private String usePlace;
+
+    @ExcelProperty("项目")
+
+    private String project;
+
     @ExcelProperty("创建时间")
     private LocalDateTime createTime;
     @ExcelIgnore

win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/controller/location/vo/LocationBaseVO.java

@@ -16,10 +16,11 @@ public class LocationBaseVO {
     private Long id;
 
     @Schema(description = "编号唯一标识", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotNull(message = "库位编号不能为空")
+
     private String number;
 
     @Schema(description = "名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋艿")
-    @NotNull(message = "名称不能为空")
     private String name;
 
     @Schema(description = "描述", example = "你猜")

win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/controller/locationarea/vo/LocationAreaBaseVO.java

@@ -16,10 +16,10 @@ public class LocationAreaBaseVO {
     private Long id;
 
     @Schema(description = "编号唯一标识", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotNull(message = "库区编号不能为空")
     private String number;
 
     @Schema(description = "名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "王五")
-    @NotNull(message = "名称不能为空")
     private String name;
 
     @Schema(description = "描述", example = "你猜")

win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/dal/dataobject/itemaccounts/ItemAccountsDO.java

@@ -192,6 +192,17 @@ public class ItemAccountsDO extends BaseDO {
     @TableField(exist = false)
     private String transactionType;
 
+    /**
+     * 使用地点
+     */
+    @TableField(exist = false)
+    private String usePlace;
+    /**
+     * 项目
+     */
+    @TableField(exist = false)
+    private String project;
+
     //基础信息备件的属性
     @TableField(exist = false)
     private ItemDO itemDO;

win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/service/itemaccounts/ItemAccountsServiceImpl.java

@@ -327,6 +327,10 @@ public class ItemAccountsServiceImpl implements ItemAccountsService {
                 itemAccountsDO.setName(itemDO.getName());
                 itemAccountsDO.setBrand(itemDO.getBrand());
                 itemAccountsDO.setSpecifications(itemDO.getSpecifications());
+                itemAccountsDO.setUom(itemDO.getUom());
+                itemAccountsDO.setClassification(itemDO.getClassification());
+                itemAccountsDO.setUsePlace(itemDO.getUsePlace());
+                itemAccountsDO.setProject(itemDO.getProject());
                 itemAccountsDO.setDescribes(itemDO.getDescribes());
             }
         }