Merge branch 'dev' of ssh://10.10.100.21/source/saas-platform into dev

applications/money/money-server/src/main/java/com/usoftchina/saas/money/po/Paybalancedet.java

@@ -7,7 +7,7 @@ import java.util.Date;
 
 public class Paybalancedet extends CommonBaseEntity implements Serializable {
 
-    private Integer pd_rbid;
+    private Integer pd_pbid;
 
     private Integer pd_detno;
 
@@ -39,12 +39,12 @@ public class Paybalancedet extends CommonBaseEntity implements Serializable {
 
     private String pd_text5;
 
-    public Integer getPd_rbid() {
-        return pd_rbid;
+    public Integer getPd_pbid() {
+        return pd_pbid;
     }
 
-    public void setPd_rbid(Integer pd_rbid) {
-        this.pd_rbid = pd_rbid;
+    public void setPd_pbid(Integer pd_pbid) {
+        this.pd_pbid = pd_pbid;
     }
 
     public Integer getPd_detno() {

applications/money/money-server/src/main/java/com/usoftchina/saas/money/service/impl/PaybalanceServiceImpl.java

@@ -57,7 +57,7 @@ public class PaybalanceServiceImpl implements PaybalanceService {
 
         System.out.println("code:"+paybalance.getPb_code());
 
-        Long rbId = paybalance.getId();
+        Long pbId = paybalance.getId();
 
         //校验数据
         checkPaybalance(pay);
@@ -67,14 +67,14 @@ public class PaybalanceServiceImpl implements PaybalanceService {
         }else {
             paybalance.setCompanyId(BaseContextHolder.getCompanyId());
             paybalanceMapper.insertSelective(paybalance);
-            rbId = paybalance.getId();
-            System.out.println("rbid:" + rbId);
+            pbId = paybalance.getId();
+            System.out.println("rbid:" + pbId);
         }
 
         Iterator isdet = paybalancedet.iterator();
         while (isdet.hasNext()){
             Paybalancedet paybalancedet1 = (Paybalancedet) isdet.next();
-            paybalancedet1.setPd_rbid(Math.toIntExact(rbId));
+            paybalancedet1.setPd_pbid(Math.toIntExact(pbId));
             paybalancedet1.setCompanyId(BaseContextHolder.getCompanyId());
             if (paybalancedet1.getId() > 0 ){
                 paybalancedetMapper.updateByPrimaryKeySelective(paybalancedet1);
@@ -86,7 +86,7 @@ public class PaybalanceServiceImpl implements PaybalanceService {
         Iterator isdetl = paybalancedetail.iterator();
         while (isdetl.hasNext()){
             Paybalancedetail paybalancedetail1 = (Paybalancedetail) isdetl.next();
-            paybalancedetail1.setPbd_pbid(Math.toIntExact(rbId));
+            paybalancedetail1.setPbd_pbid(Math.toIntExact(pbId));
             paybalancedetail1.setCompanyId(BaseContextHolder.getCompanyId());
             if (paybalancedetail1.getId() > 0 ){
                 paybalancedetailMapper.updateByPrimaryKeySelective(paybalancedetail1);
@@ -94,7 +94,7 @@ public class PaybalanceServiceImpl implements PaybalanceService {
                 paybalancedetailMapper.insertSelective(paybalancedetail1);
             }
         }
-        return new DocBaseDTO(rbId, pb_code, BillCodeSeq.PAYBALANCE.getCaller());
+        return new DocBaseDTO(pbId, pb_code, BillCodeSeq.PAYBALANCE.getCaller());
     }
 
     /**

applications/money/money-server/src/main/resources/mapper/PaybalanceMapper.xml

@@ -444,7 +444,7 @@
   select
   <include refid="Base_Column_List" />
   from paybalance
-    left join paybalancedet on pb_id=pd_rbid left join paybalancedetail on pb_id=pbd_rbid
+    left join paybalancedet on pb_id=pd_pbid left join paybalancedetail on pb_id=pbd_rbid
     <where>
       <if test="con != null">
         ${con}

applications/money/money-server/src/main/resources/mapper/PaybalancedetMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="com.usoftchina.saas.money.mapper.PaybalancedetMapper" >
   <resultMap id="BaseResultMap" type="com.usoftchina.saas.money.po.Paybalancedet" >
     <id column="pd_id" property="id" jdbcType="INTEGER" />
-    <result column="pd_rbid" property="pd_rbid" jdbcType="INTEGER" />
+    <result column="pd_pbid" property="pd_pbid" jdbcType="INTEGER" />
     <result column="pd_detno" property="pd_detno" jdbcType="INTEGER" />
     <result column="pd_ym" property="pd_ym" jdbcType="INTEGER" />
     <result column="pd_bankid" property="pd_bankid" jdbcType="INTEGER" />
@@ -23,7 +23,7 @@
     <result column="pd_text5" property="pd_text5" jdbcType="VARCHAR" />
   </resultMap>
   <sql id="Base_Column_List" >
-    pd_id, pd_rbid, pd_detno, pd_ym, pd_bankid, pd_bankcode, pd_bankname, pd_amount, 
+    pd_id, pd_pbid, pd_detno, pd_ym, pd_bankid, pd_bankcode, pd_bankname, pd_amount,
     pd_paymethod, pd_paycode, pd_remark, companyId, updaterId, updatedate, pd_text1, 
     pd_text2, pd_text3, pd_text4, pd_text5
   </sql>
@@ -31,7 +31,7 @@
     select 
     <include refid="Base_Column_List" />
     from paybalancedet
-    where pd_rbid = #{id,jdbcType=INTEGER}
+    where pd_pbid = #{id,jdbcType=INTEGER}
   </select>
   <delete id="deleteItem" parameterType="java.lang.Integer" >
     delete from paybalancedet
@@ -40,12 +40,12 @@
 
   <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
     delete from paybalancedet
-    where pd_rbid = #{id,jdbcType=INTEGER}
+    where pd_pbid = #{id,jdbcType=INTEGER}
   </delete>
 
   <!--<insert id="insert" parameterType="com.usoftchina.saas.money.po.Paybalancedet" >-->
   <insert id="insert" parameterType="com.usoftchina.saas.money.po.Paybalancedet" >
-    insert into paybalancedet (pd_id, pd_rbid, pd_detno,
+    insert into paybalancedet (pd_id, pd_pbid, pd_detno,
       pd_ym, pd_bankid, pd_bankcode,
       pd_bankname, pd_amount, pd_paymethod,
       pd_paycode, pd_remark, companyId,
@@ -64,8 +64,8 @@
   <insert id="insertSelective" parameterType="com.usoftchina.saas.money.po.Paybalancedet" >
     insert into paybalancedet
     <trim prefix="(" suffix=")" suffixOverrides="," >
-      <if test="pd_rbid != null" >
-        pd_rbid,
+      <if test="pd_pbid != null" >
+        pd_pbid,
       </if>
       <if test="pd_detno != null" >
         pd_detno,
@@ -120,8 +120,8 @@
       </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
-      <if test="pd_rbid != null" >
-        #{pd_rbid,jdbcType=INTEGER},
+      <if test="pd_pbid != null" >
+        #{pd_pbid,jdbcType=INTEGER},
       </if>
       <if test="pd_detno != null" >
         #{pd_detno,jdbcType=INTEGER},
@@ -179,8 +179,8 @@
   <update id="updateByPrimaryKeySelective" parameterType="com.usoftchina.saas.money.po.Paybalancedet" >
     update paybalancedet
     <set >
-      <if test="pd_rbid != null" >
-        pd_rbid = #{pd_rbid,jdbcType=INTEGER},
+      <if test="pd_pbid != null" >
+        pd_pbid = #{pd_pbid,jdbcType=INTEGER},
       </if>
       <if test="pd_detno != null" >
         pd_detno = #{pd_detno,jdbcType=INTEGER},
@@ -238,7 +238,7 @@
   </update>
   <update id="updateByPrimaryKey" parameterType="com.usoftchina.saas.money.po.Paybalancedet" >
     update paybalancedet
-    set pd_rbid = #{pdRbid,jdbcType=INTEGER},
+    set pd_pbid = #{pdPbid,jdbcType=INTEGER},
       pd_detno = #{pdDetno,jdbcType=INTEGER},
       pd_ym = #{pdYm,jdbcType=INTEGER},
       pd_bankid = #{pdBankid,jdbcType=INTEGER},
@@ -276,7 +276,7 @@
     select
     <include refid="Base_Column_List" />
     from paybalance
-    left join paybalancedet on pb_id=pd_rbid left join paybalancedetail on pb_id=pbd_rbid
+    left join paybalancedet on pb_id=pd_pbid left join paybalancedetail on pb_id=pbd_rbid
     <where>
       <if test="con != null">
         ${con}

frontend/saas-web/app/model/money/PayBalance1.js

@@ -3,7 +3,7 @@ Ext.define('saas.model.money.PayBalance1', {
     fields: [
         { name: 'id', type: 'int' },
         { name: 'pd_id', type: 'int' },
-        { name: 'pd_rbid', type: 'int' },
+        { name: 'pd_pbid', type: 'int' },
         { name: 'pd_detno', type: 'int' },
         { name: 'pd_ym', type: 'int' },
         { name: 'pd_bankid', type: 'int' },

frontend/saas-web/app/view/money/fundtransfer/FormPanel.js

@@ -50,9 +50,9 @@ Ext.define('saas.view.money.fundtransfer.FormPanel', {
                 editor : {
                     xtype : "numberfield"
                 },
-                width : 120.0, 
-                xtype : "hidden",
-                items : null
+                width : 120.0,
+                items : null,
+                hidden: true
             }, {
                 text : "转出账户ID", 
                 dataIndex : "ftd_bankid", 

frontend/saas-web/app/view/money/fundtransfer/FormPanelController.js

@@ -9,6 +9,8 @@ Ext.define('saas.view.money.fundtransfer.FormPanelController', {
                 beforerender:function(f){
                     Ext.apply(f,{
                         dataUrl:'/api/document/bankinformation/list',
+                        addXtype: 'other-bankinformation',
+                        addTitle:'账户资料',
                         dbfinds:[
                         {
                             from:'bk_bankcode',to:'ftd_bankcode'
@@ -16,7 +18,7 @@ Ext.define('saas.view.money.fundtransfer.FormPanelController', {
                             from:'bk_bankname',to:'ftd_bankname'
                         },{
                             from:'id',to:'ftd_bankid'
-                    }],
+                        }],
                         dbtpls:[{
                             field:'bk_bankcode',width:100
                         },{
@@ -76,6 +78,8 @@ Ext.define('saas.view.money.fundtransfer.FormPanelController', {
                 beforerender:function(f){
                     Ext.apply(f,{
                         dataUrl:'/api/document/bankinformation/list',
+                        addXtype: 'other-bankinformation',
+                        addTitle:'账户资料',
                         dbfinds:[
                         {
                             from:'bk_bankcode',to:'ftd_inbankcode'
@@ -83,7 +87,7 @@ Ext.define('saas.view.money.fundtransfer.FormPanelController', {
                             from:'bk_bankname',to:'ftd_inbankname'
                         },{
                             from:'id',to:'ftd_inbankid'
-                    }],
+                        }],
                         dbtpls:[{
                             field:'bk_bankcode',width:100
                         },{

frontend/saas-web/app/view/money/othreceipts/FormPanel.js

@@ -37,13 +37,22 @@ Ext.define('saas.view.money.othreceipts.FormPanel', {
      }, {
          xtype : "dbfindtrigger", 
          name : "or_custname", 
-         fieldLabel : "客户名称"
+         fieldLabel : "客户名称",
+         allowBlank : false
+     }, {
+         xtype : 'hidden',
+         name : 'or_bankid', 
+         fieldLabel : '账户ID'
+     }, {
+         xtype : 'hidden', 
+         name : 'or_bankcode', 
+         fieldLabel : '账户编号'
+     }, {
+         xtype : "dbfindtrigger", 
+         name : "or_bankname", 
+         fieldLabel : "账户名称",
+         allowBlank : false
      }, {
-        xtype : "datefield", 
-        name : "or_date", 
-        fieldLabel : "单据日期",
-        readOnly:true
-    }, {
         name : "detailGridField", 
         xtype : "detailGridField", 
         storeModel:'saas.model.money.Othreceipts',
@@ -56,6 +65,15 @@ Ext.define('saas.view.money.othreceipts.FormPanel', {
                 dataIndex : "id", 
                 xtype : "numbercolumn",
                 width:0
+            }, {
+                text : "期间",
+                dataIndex : "ord_ym",
+                editor : {
+                    xtype : "numberfield"
+                },
+                width : 120.0,
+                hidden: true,
+                items : null
             }, {
                 text : "收入类别", 
                 width : 200.0, 
@@ -113,18 +131,6 @@ Ext.define('saas.view.money.othreceipts.FormPanel', {
             }
         ]
     }, {
-        xtype : 'hidden',
-         name : 'or_bankid', 
-         fieldLabel : '账户ID'
-     }, {
-         xtype : 'hidden', 
-         name : 'or_bankcode', 
-         fieldLabel : '账户编号'
-     }, {
-         xtype : "dbfindtrigger", 
-         name : "or_bankname", 
-         fieldLabel : "结算账户"
-     }, {
         xtype : "numberfield", 
         name : "or_amount", 
         fieldLabel : "收款金额",

frontend/saas-web/app/view/money/othreceipts/FormPanelController.js

@@ -113,6 +113,7 @@ Ext.define('saas.view.money.othreceipts.FormPanelController', {
                 beforerender: function (f) {
                     Ext.apply(f, {
                         dataUrl: '/api/document/bankinformation/list',
+                        addTitle: '账户资料',
                         dbfinds: [{
                             from: 'bk_bankcode',
                             to: 'or_bankcode'

frontend/saas-web/app/view/money/othspendings/FormPanel.js

@@ -37,7 +37,8 @@ Ext.define('saas.view.money.othspendings.FormPanel', {
      }, {
          xtype : "dbfindtrigger",
          name : "os_vendname", 
-         fieldLabel : "供应商名称"
+         fieldLabel : "供应商名称",
+         allowBlank : false
      }, {
         xtype : 'hidden',
          name : 'os_bankid', 
@@ -49,15 +50,12 @@ Ext.define('saas.view.money.othspendings.FormPanel', {
      }, {
          xtype : "dbfindtrigger",
          name : "os_bankname", 
-         fieldLabel : "结算账户名称"
+         fieldLabel : "账户名称",
+         allowBlank : false
      }, {
         xtype:'datefield',
         name : 'os_date',
         fieldLabel : '单据日期'
-    },{
-        xtype : 'numberfield',
-        name : 'os_amount',
-        fieldLabel : '付款金额'
     },{
         name : "detailGridField", 
         xtype : "detailGridField", 
@@ -78,7 +76,7 @@ Ext.define('saas.view.money.othspendings.FormPanel', {
                     xtype : "numberfield"
                 },
                 width : 120.0, 
-                xtype : "hidden",
+                hidden: true,
                 items : null
             }, {
                 text : "支出类别", 
@@ -136,11 +134,10 @@ Ext.define('saas.view.money.othspendings.FormPanel', {
                 },
             }
         ]
-    }, {
-        xtype : "numberfield", 
-        name : "os_amount", 
-        fieldLabel : "收款金额",
-        readOnly:true
+    },{
+        xtype : 'numberfield',
+        name : 'os_amount',
+        fieldLabel : '付款金额'
     },{
         xtype : "textfield", 
         name : "os_remark", 

frontend/saas-web/app/view/money/othspendings/FormPanelController.js

@@ -90,6 +90,7 @@ Ext.define('saas.view.money.othspendings.FormPanelController', {
                 beforerender: function (f) {
                     Ext.apply(f, {
                         dataUrl: '/api/document/bankinformation/list',
+                        addTitle: '账户资料',
                         dbfinds: [{
                             from: 'bk_bankcode',
                             to: 'os_bankcode'
@@ -97,9 +98,20 @@ Ext.define('saas.view.money.othspendings.FormPanelController', {
                             from: 'bk_bankname',
                             to: 'os_bankname'
                         }, {
-                            from: 'bk_id',
+                            from: 'id',
                             to: 'os_bankid'
                         }],
+                        defaultCondition: "1=1",
+                        dbSearchFields:[{
+                            emptyText:'输入账户编号或名称',
+                            xtype : "textfield",
+                            name : "search",
+                            getCondition: function(v) {
+                                return "(upper(bk_bankname) like '%"+v.toUpperCase()+"%' or upper(bk_bankcode) like '%"+v.toUpperCase()+"%')";
+                            },
+                            allowBlank : true,
+                            columnWidth : 0.25
+                        }],
                         dbtpls: [{
                             field: 'bk_bankcode',
                             width: 100

frontend/saas-web/app/view/money/payBalance/FormPanel.js

@@ -39,7 +39,8 @@ Ext.define('saas.view.money.payBalance.FormPanel', {
         xtype: 'textfield',
         name: 'pb_kind',
         fieldLabel: '单据类型',
-        defaultValue: '付款单'
+        defaultValue: '付款单',
+        readOnly: true
     },  {
         xtype: 'hidden',
         name: 'pb_vendid',
@@ -176,12 +177,6 @@ Ext.define('saas.view.money.payBalance.FormPanel', {
         detnoColumn: 'pbd_detno',
         allowEmpty: true,
         deleteDetailUrl: '/api/money/paybalance/deleteDetail2/',
-        tbar: ['->', {
-            xtype:'dbfindtrigger',
-            columnWidth: 1,
-            fieldLabel:'选择源单',
-            name: 'choseSource'
-        }],
         columns: [{
             text: 'ID',
             dataIndex: 'id',

frontend/saas-web/app/view/money/recBalance/FormPanel.js

@@ -35,7 +35,8 @@ Ext.define('saas.view.money.recBalance.FormPanel', {
         xtype: 'textfield',
         name: 'rb_kind',
         fieldLabel: '单据类型',
-        defaultValue: '收款单'
+        defaultValue: '收款单',
+        readOnly: true
     }, {
         xtype: 'hidden',
         name: 'rb_custcode',
@@ -171,12 +172,6 @@ Ext.define('saas.view.money.recBalance.FormPanel', {
         storeModel: 'saas.model.money.RecBalance2',
         detnoColumn: 'rbd_detno',
         deleteDetailUrl: '/api/money/recbalance/deleteDetail2/',
-        tbar: ['->', {
-            xtype:'dbfindtrigger',
-            columnWidth: 1,
-            fieldLabel:'选择源单',
-            name: 'choseSource'
-        }],
         columns: [{
             text: 'ID',
             dataIndex: 'id',