2024年7月25日16:43:07

ruoyi-warehouse/src/main/java/com/ruoyi/reportManagement/domain/TWareHouseItemsExcel.java

@@ -2,15 +2,15 @@ package com.ruoyi.reportManagement.domain;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.annotation.Excel;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 
 import java.math.BigDecimal;
 import java.util.Date;
 
 public class TWareHouseItemsExcel {
 
-    /** 提单号 */
+    /**
+     * 提单号
+     */
     @Excel(name = "序号")
     private String fId;
 
@@ -20,32 +20,46 @@ public class TWareHouseItemsExcel {
     @Excel(name = "客户名称")
     private String fCorpid;
 
-    /** 业务日期 */
+    /**
+     * 业务日期
+     */
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "业务日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date fBsdate;
 
-    /** 提单号 */
+    /**
+     * 提单号
+     */
     @Excel(name = "提单号")
     private String fMblno;
 
-    /** 出入库类型 */
+    /**
+     * 出入库类型
+     */
     @Excel(name = "出入库类型")
     private String fBilltype;
 
-    /** 业务类型(存汉字的，用来选择 产地 规格 品牌) */
+    /**
+     * 业务类型(存汉字的，用来选择 产地 规格 品牌)
+     */
     @Excel(name = "货物属性")
     private String fBusinessType;
 
-    /** 唛头 */
+    /**
+     * 唛头
+     */
     @Excel(name = "属性详情")
     private String fMarks;
 
-    /** 货名 */
+    /**
+     * 货名
+     */
     @Excel(name = "品名")
     private String fGoodsid;
 
-    /** 仓库/库区/库位 */
+    /**
+     * 仓库/库区/库位
+     */
     @Excel(name = "仓库")
     private String fWarehouseInformation;
 
@@ -60,6 +74,11 @@ public class TWareHouseItemsExcel {
      */
     @Excel(name = "箱号")
     private String fCntrno;
+    /**
+     * 铅封号
+     */
+    @Excel(name = "铅封号")
+    private String fSealno;
 
     /**
      * 件数
@@ -98,6 +117,14 @@ public class TWareHouseItemsExcel {
     @Excel(name = "司机身份证")
     private String fDriverIdCar;
 
+    public String getfSealno() {
+        return fSealno;
+    }
+
+    public void setfSealno(String fSealno) {
+        this.fSealno = fSealno;
+    }
+
     public String getfCntrno() {
         return fCntrno;
     }

ruoyi-warehouse/src/main/resources/mapper/warehouseBusiness/TWarehousebillsMapper.xml

@@ -1118,7 +1118,8 @@
         it.f_driver_name AS fDrivername,
         it.f_truckno AS fTruckno,
         it.f_driver_id_car AS fDriverIdCar,
-        it.f_cntrno AS fCntrno
+        it.f_cntrno AS fCntrno,
+        it.f_sealno AS fSealno
         FROM
         t_warehousebills leg
         LEFT JOIN t_warehousebillsitems it ON leg.f_id = it.f_pid