From b8b5a67b2ef92a28446c6d69a70c8321cf563f10 Mon Sep 17 00:00:00 2001
From: lym <1994302445@qq.com>
Date: Thu, 3 Apr 2025 11:57:42 +0800
Subject: [PATCH] =?UTF-8?q?bug1454=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../manage/plate/PlateManageController.java   |   2 +-
 .../plate/vo/plate/PlateImportExcelVO.java    |  12 ++---
 .../manage/plate/vo/plate/PlateRespVO.java    |   2 +-
 .../dal/mysql/plate/PlateGoodMapper.java      |   4 +-
 .../manage/plate/PlateExcelListener.java      |  47 +++++++++++++++---
 .../manage/plate/PlateManageService.java      |   4 +-
 .../manage/plate/PlateManageServiceImpl.java  |   7 +--
 .../main/resources/type/excel_plate_add.xlsx  | Bin 12060 -> 12065 bytes
 8 files changed, 55 insertions(+), 23 deletions(-)

diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/manage/plate/PlateManageController.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/manage/plate/PlateManageController.java
index 86f07782d..9ed139763 100644
--- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/manage/plate/PlateManageController.java
+++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/manage/plate/PlateManageController.java
@@ -159,7 +159,7 @@ public class PlateManageController {
                                                        @RequestParam(value = "organId") Long organId,
                                                        HttpServletResponse response) throws Exception {
         ExcelReadUtil excelReadUtil = new ExcelReadUtil();
-        PlateExcelListener listener = new PlateExcelListener();
+        PlateExcelListener listener = new PlateExcelListener(updateSupport, plateService);
         List<PlateImportExcelVO> list = excelReadUtil.read(file, PlateImportExcelVO.class, listener);
 
 //        判断文件是否导入成功
diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/manage/plate/vo/plate/PlateImportExcelVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/manage/plate/vo/plate/PlateImportExcelVO.java
index c392e9e33..d6312f2cd 100644
--- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/manage/plate/vo/plate/PlateImportExcelVO.java
+++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/manage/plate/vo/plate/PlateImportExcelVO.java
@@ -42,12 +42,12 @@ public class PlateImportExcelVO {
 
     @ExcelProperty("宽度")
     @ColumnWidth(10)
-    @NotEmpty(message = "宽度不能为空")
+//    @NotEmpty(message = "宽度不能为空")
     private String width;
 
-    @ExcelProperty("高度")// float(8,3)
+    @ExcelProperty("长度")// float(8,3)
     @ColumnWidth(10)
-    @NotEmpty(message = "高度不能为空")
+//    @NotEmpty(message = "长度不能为空")
     private String height;
 
     @ExcelProperty("*厚度")
@@ -56,18 +56,18 @@ public class PlateImportExcelVO {
     private String thickness;
 
     @ExcelProperty("规格")
-    @NotEmpty(message = "规格不能为空")
+//    @NotEmpty(message = "规格不能为空")
     private String spec;
 
     @ExcelProperty("备注")
     private String remark;
 
     @ExcelProperty("品牌")
-    @NotEmpty(message = "品牌不能为空")
+//    @NotEmpty(message = "品牌不能为空")
     private String brand;
 
     @ExcelProperty("价格")
-    @NotEmpty(message = "价格不能为空")
+//    @NotEmpty(message = "价格不能为空")
     private String price;
 
     @ExcelProperty("上传结果")
diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/manage/plate/vo/plate/PlateRespVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/manage/plate/vo/plate/PlateRespVO.java
index 3297be00b..f3a770f18 100644
--- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/manage/plate/vo/plate/PlateRespVO.java
+++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/manage/plate/vo/plate/PlateRespVO.java
@@ -46,7 +46,7 @@ public class PlateRespVO {
     private Double width;
 
     @Schema(description = "高度", requiredMode = Schema.RequiredMode.REQUIRED)
-    @ExcelProperty("高度")
+    @ExcelProperty("长度")
     private Double height;
 
     @Schema(description = "厚度", requiredMode = Schema.RequiredMode.REQUIRED)
diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/plate/PlateGoodMapper.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/plate/PlateGoodMapper.java
index 55b2006d6..7de78a1c0 100644
--- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/plate/PlateGoodMapper.java
+++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/plate/PlateGoodMapper.java
@@ -101,8 +101,8 @@ public interface PlateGoodMapper extends BaseMapperX<PlateGoodDO> {
                 .in(PlateGoodDO::getGoodsId, goodsId));
     }
 
-    default PlateGoodDO selectByGoodID(String goodId , Long organId) {
-        return selectOne(PlateGoodDO::getGoodsId, goodId, PlateGoodDO::getOrganId, organId);
+    default PlateGoodDO selectByGoodID(String goodId , Long organId, boolean deleted) {
+        return selectOne(PlateGoodDO::getGoodsId, goodId, PlateGoodDO::getOrganId, organId, PlateGoodDO::getDeleted, deleted);
     }
 
     default PageResult<PlateGoodDO> selectPage(PlatePageReqVO reqVO) {
diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/manage/plate/PlateExcelListener.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/manage/plate/PlateExcelListener.java
index 88f900a0c..830b97ba4 100644
--- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/manage/plate/PlateExcelListener.java
+++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/manage/plate/PlateExcelListener.java
@@ -1,9 +1,12 @@
 package com.cf.imes.module.executor.service.manage.plate;
 
 import com.alibaba.excel.context.AnalysisContext;
+import com.cf.imes.framework.dict.core.util.DictFrameworkUtils;
 import com.cf.imes.module.executor.controller.admin.manage.plate.vo.plate.PlateImportExcelVO;
+import com.cf.imes.module.executor.enums.DictTypeConstants;
 import com.cf.imes.module.executor.util.file.ExcelListener;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -23,6 +26,15 @@ public final class PlateExcelListener<T> extends ExcelListener<PlateImportExcelV
 
     private Map<Integer, String> valueMap = new HashMap<>();
 
+    private boolean updateSupport; // 是否更新
+
+    private PlateManageService plateManageService;
+
+    public PlateExcelListener(boolean updateSupport, PlateManageService plateManageService) {
+        this.updateSupport = updateSupport;
+        this.plateManageService = plateManageService;
+    }
+
     /**
      * 每解析一行都会回调invoke()方法
      *
@@ -35,14 +47,19 @@ public final class PlateExcelListener<T> extends ExcelListener<PlateImportExcelV
             data.setResult("板材【*】信息请填写完整");
             this.flag = false;
         }
-        checkData(data.getHeight(),"高度",data);
+        checkData(data.getHeight(),"长度",data);
         checkData(data.getWidth(),"宽度",data);
+        setIfInvalid(data.getThickness(),"厚度",data);
         checkData(data.getThickness(),"厚度",data);
         if (data.getPrice() == null || data.getPrice().equals("")) {
             data.setPrice("0");
         }
         checkData(data.getPrice(),"价格",data);
         checkTexture(data.getTexture(),"纹理",data);
+//        判断goodsID是否重复
+        if (!updateSupport) {
+            checkGoodsId(data.getGoodsId(),"物料编号",data);
+        }
 //        字段长度判断
         checkLength(data.getGoodsId(),"物料编号",data,32);
         checkLength(data.getGoodsName(),"物料名称",data,64);
@@ -59,12 +76,26 @@ public final class PlateExcelListener<T> extends ExcelListener<PlateImportExcelV
     }
 
 //    错误判断
-    private void checkData(String valueCheck, String head, PlateImportExcelVO data) {
-//        长宽厚、价格判断非空
+//    goodsId存在判断
+    private void checkGoodsId(String valueCheck, String head, PlateImportExcelVO data) {
+        if (valueCheck != null && !valueCheck.equals("")) {
+            String value = valueCheck.trim();
+            if (plateManageService.getPlateGoods(value)  != null) {
+                this.flag = false;
+                data.setResult(data.getResult() + "," + head + "信息重复");
+            }
+        }
+    }
+//    非空判断
+    private void setIfInvalid(String valueCheck, String head, PlateImportExcelVO data) {
         if (valueCheck == null || valueCheck.equals("")) {
             this.flag = false;
             data.setResult(data.getResult() + "," + head + "信息缺少");
-        } else {
+        }
+    }
+    private void checkData(String valueCheck, String head, PlateImportExcelVO data) {
+//        长宽厚、价格判断非空
+        if (valueCheck != null && !valueCheck.equals("")) {
             try {
                 if (!data.checkPrecision(Double.valueOf(valueCheck))) {
                     data.setResult(data.getResult() + "," + head + "数据有误");
@@ -81,13 +112,13 @@ public final class PlateExcelListener<T> extends ExcelListener<PlateImportExcelV
 
         if (valueCheck != null && !valueCheck.equals("")) {
             String value = valueCheck.trim();
-            if (!value.equals("有") && !value.equals("无")) {
+
+            String dictData = DictFrameworkUtils.parseDictDataValue(DictTypeConstants.PLATE_TEXTURE_TYPE, value);
+            if (StringUtils.isEmpty(dictData)) {
                 this.flag = false;
                 data.setResult(data.getResult() + "," + head + "信息有误");
-            } else if (value.equals("有")) {
-                data.setTexture("有");
             } else {
-                data.setTexture("无");
+                data.setTexture(dictData);
             }
         }
     }
diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/manage/plate/PlateManageService.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/manage/plate/PlateManageService.java
index 3688d2559..3290463e2 100644
--- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/manage/plate/PlateManageService.java
+++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/manage/plate/PlateManageService.java
@@ -53,10 +53,10 @@ public interface PlateManageService {
     /**
      * 获得板材信息表 plate_{N}
      *
-     * @param id 编号
+     * @param goodsId 编号
      * @return 板材信息表 plate_{N}
      */
-    PlateGoodDO getPlateGoods(String id, Long organId);
+    PlateGoodDO getPlateGoods(String goodsId);
 
     /**
      * 获得板材信息表 plate_{N}分页
diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/manage/plate/PlateManageServiceImpl.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/manage/plate/PlateManageServiceImpl.java
index 1205142d2..a2b2ca3c8 100644
--- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/manage/plate/PlateManageServiceImpl.java
+++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/manage/plate/PlateManageServiceImpl.java
@@ -139,8 +139,9 @@ public class PlateManageServiceImpl implements PlateManageService {
     }
 
     @Override
-    public PlateGoodDO getPlateGoods(String id, Long organId) {
-        return plateGoodMapper.selectByGoodID(id, organId);
+    public PlateGoodDO getPlateGoods(String id) {
+        Long organId = getOrganId(BASE_PLATE_QUERY_PERMISSION, getLoginUser().getId(), null);
+        return plateGoodMapper.selectByGoodID(id, organId , false);
     }
 
     @Override
@@ -375,7 +376,7 @@ public class PlateManageServiceImpl implements PlateManageService {
 
     //    当前组织中板材是否存在
     private void validateGoodExists(String goodsId, Long organId) {
-        if (plateGoodMapper.selectByGoodID(goodsId, organId) != null) {
+        if (plateGoodMapper.selectByGoodID(goodsId, organId, false) != null) {
             throw exception(ErrorCodeConstants.PLATE_EXISTS);
         }
     }
diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/type/excel_plate_add.xlsx b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/type/excel_plate_add.xlsx
index f2a8bb33c784c02aa1433f42f1b1bd00ce5f357c..299136115aa08d8e652cfac9124c9ed669296092 100644
GIT binary patch
delta 2746
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
AeE<Le

delta 2777
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
a&;k&K)&P3}B(yqM1^9`Uq$`&GTkt>8TNexf