1.增加物资导入功能-仓库不存在提示

maintain-business/src/main/java/com/maintain/business/domain/vo/ErpMaterialVo.java

@@ -97,6 +97,7 @@ public class ErpMaterialVo implements Serializable {
     /**
      * 仓库名称
      */
+    @ExcelProperty(value = "仓库名称")
     private String warehouseName;
 
     /**

maintain-business/src/main/java/com/maintain/business/listener/ErpMaterialImportListener.java

@@ -65,6 +65,24 @@ public class ErpMaterialImportListener extends AnalysisEventListener<ErpMaterial
             if (ObjectUtil.isNull(material)) {
                 material = BeanUtil.toBean(materialImportVo, ErpMaterial.class);
                 ValidatorUtils.validate(material);
+                /**
+                 * 物资仓库
+                 */
+                if (StringUtils.isNotEmpty(material.getWarehouseName())) {
+                    ErpWarehouse erpWarehouse = warehouseMapper.selectOne(new LambdaQueryWrapper<ErpWarehouse>().eq(ErpWarehouse::getName, material.getWarehouseName()));
+                    if (ObjectUtil.isNull(erpWarehouse)) {
+//                        ErpWarehouse warehouse = new ErpWarehouse();
+//                        warehouse.setCode(material.getWarehouseName());
+//                        warehouse.setName(material.getWarehouseName());
+//                        warehouseMapper.insert(warehouse);
+//                        material.setWarehouseId(warehouse.getId());
+                        throw new RuntimeException("所属仓库不存在，创建仓库后再次导入");
+                    }else {
+                        material.setDeptId(erpWarehouse.getDeptId());
+                        material.setDeptName(erpWarehouse.getDeptName());
+                        material.setWarehouseId(erpWarehouse.getId());
+                    }
+                }
                 /**
                  * 物资类型
                  */
@@ -81,21 +99,6 @@ public class ErpMaterialImportListener extends AnalysisEventListener<ErpMaterial
                         material.setMaterialTypeId(materialTypes.get(0).getTypeId());
                     }
                 }
-                /**
-                 * 物资仓库
-                 */
-                if (StringUtils.isNotEmpty(material.getWarehouseName())) {
-                    ErpWarehouse erpWarehouse = warehouseMapper.selectOne(new LambdaQueryWrapper<ErpWarehouse>().eq(ErpWarehouse::getName, material.getWarehouseName()));
-                    if (ObjectUtil.isNull(erpWarehouse)) {
-                        ErpWarehouse warehouse = new ErpWarehouse();
-                        warehouse.setCode(material.getWarehouseName());
-                        warehouse.setName(material.getWarehouseName());
-                        warehouseMapper.insert(warehouse);
-                        material.setWarehouseId(warehouse.getId());
-                    }else {
-                        material.setWarehouseId(erpWarehouse.getId());
-                    }
-                }
                 /**
                  * 供应商
                  */
@@ -129,7 +132,7 @@ public class ErpMaterialImportListener extends AnalysisEventListener<ErpMaterial
                 }
                 materialMapper.insert(material);
                 successNum++;
-                successMsg.append("<br/>").append(successNum).append("、物料 ").append(material.getMaterialName()).append(" 导入成功");
+                successMsg.append("<br/>").append(successNum).append("、物料 【").append(material.getMaterialName()).append("】 导入成功");
             } else if (isUpdateSupport) {
                 Long materialId = material.getId();
                 material = BeanUtil.toBean(materialImportVo, ErpMaterial.class);
@@ -200,11 +203,11 @@ public class ErpMaterialImportListener extends AnalysisEventListener<ErpMaterial
                 successMsg.append("<br/>").append(successNum).append("、物料 ").append(material.getMaterialName()).append(" 更新成功");
             } else {
                 failureNum++;
-                failureMsg.append("<br/>").append(failureNum).append("、物料 ").append(material.getMaterialName()).append(" 已存在");
+                failureMsg.append("<br/>").append(failureNum).append("、物料 【").append(material.getMaterialName()).append("】 已存在");
             }
         } catch (Exception e) {
             failureNum++;
-            String msg = "<br/>" + failureNum + "、物料 " + material.getMaterialName() + " 导入失败：";
+            String msg = "<br/>" + failureNum + "、物料 【" + material.getMaterialName() + "】 导入失败：";
             failureMsg.append(msg).append(e.getMessage());
             log.error(msg, e);
         }