Merge remote-tracking branch 'origin/develop_dl_plan6' into develop_dl_plan6

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/StockServiceImpl.java

@@ -495,7 +495,7 @@ public class StockServiceImpl extends ServiceImpl<StockMapper, Stock> implements
 
                     try {
                     seveRK( equipmentDetailDownloadVOS.get(i), reginParams, agencyUserModel,
-                            fireFightSysIdsBuffer,list, errBufferName ,erryy );
+                            fireFightSysIdsBuffer,list, errBufferName ,erryy, i+1 );
                     } catch (Exception e) {
                         e.printStackTrace();
                     }
@@ -554,9 +554,20 @@ public class StockServiceImpl extends ServiceImpl<StockMapper, Stock> implements
                          StringBuffer fireFightSysIdsBuffer,
                          List<EquipmentSpecific> list,
                          StringBuffer errBufferName,
-                         StringBuffer erryy
+                         StringBuffer erryy,
+                        int rowNum
 
                                                    ){
+        if (StringUtils.isEmpty(equipmentDetailDownloadVOS.getName())) {
+            erryy.append("第" + rowNum + "行器材名称为空,");
+        }
+
+         if (StringUtils.isEmpty(equipmentDetailDownloadVOS.getCode())) {
+             erryy.append("第" + rowNum + "器材编码为空,");
+         }
+         if (StringUtils.isEmpty(equipmentDetailDownloadVOS.getCompanyName())) {
+             erryy.append("第" + rowNum + "行所属单位为空,");
+         }
          SimpleDateFormat stf = new SimpleDateFormat("yyyy-MM-dd");
 
         TransactionStatus transactionStatus = platformTransactionManager.getTransaction(transactionDefinition);