过期机具导入去掉品牌

kxs-product/kxs-product-api/src/main/java/com/kxs/product/api/vo/kxsapp/excel/MachineDeductExcelVo.java

@@ -24,13 +24,6 @@ public class MachineDeductExcelVo implements Serializable {
 	@ExcelIgnore
 	private Long lineNum;
 
-	/**
-	 * 机具号
-	 */
-	@NotBlank(message = "产品类型不能为空")
-	@ExcelProperty("产品类型")
-	private String brandName;
-
 	/**
 	 * SN编号
 	 */

kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/service/impl/KxsMachineDeductServiceImpl.java

@@ -40,7 +40,7 @@ public class KxsMachineDeductServiceImpl extends ServiceImpl<KxsMachineDeductMap
 
         // 通用校验获取失败的数据
         List<ErrorMessage> errorMessageList = (List<ErrorMessage>) bindingResult.getTarget();
-        // 执行数据插入操作 组装 PostDto
+        // 执行数据插入操作
         for (MachineDeductExcelVo excel : machineDeductExcelVos) {
             Set<String> errorMsg = new HashSet<>();
             KxsMachineDeduct machineDeduct = new KxsMachineDeduct();
@@ -51,13 +51,13 @@ public class KxsMachineDeductServiceImpl extends ServiceImpl<KxsMachineDeductMap
                 errorMsg.add(excel.getPosSn() + "已存在，请重新上传！");
             }
             //查询品牌
-            KxsBrand brand = brands.stream().filter(b -> b.getName().equals(excel.getBrandName())).findFirst().orElse(null);
-            // 数据不合法
-            if(brand == null){
-                errorMsg.add(ProductErrorTypeEnum.BRAND_EMPTY.getDescription());
-            }else{
-                machineDeduct.setBrandId(brand.getId());
-            }
+//            KxsBrand brand = brands.stream().filter(b -> b.getName().equals(excel.getBrandName())).findFirst().orElse(null);
+//            // 数据不合法
+//            if(brand == null){
+//                errorMsg.add(ProductErrorTypeEnum.BRAND_EMPTY.getDescription());
+//            }else{
+//                machineDeduct.setBrandId(brand.getId());
+//            }
             // 数据合法情况
             if (CollUtil.isEmpty(errorMsg)) {
                 this.save(machineDeduct);