From 32b7ab41b06671426daed85acbffe0fe37ff5a50 Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Thu, 17 Sep 2026 09:21:31 +0800
Subject: [PATCH] =?UTF-8?q?2026-09-17=20=E9=A1=B9=E7=9B=AE=E7=89=A9?=
 =?UTF-8?q?=E6=96=99=E5=9C=A8=E6=96=B0=E5=A2=9E=E6=88=96=E5=AF=BC=E5=85=A5?=
 =?UTF-8?q?=E6=97=B6=EF=BC=8C=E6=AD=A3=E5=BC=8F=E7=89=A9=E6=96=99=E4=B8=8D?=
 =?UTF-8?q?=E9=9C=80=E8=A6=81=E6=A0=A1=E9=AA=8C=E2=80=9C=E5=BA=94=E7=94=A8?=
 =?UTF-8?q?=E6=8F=8F=E8=BF=B0=E2=80=9D=E5=92=8C=E2=80=9C=E4=BA=A7=E5=93=81?=
 =?UTF-8?q?=E7=B1=BB=E5=88=AB=E2=80=9D=E5=BF=85=E5=A1=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/PartInformationServiceImpl.java      | 33 ++++++++++++-------
 .../mapper/part/PartInformationMapper.xml     |  2 ++
 2 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/spring/modules/part/service/impl/PartInformationServiceImpl.java b/src/main/java/com/spring/modules/part/service/impl/PartInformationServiceImpl.java
index 69cf9fe5..19e83f23 100644
--- a/src/main/java/com/spring/modules/part/service/impl/PartInformationServiceImpl.java
+++ b/src/main/java/com/spring/modules/part/service/impl/PartInformationServiceImpl.java
@@ -5603,14 +5603,7 @@ public class PartInformationServiceImpl extends ServiceImpl<PartInformationMappe
                 part.setCustomerPartNo(getStringCellValue(row, 2));
                 part.setApplicationDesc(getStringCellValue(row, 3));
                 part.setProductCategory(getStringCellValue(row, 4));
-                if (!StringUtils.hasText(part.getApplicationDesc())) {
-                    flag = false;
-                    emptyApplicationDescRows.add(j + 1);
-                }
-                if (!StringUtils.hasText(part.getProductCategory())) {
-                    flag = false;
-                    emptyProductCategoryRows.add(j + 1);
-                } else if (!isValidProjectPartProductCategory(part.getProductCategory())) {
+                if (StringUtils.hasText(part.getProductCategory()) && !isValidProjectPartProductCategory(part.getProductCategory())) {
                     flag = false;
                     wrongProductCategoryRows.add(j + 1);
                 }
@@ -5646,6 +5639,16 @@ public class PartInformationServiceImpl extends ServiceImpl<PartInformationMappe
             vo.setCustomerPartNo(part.getCustomerPartNo());
             vo.setApplicationDesc(part.getApplicationDesc());
             vo.setProductCategory(StringUtils.hasText(part.getProductCategory()) ? part.getProductCategory().trim() : null);
+            if (isTemporaryPart(vo.getSite(), vo)) {
+                if (!StringUtils.hasText(vo.getApplicationDesc())) {
+                    flag = false;
+                    emptyApplicationDescRows.add(ifsPartNoMap.get(part.getFinalPartNo()));
+                }
+                if (!StringUtils.hasText(vo.getProductCategory())) {
+                    flag = false;
+                    emptyProductCategoryRows.add(ifsPartNoMap.get(part.getFinalPartNo()));
+                }
+            }
             list1.add(vo);
         }
         if (flag){
@@ -5788,10 +5791,18 @@ public class PartInformationServiceImpl extends ServiceImpl<PartInformationMappe
         }
         for (int i = 0; i < partList.size(); i++) {
             PartInformationVo part = partList.get(i);
-            String partNo = part == null ? null : (StringUtils.hasText(part.getPartNo()) ? part.getPartNo() : part.getPlmPartNo());
+            if (part == null) {
+                continue;
+            }
+            String partNo = StringUtils.hasText(part.getPartNo()) ? part.getPartNo() : part.getPlmPartNo();
             String prefix = StringUtils.hasText(partNo) ? "物料[" + partNo + "]：" : "第" + (i + 1) + "条物料：";
-            validateProjectPartRequiredFields(part == null ? null : part.getApplicationDesc(),
-                    part == null ? null : part.getProductCategory(), prefix);
+            if (!isTemporaryPart(part.getSite(), part)) {
+                if (StringUtils.hasText(part.getProductCategory()) && !isValidProjectPartProductCategory(part.getProductCategory())) {
+                    throw new RuntimeException(prefix + "产品类别无效，仅支持 Label/Diecut/Decoration/Material");
+                }
+                continue;
+            }
+            validateProjectPartRequiredFields(part.getApplicationDesc(), part.getProductCategory(), prefix);
         }
     }
 
diff --git a/src/main/resources/mapper/part/PartInformationMapper.xml b/src/main/resources/mapper/part/PartInformationMapper.xml
index 45df8f54..6b809ea4 100644
--- a/src/main/resources/mapper/part/PartInformationMapper.xml
+++ b/src/main/resources/mapper/part/PartInformationMapper.xml
@@ -1390,6 +1390,8 @@
 <!--        dbo.plm_get_bu_desc(a.site,a.bu_no) buDesc,-->
         c.ifs_part_no as finalPartNo,
         c.plm_part_no,
+        c.status,
+        c.temporary_part_flag,
         dbo.get_customer_part_no(a.site, a.test_part_no, #{query.customerId}, 'ProjectPart') as customer_part_no
         from  plm_project_part a
         left join plm_project_part b on a.site = b.site and a.bu_no = b.bu_no and a.project_id = b.project_id