浏览代码

1.应收款明细表不显示问题

heqinwei 7 年之前
父节点
当前提交
237641dfb1

+ 27 - 27
applications/money/money-server/src/main/java/com/usoftchina/saas/money/po/RecdetailView.java

@@ -15,13 +15,13 @@ public class RecdetailView {
 
 
     private String PU_BUYERNAME;
     private String PU_BUYERNAME;
 
 
-    private Date pb_date;
+    private Date rb_date;
 
 
     private Double cu_beginaramount;
     private Double cu_beginaramount;
 
 
-    private Double pb_pdamount;
+    private Double rb_rdamount;
 
 
-    private Double pb_pbdamount;
+    private Double rb_rbdamount;
 
 
     private Double mustpay;
     private Double mustpay;
 
 
@@ -88,14 +88,6 @@ public class RecdetailView {
         this.PU_BUYERNAME = PU_BUYERNAME == null ? null : PU_BUYERNAME.trim();
         this.PU_BUYERNAME = PU_BUYERNAME == null ? null : PU_BUYERNAME.trim();
     }
     }
 
 
-    public Date getPb_date() {
-        return pb_date;
-    }
-
-    public void setPb_date(Date pb_date) {
-        this.pb_date = pb_date;
-    }
-
     public Double getCu_beginaramount() {
     public Double getCu_beginaramount() {
         return cu_beginaramount;
         return cu_beginaramount;
     }
     }
@@ -104,22 +96,6 @@ public class RecdetailView {
         this.cu_beginaramount = cu_beginaramount;
         this.cu_beginaramount = cu_beginaramount;
     }
     }
 
 
-    public Double getPb_pdamount() {
-        return pb_pdamount;
-    }
-
-    public void setPb_pdamount(Double pb_pdamount) {
-        this.pb_pdamount = pb_pdamount;
-    }
-
-    public Double getPb_pbdamount() {
-        return pb_pbdamount;
-    }
-
-    public void setPb_pbdamount(Double pb_pbdamount) {
-        this.pb_pbdamount = pb_pbdamount;
-    }
-
     public Double getMustpay() {
     public Double getMustpay() {
         return mustpay;
         return mustpay;
     }
     }
@@ -151,4 +127,28 @@ public class RecdetailView {
     public void setPi_remark(String pi_remark) {
     public void setPi_remark(String pi_remark) {
         this.pi_remark = pi_remark == null ? null : pi_remark.trim();
         this.pi_remark = pi_remark == null ? null : pi_remark.trim();
     }
     }
+
+    public Date getRb_date() {
+        return rb_date;
+    }
+
+    public void setRb_date(Date rb_date) {
+        this.rb_date = rb_date;
+    }
+
+    public Double getRb_rdamount() {
+        return rb_rdamount;
+    }
+
+    public void setRb_rdamount(Double rb_rdamount) {
+        this.rb_rdamount = rb_rdamount;
+    }
+
+    public Double getRb_rbdamount() {
+        return rb_rbdamount;
+    }
+
+    public void setRb_rbdamount(Double rb_rbdamount) {
+        this.rb_rbdamount = rb_rbdamount;
+    }
 }
 }

+ 4 - 4
applications/money/money-server/src/main/resources/mapper/RecdetailViewMapper.xml

@@ -8,10 +8,10 @@
     <result column="pi_class" property="pi_class" jdbcType="VARCHAR" />
     <result column="pi_class" property="pi_class" jdbcType="VARCHAR" />
     <result column="PU_BUYERCODE" property="PU_BUYERCODE" jdbcType="VARCHAR" />
     <result column="PU_BUYERCODE" property="PU_BUYERCODE" jdbcType="VARCHAR" />
     <result column="PU_BUYERNAME" property="PU_BUYERNAME" jdbcType="VARCHAR" />
     <result column="PU_BUYERNAME" property="PU_BUYERNAME" jdbcType="VARCHAR" />
-    <result column="pb_date" property="pb_date" jdbcType="TIMESTAMP" />
+    <result column="rb_date" property="rb_date" jdbcType="TIMESTAMP" />
     <result column="cu_beginaramount" property="cu_beginaramount" jdbcType="DOUBLE" />
     <result column="cu_beginaramount" property="cu_beginaramount" jdbcType="DOUBLE" />
-    <result column="pb_pdamount" property="pb_pdamount" jdbcType="DOUBLE" />
-    <result column="pb_pbdamount" property="pb_pbdamount" jdbcType="DOUBLE" />
+    <result column="rb_rdamount" property="rb_rdamount" jdbcType="DOUBLE" />
+    <result column="rb_rbdamount" property="rb_rbdamount" jdbcType="DOUBLE" />
     <result column="mustpay" property="mustpay" jdbcType="DOUBLE" />
     <result column="mustpay" property="mustpay" jdbcType="DOUBLE" />
     <result column="mustdate" property="mustdate" jdbcType="DOUBLE" />
     <result column="mustdate" property="mustdate" jdbcType="DOUBLE" />
     <result column="pi_total" property="pi_total" jdbcType="DOUBLE" />
     <result column="pi_total" property="pi_total" jdbcType="DOUBLE" />
@@ -29,6 +29,6 @@
         and  companyId = #{companyId}
         and  companyId = #{companyId}
       </if>
       </if>
     </where>
     </where>
-    order by pb_date desc
+    order by rb_date desc
   </select>
   </select>
 </mapper>
 </mapper>

+ 2 - 2
frontend/saas-web/app/view/money/report/RecDetail.js

@@ -20,7 +20,7 @@ Ext.define('saas.view.money.report.RecDetail', {
         columnWidth: 0.25
         columnWidth: 0.25
     }, {
     }, {
         xtype: 'condatefield',
         xtype: 'condatefield',
-        name: 'pb_date',
+        name: 'rb_date',
         fieldLabel: '单据日期',
         fieldLabel: '单据日期',
         columnWidth: 0.5
         columnWidth: 0.5
     }],
     }],
@@ -52,7 +52,7 @@ Ext.define('saas.view.money.report.RecDetail', {
             width: 200
             width: 200
         }, {
         }, {
             text: '单据日期',
             text: '单据日期',
-            dataIndex: 'pb_date',
+            dataIndex: 'rb_date',
             width: 200,
             width: 200,
         }, {
         }, {
             text: '序号',
             text: '序号',