From c6602d6099ce13f65bf0a0a99ba0f009b45b6102 Mon Sep 17 00:00:00 2001
From: yanyang <rainieyanic@outlook.com>
Date: Fri, 2 Feb 2024 14:43:57 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A3=85=E7=AE=B1=E5=8D=95=E5=AF=BC=E5=87=BA?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../packing/controller/ProductLevelController.java   | 12 ++++++------
 .../packing/excel/WoPackagingBoxSubstrateExcel.java  |  8 ++++++++
 .../excel/WoPackagingBoxSubstrateManualExcel.java    |  8 ++++++++
 .../mapper/WoPackagingBoxSubstrateMapper.xml         |  3 ++-
 4 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/ym-packing/src/main/java/com/cnbm/packing/controller/ProductLevelController.java b/ym-packing/src/main/java/com/cnbm/packing/controller/ProductLevelController.java
index 4420eb7..9a8bc9a 100644
--- a/ym-packing/src/main/java/com/cnbm/packing/controller/ProductLevelController.java
+++ b/ym-packing/src/main/java/com/cnbm/packing/controller/ProductLevelController.java
@@ -79,12 +79,12 @@ public class ProductLevelController {
         //效验数据
         ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
 
-        //验证编码是否重名
-        QueryWrapper<ProductLevel> wrapper1 = new QueryWrapper<>();
-        wrapper1.eq(ProductLevel.CODE, dto.getCode());
-        if(productLevelMapper.selectCount(wrapper1)!= 0){
-            return new Result().error(1,"编码重复");
-        }
+//        //验证编码是否重名
+//        QueryWrapper<ProductLevel> wrapper1 = new QueryWrapper<>();
+//        wrapper1.eq(ProductLevel.CODE, dto.getCode());
+//        if(productLevelMapper.selectCount(wrapper1)!= 0){
+//            return new Result().error(1,"编码重复");
+//        }
         //验证名称是否重名
         QueryWrapper<ProductLevel> wrapper2 = new QueryWrapper<>();
         wrapper2.eq(ProductLevel.PRODUCT_LEVEL, dto.getProductLevel());
diff --git a/ym-packing/src/main/java/com/cnbm/packing/excel/WoPackagingBoxSubstrateExcel.java b/ym-packing/src/main/java/com/cnbm/packing/excel/WoPackagingBoxSubstrateExcel.java
index 256948a..2fbcffa 100644
--- a/ym-packing/src/main/java/com/cnbm/packing/excel/WoPackagingBoxSubstrateExcel.java
+++ b/ym-packing/src/main/java/com/cnbm/packing/excel/WoPackagingBoxSubstrateExcel.java
@@ -38,6 +38,14 @@ public class WoPackagingBoxSubstrateExcel {
     private Float actualPmpp;
     @Excel(name = "线体")
     private Integer lineBody;
+    @Excel(name = "盖板")
+    private String coverName;
+    @Excel(name = "产品等级")
+    private String productGrade;
+    @Excel(name = "最大额定熔断电流")
+    private String maxFuseCurrent;
+    @Excel(name = "节数")
+    private String pitchNumber;
     @Excel(name = "最近打印时间")
     private String printTime1;
 
diff --git a/ym-packing/src/main/java/com/cnbm/packing/excel/WoPackagingBoxSubstrateManualExcel.java b/ym-packing/src/main/java/com/cnbm/packing/excel/WoPackagingBoxSubstrateManualExcel.java
index af6d26c..372df6f 100644
--- a/ym-packing/src/main/java/com/cnbm/packing/excel/WoPackagingBoxSubstrateManualExcel.java
+++ b/ym-packing/src/main/java/com/cnbm/packing/excel/WoPackagingBoxSubstrateManualExcel.java
@@ -26,6 +26,14 @@ public class WoPackagingBoxSubstrateManualExcel {
     private String powerLevel;
     @Excel(name = "线体")
     private Integer lineBody;
+    @Excel(name = "盖板")
+    private String coverName;
+    @Excel(name = "产品等级")
+    private String productGrade;
+    @Excel(name = "最大额定熔断电流")
+    private String maxFuseCurrent;
+    @Excel(name = "节数")
+    private String pitchNumber;
     @Excel(name = "最近打印时间")
     private String printTime1;
 
diff --git a/ym-packing/src/main/resources/mapper/WoPackagingBoxSubstrateMapper.xml b/ym-packing/src/main/resources/mapper/WoPackagingBoxSubstrateMapper.xml
index 494004d..912e096 100644
--- a/ym-packing/src/main/resources/mapper/WoPackagingBoxSubstrateMapper.xml
+++ b/ym-packing/src/main/resources/mapper/WoPackagingBoxSubstrateMapper.xml
@@ -124,7 +124,8 @@
 
     <select id="substrateList" resultType="com.cnbm.packing.dto.WoPackagingBoxSubstrateDTO">
         select
-        twpb.CREATE_TIME as boxCreateTime,twpbs.*,twpb.PRINT_TIME as printTime
+        twpb.CREATE_TIME as boxCreateTime,twpbs.*,twpb.PRINT_TIME as printTime,
+        twpb.product_grade as productGrade, twpb.pitch_number as pitchNumber, twpb.max_fuse_current as maxFuseCurrent, twpb.cover_name as coverName
         from t_wo_packaging_box_substrate twpbs
         left join t_wo_packaging_box twpb on twpbs.PACKAGING_BOX_ID = twpb.BOX_NO
         <where>
-- 
2.45.2