From 5dc34f36049194d1a124eb60dd68cb17e498caec Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期四, 30 四月 2026 09:49:13 +0800
Subject: [PATCH] fix：原料、过程与出厂检验导出列修改

---
 src/main/java/com/ruoyi/quality/service/impl/QualityInspectServiceImpl.java |   73 +++++++++++++++++++++++++++++++-----
 1 files changed, 62 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/ruoyi/quality/service/impl/QualityInspectServiceImpl.java b/src/main/java/com/ruoyi/quality/service/impl/QualityInspectServiceImpl.java
index c6e40e4..6a8d220 100644
--- a/src/main/java/com/ruoyi/quality/service/impl/QualityInspectServiceImpl.java
+++ b/src/main/java/com/ruoyi/quality/service/impl/QualityInspectServiceImpl.java
@@ -10,6 +10,9 @@
 import com.deepoove.poi.config.Configure;
 import com.ruoyi.common.enums.StockInQualifiedRecordTypeEnum;
 import com.ruoyi.common.enums.StockOutQualifiedRecordTypeEnum;
+import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.common.utils.DictUtils;
+import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.HackLoopTableRenderPolicy;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.procurementrecord.service.ProcurementRecordService;
@@ -33,6 +36,7 @@
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.net.URLEncoder;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -59,6 +63,7 @@
     public int add(QualityInspectDto qualityInspectDto) {
         QualityInspect qualityInspect = new QualityInspect();
         BeanUtils.copyProperties(qualityInspectDto, qualityInspect);
+        validateProcessType(qualityInspect);
         qualityInspect.setInspectState(0);//榛樿鏈彁浜�
         qualityInspectMapper.insert(qualityInspect);
         for (QualityInspectParam qualityInspectParam : qualityInspectDto.getQualityInspectParams()) {
@@ -167,6 +172,7 @@
         }
         QualityInspect qualityInspect = new QualityInspect();
         BeanUtils.copyProperties(qualityInspectDto, qualityInspect);
+        validateProcessType(qualityInspect);
         return qualityInspectMapper.updateById(qualityInspect);
     }
 
@@ -178,19 +184,64 @@
     @Override
     public void qualityInspectExport(HttpServletResponse response, QualityInspect qualityInspect) {
         List<QualityInspect> qualityInspects = qualityInspectMapper.qualityInspectExport(qualityInspect);
-        ExcelUtil<QualityInspect> util = new ExcelUtil<QualityInspect>(QualityInspect.class);
-        switch (qualityInspect.getInspectType()) {
-            case 0:
-                util.exportExcel(response, qualityInspects, "鍘熸潗鏂欐楠屽鍑�");
-                break;
-            case 1:
-                util.exportExcel(response, qualityInspects, "杩囩▼妫�楠屽鍑�");
-                break;
-            case 2:
-                util.exportExcel(response, qualityInspects, "鍑哄巶妫�楠屽鍑�");
-                break;
+        if (qualityInspects != null && !qualityInspects.isEmpty()) {
+            for (QualityInspect inspect : qualityInspects) {
+                if (inspect == null || inspect.getProcessType() == null) {
+                    continue;
+                }
+                String processLabel = DictUtils.getDictLabel("product_process_type", String.valueOf(inspect.getProcessType()));
+                if (StringUtils.isNotEmpty(processLabel)) {
+                    inspect.setProcess(processLabel);
+                }
+            }
         }
 
+        ExcelUtil<QualityInspect> util = new ExcelUtil<>(QualityInspect.class);
+        String sheetName = "妫�楠屽鍑�";
+        if (qualityInspect != null && qualityInspect.getInspectType() != null) {
+            switch (qualityInspect.getInspectType()) {
+                case 0:
+                    util.hideColumn("customer", "process");
+                    sheetName = "鍘熸潗鏂欐楠屽鍑�";
+                    break;
+                case 1:
+                    util.hideColumn("supplier", "customer");
+                    sheetName = "杩囩▼妫�楠屽鍑�";
+                    break;
+                case 2:
+                    util.hideColumn("supplier", "customer", "process");
+                    sheetName = "鍑哄巶妫�楠屽鍑�";
+                    break;
+                default:
+                    break;
+            }
+        }
+        util.exportExcel(response, qualityInspects, sheetName);
+
+    }
+
+    private void validateProcessType(QualityInspect qualityInspect) {
+        if (qualityInspect == null || qualityInspect.getProcessType() == null) {
+            return;
+        }
+
+        String dictType = "product_process_type";
+        String input = String.valueOf(qualityInspect.getProcessType());
+
+        String dictValue = DictUtils.getDictValue(dictType, input);
+        if (StringUtils.isNotEmpty(dictValue)) {
+            qualityInspect.setProcessType(Integer.valueOf(dictValue));
+            return;
+        }
+        String dictValues = DictUtils.getDictValues(dictType);
+        if (StringUtils.isNotEmpty(dictValues)) {
+            List<String> valueList = Arrays.asList(dictValues.split(DictUtils.SEPARATOR));
+            if (valueList.contains(input)) {
+                return;
+            }
+        }
+
+        throw new ServiceException("宸ュ簭绫诲瀷銆�" + input + "銆戜笉瀛樺湪锛岃濉啓姝ｇ‘鐨勭被鍨嬶細" + DictUtils.getDictLabels(dictType));
     }
 
 

--
Gitblit v1.9.3