凯和导入修改

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/service/impl/TWarehouseBillsServiceImpl.java

@@ -1890,6 +1890,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                                 return AjaxResult.success("Excel箱信息数据第" + line + "行数据缺少箱号",500);*/
                                 break;
                             }
+                            companyMsg.setfCntrno(cell.getStringCellValue());
                             //判断箱号是否存在
                             TCntrno tCntrno = new TCntrno();
                             tCntrno.setfNo(cell.getStringCellValue());
@@ -1897,7 +1898,6 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                             if (CollectionUtils.isEmpty(cnTrNoList)){
                                 tCnTrNoList.add(cell.getStringCellValue());
                             }
-                            companyMsg.setfCntrno(cell.getStringCellValue());
                             break;
                         case "铅封号":
                             //设置单元格类型
@@ -1958,7 +1958,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                             if (tCntr.getfNo().equals(cell.getStringCellValue())){
                                 companyMsg.setCntrName(cell.getStringCellValue());
                             }else {
-                                List.add(cell.getStringCellValue());
+                                List.add(companyMsg.getfCntrno());
                                 break;
                             }
                             /*Long fId = tCntrMapper.selectRcntrFId(companyMsg.getCntrName());
@@ -1979,18 +1979,21 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
         }
         if (CollectionUtils.isNotEmpty(tCnTrNoList) || CollectionUtils.isNotEmpty(List)){
             tTemporaryFileMapper.deleteTTemporaryFilefileName(originalFilename,loginUser.getUser().getUserName());
-            String message = "";
             if (CollectionUtils.isNotEmpty(tCnTrNoList)){
-                StringBuffer stringBuffer = new StringBuffer("箱号不存在的有:");
+                StringBuffer stringBuffer = new StringBuffer("箱号不存在的有:"+"\n");
                 stringBuffer.append(org.apache.commons.lang.StringUtils.join(tCnTrNoList.toArray(), ","));
-                message = message + stringBuffer.toString();
+                map.put("tCnTrNoList",stringBuffer.toString());
             }
-            if (CollectionUtils.isNotEmpty(List)){
-                StringBuffer stringBuffer = new StringBuffer("箱型应为:"+tCntr.getfNo()+",不一致的有");
+            if (CollectionUtils.isNotEmpty(tCnTrNoList) && CollectionUtils.isNotEmpty(List)){
+                StringBuffer stringBuffer = new StringBuffer("箱型应为:"+tCntr.getfNo()+",不一致的有"+"\n");
+                stringBuffer.append(org.apache.commons.lang.StringUtils.join(List.toArray(), ","));
+                map.put("List",stringBuffer.toString());
+            }else if (CollectionUtils.isEmpty(tCnTrNoList) && CollectionUtils.isNotEmpty(List)){
+                StringBuffer stringBuffer = new StringBuffer("箱型应为:"+tCntr.getfNo()+",不一致的有"+"\n");
                 stringBuffer.append(org.apache.commons.lang.StringUtils.join(List.toArray(), ","));
-                message = message +","+ stringBuffer.toString();
+                map.put("List",stringBuffer.toString());
             }
-            return AjaxResult.success("error",message);
+            return AjaxResult.success("error",map);
         }else {
             map.put("total",fleetCompanyMsgs.size());
             map.put("fileName",originalFilename);