凯和商务端上传修改

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

@@ -1870,8 +1870,9 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                             //设置单元格类型
                             cell.setCellType(CellType.STRING);
                             if (StringUtils.isEmpty(cell.getStringCellValue())) {
-                                TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-                                return AjaxResult.success("Excel箱信息数据第" + line + "行数据缺少箱号",500);
+                                /*TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+                                return AjaxResult.success("Excel箱信息数据第" + line + "行数据缺少箱号",500);*/
+                                break;
                             }
                             companyMsg.setfCntrno(cell.getStringCellValue());
                             break;
@@ -1879,8 +1880,9 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                             //设置单元格类型
                             cell.setCellType(CellType.STRING);
                             if (StringUtils.isEmpty(cell.getStringCellValue())) {
-                                TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-                                return AjaxResult.success("Excel箱信息数据第" + line + "行数据缺少封号",500);
+                                /*TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+                                return AjaxResult.success("Excel箱信息数据第" + line + "行数据缺少封号",500);*/
+                                break;
                             }
                             companyMsg.setfSealno(cell.getStringCellValue());
                             break;
@@ -1888,8 +1890,9 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                             //设置单元格类型
                             cell.setCellType(CellType.STRING);
                             if (StringUtils.isEmpty(cell.getStringCellValue())) {
-                                TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-                                return AjaxResult.success("Excel箱信息数据第" + line + "行数据缺少单箱重",500);
+                                /*TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+                                return AjaxResult.success("Excel箱信息数据第" + line + "行数据缺少单箱重",500);*/
+                                break;
                             }
                             companyMsg.setfCntrweight(new BigDecimal(cell.getStringCellValue()));
                             break;
@@ -1897,8 +1900,9 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                             //设置单元格类型
                             cell.setCellType(CellType.STRING);
                             if (StringUtils.isEmpty(cell.getStringCellValue())) {
-                                TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-                                return AjaxResult.success("Excel箱信息数据第" + line + "行数据缺少货名",500);
+                                /*TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+                                return AjaxResult.success("Excel箱信息数据第" + line + "行数据缺少货名",500);*/
+                                break;
                             }
                             companyMsg.setGoodsName(cell.getStringCellValue());
                             /*TGoods tGoods = tGoodsMapper.checkUFNnameUnique(companyMsg.getGoodsName());
@@ -1910,8 +1914,9 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                             //设置单元格类型
                             cell.setCellType(CellType.STRING);
                             if (StringUtils.isEmpty(cell.getStringCellValue())) {
-                                TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-                                return AjaxResult.success("Excel箱信息数据第" + line + "行数据缺少包装类型",500);
+                                /*TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+                                return AjaxResult.success("Excel箱信息数据第" + line + "行数据缺少包装类型",500);*/
+                                break;
                             }
                             companyMsg.setPackageName(cell.getStringCellValue());
                             /*String fPackageid = sysDictDataMapper.selectDictValue("f_packageid", companyMsg.getPackageName());
@@ -1923,8 +1928,9 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                             //设置单元格类型
                             cell.setCellType(CellType.STRING);
                             if (StringUtils.isEmpty(cell.getStringCellValue())) {
-                                TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-                                return AjaxResult.success("Excel箱信息数据第" + line + "行数据缺少箱型",500);
+                               /* TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+                                return AjaxResult.success("Excel箱信息数据第" + line + "行数据缺少箱型",500);*/
+                                break;
                             }
                             companyMsg.setCntrName(cell.getStringCellValue());
                             /*Long fId = tCntrMapper.selectRcntrFId(companyMsg.getCntrName());