凯和导入场站动态修改

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

@@ -16,6 +16,9 @@ public class AirForceStationExcel {
     //箱号
     @Excel(name = "箱号")
     private String fNo;
+    //空重中文
+    @Excel(name = "空重")
+    private String updateEFName;
     //动态日期
     @Excel(name = "动态日期")
     private Date updateTime;
@@ -29,7 +32,7 @@ public class AirForceStationExcel {
     @Excel(name = "重量")
     private String fBoxWeight;
     //港口名称
-    @Excel(name = "港口名称")
+    @Excel(name = "地点类型 如: 堆场,码头")
     private String portName;
     //堆放地点
     @Excel(name = "堆放地点")
@@ -41,12 +44,28 @@ public class AirForceStationExcel {
     @Excel(name = "铅封号")
     private String fSealno;
     //是否箱损
-    @Excel(name = "是否箱损")
+    @Excel(name = "是否箱损 如:好,坏")
     private String fCntrstatus;
     //箱损描述
     @Excel(name = "箱损描述(备注)")
     private String remark;
 
+    public String getPortName() {
+        return portName;
+    }
+
+    public void setPortName(String portName) {
+        this.portName = portName;
+    }
+
+    public String getUpdateEFName() {
+        return updateEFName;
+    }
+
+    public void setUpdateEFName(String updateEFName) {
+        this.updateEFName = updateEFName;
+    }
+
     public String getfOpctnstatus() {
         return fOpctnstatus;
     }
@@ -149,6 +168,8 @@ public class AirForceStationExcel {
                 ", fSealno='" + fSealno + '\'' +
                 ", fCntrstatus='" + fCntrstatus + '\'' +
                 ", remark='" + remark + '\'' +
+                ", updateEFName='" + updateEFName + '\'' +
+                ", portName='" + portName + '\'' +
                 '}';
     }
 }

ruoyi-shipping/src/main/java/com/ruoyi/shipping/service/impl/TCntrnoServiceImpl.java

@@ -601,6 +601,18 @@ public class TCntrnoServiceImpl implements ITCntrnoService {
                             }
                             companyMsg.setfNo(cell.getStringCellValue());
                             break;
+                        case "空重":
+                            //设置单元格类型
+                            cell.setCellType(CellType.STRING);
+                            if (StringUtils.isEmpty(cell.getStringCellValue())) {
+                                return AjaxResult.error("Excel箱信息数据第" + line + "行数据缺少空重");
+                            }
+                            String fUpDaTeEf = sysDictDataMapper.selectDictValue("f_updateEF", cell.getStringCellValue());
+                            if (StringUtils.isEmpty(fUpDaTeEf)){
+                                return AjaxResult.error("系统缺少空重:"+cell.getStringCellValue()+"请维护");
+                            }
+                            companyMsg.setfUpdateef(fUpDaTeEf);
+                            break;
                         case "动态日期":
                             //设置单元格类型
                             cell.setCellType(CellType.STRING);