修改库存导入功能

src/main/java/com/dreamchaser/depository_manage/service/impl/ExcelServiceImpl.java

@@ -249,8 +249,10 @@ public class ExcelServiceImpl implements ExcelService {
             map.put("version", version);
             List<Material> materialPByCondition = materialService.findMaterialPByConditionForTable(map);
             if (materialPByCondition.size() == 0) {
-
+                Material materialByCode = null;
-                Material materialByCode = materialService.findMaterialByCode(excelInfoByInventory.getCode());
+                if (excelInfoByInventory.getCode() != null && !"".equals(excelInfoByInventory.getCode())) {
+                    materialByCode = materialService.findMaterialByCode(excelInfoByInventory.getCode());
+                }
                 if (materialByCode == null) {
                     // 如果没有当前物料
                     String s = dataIndex.get(i);
@@ -311,8 +313,7 @@ public class ExcelServiceImpl implements ExcelService {
 
 
                 Material material = materialService.findMaterialByMnameAndVersion(insert);
-                if(material == null)
+                if (material == null) {
-                {
                     material = materialService.findMaterialByCode(excelInfoByInventory.getCode());
                 }