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());

ym-packing/src/main/java/com/cnbm/packing/excel/WoPackagingBoxSubstrateExcel.java

@@ -38,14 +38,6 @@ 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;
 

ym-packing/src/main/java/com/cnbm/packing/excel/WoPackagingBoxSubstrateManualExcel.java

@@ -26,14 +26,6 @@ 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;
 

ym-packing/src/main/resources/mapper/WoPackagingBoxSubstrateMapper.xml

@@ -124,8 +124,7 @@
 
     <select id="substrateList" resultType="com.cnbm.packing.dto.WoPackagingBoxSubstrateDTO">
         select
-        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
+        twpb.CREATE_TIME as boxCreateTime,twpbs.*,twpb.PRINT_TIME as printTime
         from t_wo_packaging_box_substrate twpbs
         left join t_wo_packaging_box twpb on twpbs.PACKAGING_BOX_ID = twpb.BOX_NO
         <where>