凯和商务端导入修改

ruoyi-shipping/src/main/java/com/ruoyi/shipping/excel/TWarehousebillsCntritemsExcel.java

@@ -34,13 +34,13 @@ public class TWarehousebillsCntritemsExcel{
     /** 单箱重(吨不能超过40) */
     @Excel(name = "单箱重(不得超过40)")
     private BigDecimal fCntrweight;
-    @Excel(name = "货名")
+    //@Excel(name = "货名")
     private String goodsName;
     //包装中文名
-    @Excel(name = "包装类型")
+    //@Excel(name = "包装类型")
     private String packageName;
     //集装箱编号
-    @Excel(name = "箱型")
+    //@Excel(name = "箱型")
     private String cntrName;
 
     public String getfCntrno() {

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

@@ -1981,6 +1981,10 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                             TCntrno tCntrno = tCntrnoMapper.selectTCnTrNoByfNo(cell.getStringCellValue());
                             if (tCntrno == null){
                                 tCnTrNoList.add(cell.getStringCellValue());
+                            }else {
+                                if (tCntrno.getfTypeid() != null && tCntrno.getfTypeid() != tWarehousebillsCntr.getfCntrid()){
+                                    List.add(cell.getStringCellValue());
+                                }
                             }
                             break;
                         case "铅封号":
@@ -2003,40 +2007,40 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                             }
                             companyMsg.setfCntrweight(new BigDecimal(cell.getStringCellValue()));
                             break;
-                        case "货名":
+                       /* case "货名":
                             //设置单元格类型
                             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());
+                            *//*TGoods tGoods = tGoodsMapper.checkUFNnameUnique(companyMsg.getGoodsName());
                             if (tGoods != null && tGoods.getfId() != null) {
                                 companyMsg.setfGoodsid(tGoods.getfId());
-                            }*/
+                            }*//*
                             break;
                         case "包装类型":
                             //设置单元格类型
                             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());
+                            *//*String fPackageid = sysDictDataMapper.selectDictValue("f_packageid", companyMsg.getPackageName());
                             if (StringUtils.isNotEmpty(fPackageid)) {
                                 companyMsg.setfPackageid(fPackageid);
-                            }*/
+                            }*//*
                             break;
                         case "箱型":
                             //设置单元格类型
                             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;
                             }
                             TCntrno cnTrNo = tCntrnoMapper.selectTCnTrNoByfNo(companyMsg.getfCntrno());
@@ -2051,11 +2055,11 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                                 List.add(companyMsg.getfCntrno());
                                 break;
                             }
-                            /*Long fId = tCntrMapper.selectRcntrFId(companyMsg.getCntrName());
+                            *//*Long fId = tCntrMapper.selectRcntrFId(companyMsg.getCntrName());
                             if (fId != null) {
                                 companyMsg.setfCntrid(fId);
-                            }*/
-                            break;
+                            }*//*
+                            break;*/
                     }
                 }
                 if (StringUtils.isNotEmpty(companyMsg.getfCntrno())){