板材库去掉价格

cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/plate/PlateController.java

@@ -114,9 +114,9 @@ public class PlateController {
         // 手动创建导出 demo
         List<PlateImportExcelVO> list = Arrays.asList(
                 PlateImportExcelVO.builder().goodsId("SP1123456").goodsName("xixih").material("颗粒板").width(String.valueOf(1212.3)).height(String.valueOf(12131.6))
-                        .thickness(String.valueOf(0.2)).brand("鹅厂").spec("大厂").remark("测试").price(String.valueOf(33333.2)).color("黑色").texture("有").build(),
+                        .thickness(String.valueOf(0.2)).brand("鹅厂").spec("大厂").remark("测试").color("黑色").texture("有").build(),
                 PlateImportExcelVO.builder().goodsId("SP1123457").goodsName("2L").material("yuanma@cf.com").width(String.valueOf(21.6)).height(String.valueOf(12231.6))
-                        .thickness(String.valueOf(5.3)).brand("kkkkkk").spec("大厂").remark("测试").price(String.valueOf(333.555)).color("黑色").texture("无").build()
+                        .thickness(String.valueOf(5.3)).brand("kkkkkk").spec("大厂").remark("测试").color("黑色").texture("无").build()
         );
         // 输出
         ExcelUtils.write(response, "板材导入模板.xlsx", "板材列表", PlateImportExcelVO.class, list);

cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/plate/vo/plate/PlateImportExcelVO.java

@@ -51,9 +51,9 @@ public class PlateImportExcelVO {
     @NotEmpty(message = "厚度不能为空")
     private String thickness;
 
-    @ExcelProperty("价格")
-    @NotEmpty(message = "价格不能为空")
-    private String price;
+//    @ExcelProperty("价格")
+//    @NotEmpty(message = "价格不能为空")
+//    private String price;
 
     @ExcelProperty("品牌")
     @NotEmpty(message = "品牌不能为空")

cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/plate/vo/plate/PlatePageReqVO.java

@@ -42,8 +42,8 @@ public class PlatePageReqVO extends PageParam {
     @Schema(description = "厚度")
     private Double thickness;
 
-    @Schema(description = "价格", example = "3380")
-    private Double price;
+//    @Schema(description = "价格", example = "3380")
+//    private Double price;
 
     @Schema(description = "品牌")
     private String brand;

cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/plate/vo/plate/PlateRespVO.java

@@ -33,7 +33,7 @@ public class PlateRespVO {
 
     @Schema(description = "纹理", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("纹理")
-    private String texture;
+    private Boolean texture;
 
     @Schema(description = "宽度", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("宽度")
@@ -47,9 +47,9 @@ public class PlateRespVO {
     @ExcelProperty("厚度")
     private Double thickness;
 
-    @Schema(description = "价格", requiredMode = Schema.RequiredMode.REQUIRED, example = "3380")
-    @ExcelProperty("价格")
-    private Double price;
+//    @Schema(description = "价格", requiredMode = Schema.RequiredMode.REQUIRED, example = "3380")
+//    @ExcelProperty("价格")
+//    private Double price;
 
     @Schema(description = "品牌", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("品牌")

cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/plate/vo/plate/PlateSaveReqVO.java

@@ -44,8 +44,8 @@ public class PlateSaveReqVO {
     @NotNull(message = "厚度不能为空")
     private Double thickness;
 
-    @Schema(description = "价格", example = "3380")
-    private Double price;
+//    @Schema(description = "价格", example = "3380")
+//    private Double price;
 
     @Schema(description = "品牌")
     private String brand;

cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/dataobject/plate/PlateDO.java

@@ -60,7 +60,7 @@ public class PlateDO extends BaseDO {
     /**
      * 价格
      */
-    private Double price;
+//    private Double price;
     /**
      * 品牌
      */

cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/plate/PlateMapper.java

@@ -33,7 +33,7 @@ public interface PlateMapper extends BaseMapperX<PlateDO> {
                 .likeIfPresent(PlateDO::getBrand, reqVO.getBrand())
                 .likeIfPresent(PlateDO::getSpec, reqVO.getSpec())
                 .likeIfPresent(PlateDO::getRemark, reqVO.getRemark())
-                .eqIfPresent(PlateDO::getPrice, reqVO.getPrice())
+//                .eqIfPresent(PlateDO::getPrice, reqVO.getPrice())
                 .eqIfPresent(PlateDO::getTexture, reqVO.getTexture())
                 .betweenIfPresent(PlateDO::getCreateTime, reqVO.getCreateTime());
 

cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/plate/PlateExcelListener.java

@@ -35,7 +35,7 @@ public final class PlateExcelListener<T> extends AnalysisEventListener<PlateImpo
         checkData(data.getHeight(),"高度",data);
         checkData(data.getWidth(),"宽度",data);
         checkData(data.getThickness(),"厚度",data);
-        checkData(data.getPrice(),"价格",data);
+//        checkData(data.getPrice(),"价格",data);
         checkTexture(data.getTexture(),"纹理",data);
         if (data.getResult() != null)
             data.setResult(data.getResult().replace("null,", ""));

cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/mapper/plate/PlateMapper.xml

@@ -20,8 +20,7 @@
             create_time,
             updater,
             update_time,
-            deleted,
-            price
+            deleted
         FROM
             plate
         where organ_id = #{organId} and id = #{id} and deleted = 0