其他账务保存时没有类型

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/excel/QueryMenu.java

@@ -41,26 +41,6 @@ public class QueryMenu {
     @Excel(name = "审核日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date fReviewDate;
 
-    /**
-     * 计费起始日期
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "费用起始日期", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date fChargedate;
-
-    /**
-     * 计费截止日期
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "费用截止日期", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date fBillingDeadline;
-
-    /**
-     * 原始入库日期
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "原始入库日期", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date fOriginalbilldate;
 
     /**
      * 费用名称
@@ -198,6 +178,28 @@ public class QueryMenu {
     @Excel(name = "出口单号")
     private String fEmblno;
 
+
+    /**
+     * 计费起始日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "费用起始日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date fChargedate;
+
+    /**
+     * 计费截止日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "费用截止日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date fBillingDeadline;
+
+    /**
+     * 原始入库日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "原始入库日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date fOriginalbilldate;
+
     public String getfExrate() {
         return fExrate;
     }

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

@@ -2469,6 +2469,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                 cr.setfBsdate(warehouseBills.getfBsdate());
                 cr.setfReviewDate(new Date());
                 cr.setfDc("C");
+                cr.setfBilltype(billsType);
                 if (StringUtils.isNull(cr.getfBillstatus()) || cr.getfBillstatus() != 6L) {
                     cr.setfBillstatus(billStatus);
                 }
@@ -2498,6 +2499,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                 dr.setfBsdate(warehouseBills.getfBsdate());
                 dr.setfReviewDate(new Date());
                 dr.setfDc("D");
+                dr.setfBilltype(billsType);
                 if (StringUtils.isNull(dr.getfBillstatus()) || dr.getfBillstatus() != 6L) {
                     dr.setfBillstatus(billStatus);
                 }

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

@@ -956,7 +956,7 @@
         SELECT
         tc.f_name AS corpName,
         tf.f_mblno AS fMblno,
-        IF(tf.f_billtype = 'SJRK' || tf.f_billtype = 'SJCK' || tf.f_billtype = 'CKDB' || tf.f_billtype = 'HQZY' || tf.f_billtype = 'KCZZ',tf.f_bsdate, null) AS fBsdate,
+        IF(tf.f_billtype = 'SJRK' || tf.f_billtype = 'SJCK' || tf.f_billtype = 'CKDB' || tf.f_billtype = 'HQZY' || tf.f_billtype = 'KCZZ' || tf.f_billtype = 'QTZW',tf.f_bsdate, null) AS fBsdate,
         tf.f_review_date AS fReviewDate,
         te.f_name AS feeName,
         tf.f_dc AS fDc,