凯和商务端导入

ruoyi-admin/src/main/java/com/ruoyi/web/controller/shipping/controller/KHTWarehousebillsController.java

@@ -351,7 +351,12 @@ public class KHTWarehousebillsController extends BaseController
     public AjaxResult importCreateCompanyMsgNew(@RequestParam("file") MultipartFile file)throws Exception
     {
         LoginUser loginUser = SpringUtils.getBean(TokenService.class).getLoginUser(ServletUtils.getRequest());
-        return tWarehousebillsService.importCreateCompanyMsgNew(file,loginUser);
+        try {
+            AjaxResult ajaxResult = tWarehousebillsService.importCreateCompanyMsgNew(file, loginUser);
+            return ajaxResult;
+        }catch (Exception e){
+            return AjaxResult.error("导入失败");
+        }
     }
     /**
      * 下载箱信息导入模板

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

@@ -1861,6 +1861,9 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                 companyMsg.setCreateTime(new Date());
                 for (int a = 0; a < rows.getPhysicalNumberOfCells(); a++) {
                     Cell cell = rows.getCell(a);
+                    if (cell == null){
+                        continue;
+                    }
                     String value = filter(sheet.getRow(0), CellReference.convertNumToColString(cell.getColumnIndex()));
                     switch (value) {
                         case "箱号":
@@ -1931,7 +1934,9 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                             break;
                     }
                 }
-                tTemporaryFileMapper.insertTTemporaryFile(companyMsg);
+                if (StringUtils.isNotEmpty(companyMsg.getfCntrno())){
+                    tTemporaryFileMapper.insertTTemporaryFile(companyMsg);
+                }
                 fleetCompanyMsgs.add(companyMsg);
             }
             map.put("total",fleetCompanyMsgs.size());