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

@@ -38,6 +38,15 @@ public class Paybalancedet extends CommonBaseEntity implements Serializable {
     private String pd_text4;
 
     private String pd_text5;
+    private Date pb_date;
+
+    public Date getPb_date() {
+        return pb_date;
+    }
+
+    public void setPb_date(Date pb_date) {
+        this.pb_date = pb_date;
+    }
 
     public Integer getPd_pbid() {
         return pd_pbid;

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

@@ -38,6 +38,15 @@ public class Paybalancedetail extends CommonBaseEntity implements Serializable {
     private String pbd_text4;
 
     private String pbd_text5;
+    private Date pb_date;
+
+    public Date getPb_date() {
+        return pb_date;
+    }
+
+    public void setPb_date(Date pb_date) {
+        this.pb_date = pb_date;
+    }
 
     public Integer getPbd_pbid() {
         return pbd_pbid;

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

@@ -44,6 +44,15 @@ public class Recbalancedet extends CommonBaseEntity implements Serializable{
     private String rd_text4;
 
     private String rd_text5;
+    private Date rb_date;
+
+    public Date getRb_date() {
+        return rb_date;
+    }
+
+    public void setRb_date(Date rb_date) {
+        this.rb_date = rb_date;
+    }
 
     public Date getUpdatedate() {
         return updatedate;

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

@@ -37,6 +37,16 @@ public class Recbalancedetail extends CommonBaseEntity implements Serializable {
     private String rbd_text4;
 
     private String rbd_text5;
+    private Date rb_date;
+
+
+    public Date getRb_date() {
+        return rb_date;
+    }
+
+    public void setRb_date(Date rb_date) {
+        this.rb_date = rb_date;
+    }
 
     public Integer getRbd_rbid() {
         return rbd_rbid;

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

@@ -69,6 +69,7 @@ public class FundtransferServiceImpl implements FundtransferService {
             Fundtransferdetail fundtransferdetail= (Fundtransferdetail) isdet.next();
             fundtransferdetail.setCompanyId(BaseContextHolder.getCompanyId());
             fundtransferdetail.setFtd_ftid(Math.toIntExact(id));
+            fundtransferdetail.setFt_date(fundtransfer.getFt_date());
             if (fundtransferdetail.getId() > 0 ){
                 fundtransferdetailMapper.updateByPrimaryKeySelective(fundtransferdetail);
             }else {

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

@@ -73,6 +73,7 @@ public class OthreceiptsServiceImpl implements OthreceiptsService {
             Othreceiptsdetail othreceiptsdetail1 = (Othreceiptsdetail) isdet.next();
             othreceiptsdetail1.setOrd_orid(Math.toIntExact(id));
             othreceiptsdetail1.setCompanyId(BaseContextHolder.getCompanyId());
+            othreceiptsdetail1.setOr_date(othreceipts.getOr_date());
             if (othreceiptsdetail1.getId() > 0 ){
                 othreceiptsdetailMapper.updateByPrimaryKeySelective(othreceiptsdetail1);
             }else {

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

@@ -71,6 +71,7 @@ public class OthspendingsServiceImpl implements OthspendingsService {
             Othspendingsdetail othspendingsdetail = (Othspendingsdetail) isdet.next();
             othspendingsdetail.setOsd_orid(Math.toIntExact(id));
             othspendingsdetail.setCompanyId(BaseContextHolder.getCompanyId());
+            othspendingsdetail.setOs_date(othspendings.getOs_date());
             if (othspendingsdetail.getId() > 0 ){
                 othspendingsdetailMapper.updateByPrimaryKeySelective(othspendingsdetail);
             }else {

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

@@ -73,6 +73,7 @@ public class PaybalanceServiceImpl implements PaybalanceService {
             Paybalancedet paybalancedet1 = (Paybalancedet) isdet.next();
             paybalancedet1.setPd_pbid(Math.toIntExact(pbId));
             paybalancedet1.setCompanyId(BaseContextHolder.getCompanyId());
+            paybalancedet1.setPb_date(paybalance.getPb_date());
             if (paybalancedet1.getId() > 0 ){
                 paybalancedetMapper.updateByPrimaryKeySelective(paybalancedet1);
             }else {
@@ -85,6 +86,7 @@ public class PaybalanceServiceImpl implements PaybalanceService {
             Paybalancedetail paybalancedetail1 = (Paybalancedetail) isdetl.next();
             paybalancedetail1.setPbd_pbid(Math.toIntExact(pbId));
             paybalancedetail1.setCompanyId(BaseContextHolder.getCompanyId());
+            paybalancedetail1.setPb_date(paybalance.getPb_date());
             if (paybalancedetail1.getId() > 0 ){
                 paybalancedetailMapper.updateByPrimaryKeySelective(paybalancedetail1);
             }else {

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

@@ -72,6 +72,7 @@ public class RecbalanceServiceImpl implements RecbalanceService {
             Recbalancedet recbalancedet1 = (Recbalancedet) isdet.next();
             recbalancedet1.setRd_rbid(Math.toIntExact(rbId));
             recbalancedet1.setCompanyId(BaseContextHolder.getCompanyId());
+            recbalancedet1.setRb_date(recbalance.getRb_date());
             if (recbalancedet1.getId() > 0 ){
                 recbalancedetMapper.updateByPrimaryKeySelective(recbalancedet1);
             }else {
@@ -84,7 +85,7 @@ public class RecbalanceServiceImpl implements RecbalanceService {
             Recbalancedetail recbalancedetail1 = (Recbalancedetail) isdetl.next();
             recbalancedetail1.setRbd_rbid(Math.toIntExact(rbId));
             recbalancedetail1.setCompanyId(BaseContextHolder.getCompanyId());
-            System.out.println("rectail:" + recbalancedetail1);
+            recbalancedetail1.setRb_date(recbalance.getRb_date());
             if (recbalancedetail1.getId() > 0 ){
                 recbalancedetailMapper.updateByPrimaryKeySelective(recbalancedetail1);
             }else {

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

@@ -62,9 +62,9 @@
       <if test="ord_detno != null" >
         ord_detno,
       </if>
-      <!--<if test="or_date != null" >-->
-        <!--ord_ym,-->
-      <!--</if>-->
+      <if test="or_date != null" >
+        ord_ym,
+      </if>
       <if test="ord_type != null" >
         ord_type,
       </if>
@@ -106,9 +106,9 @@
       <if test="ord_detno != null" >
         #{ord_detno,jdbcType=INTEGER},
       </if>
-      <!--<if test="or_date != null" >-->
-        <!--CONVERT(date_format(#{or_date,jdbcType=TIMESTAMP},'%Y%m'),SIGNED),-->
-      <!--</if>-->
+      <if test="or_date != null" >
+        CONVERT(date_format(#{or_date,jdbcType=TIMESTAMP},'%Y%m'),SIGNED),
+      </if>
       <if test="ord_type != null" >
         #{ord_type,jdbcType=VARCHAR},
       </if>

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

@@ -62,9 +62,9 @@
       <if test="osd_detno != null" >
         osd_detno,
       </if>
-      <!--<if test="os_date != null" >-->
-        <!--osd_ym,-->
-      <!--</if>-->
+      <if test="os_date != null" >
+        osd_ym,
+      </if>
       <if test="osd_type != null" >
         osd_type,
       </if>
@@ -106,9 +106,9 @@
       <if test="osd_detno != null" >
         #{osd_detno,jdbcType=INTEGER},
       </if>
-      <!--<if test="os_date != null" >-->
-        <!--CONVERT(date_format(#{os_date,jdbcType=TIMESTAMP},'%Y%m'),SIGNED),-->
-      <!--</if>-->
+      <if test="os_date != null" >
+        CONVERT(date_format(#{os_date,jdbcType=TIMESTAMP},'%Y%m'),SIGNED),
+      </if>
       <if test="osd_type != null" >
         #{osd_type,jdbcType=VARCHAR},
       </if>

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

@@ -71,9 +71,9 @@
       <if test="pd_detno != null" >
         pd_detno,
       </if>
-      <!--<if test="pb_date != null" >-->
-        <!--pd_ym,-->
-      <!--</if>-->
+      <if test="pb_date != null" >
+        pd_ym,
+      </if>
       <if test="pd_bankid != null" >
         pd_bankid,
       </if>
@@ -127,9 +127,9 @@
       <if test="pd_detno != null" >
         #{pd_detno,jdbcType=INTEGER},
       </if>
-      <!--<if test="pb_date != null" >-->
-        <!--CONVERT(date_format(#{pb_date,jdbcType=TIMESTAMP},'%Y%m'),SIGNED),-->
-      <!--</if>-->
+      <if test="pb_date != null" >
+        CONVERT(date_format(#{pb_date,jdbcType=TIMESTAMP},'%Y%m'),SIGNED),
+      </if>
       <if test="pd_bankid != null" >
         #{pd_bankid,jdbcType=INTEGER},
       </if>

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

@@ -69,9 +69,9 @@
       <if test="pbd_detno != null" >
         pbd_detno,
       </if>
-      <!--<if test="pb_date != null" >-->
-        <!--pbd_ym,-->
-      <!--</if>-->
+      <if test="pb_date != null" >
+        pbd_ym,
+      </if>
       <if test="pbd_slid != null" >
         pbd_slid,
       </if>
@@ -125,9 +125,9 @@
       <if test="pbd_detno != null" >
         #{pbd_detno,jdbcType=INTEGER},
       </if>
-      <!--<if test="pb_date != null" >-->
-        <!--CONVERT(date_format(#{pb_date,jdbcType=TIMESTAMP},'%Y%m'),SIGNED),-->
-      <!--</if>-->
+      <if test="pb_date != null" >
+        CONVERT(date_format(#{pb_date,jdbcType=TIMESTAMP},'%Y%m'),SIGNED),
+      </if>
       <if test="pbd_slid != null" >
         #{pbd_slid,jdbcType=INTEGER},
       </if>

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

@@ -127,9 +127,9 @@
       <if test="rd_detno != null">
         rd_detno,
       </if>
-      <!--<if test="pb_date != null">-->
-        <!--rd_ym,-->
-      <!--</if>-->
+      <if test="pb_date != null">
+        rd_ym,
+      </if>
       <if test="rd_bankid != null">
         rd_bankid,
       </if>
@@ -183,9 +183,9 @@
       <if test="rd_detno != null">
         #{rd_detno,jdbcType=INTEGER},
       </if>
-      <!--<if test="pb_date != null">-->
-        <!--CONVERT(date_format(#{pb_date,jdbcType=TIMESTAMP},'%Y%m'),SIGNED),-->
-      <!--</if>-->
+      <if test="pb_date != null">
+        CONVERT(date_format(#{pb_date,jdbcType=TIMESTAMP},'%Y%m'),SIGNED),
+      </if>
       <if test="rd_bankid != null">
         #{rd_bankid,jdbcType=INTEGER},
       </if>

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

@@ -69,9 +69,9 @@
       <if test="rbd_detno != null" >
         rbd_detno,
       </if>
-      <!--<if test="pb_date != null" >-->
-        <!--rbd_ym,-->
-      <!--</if>-->
+      <if test="pb_date != null" >
+        rbd_ym,
+      </if>
       <if test="rbd_slid != null" >
         rbd_slid,
       </if>
@@ -125,9 +125,9 @@
       <if test="rbd_detno != null" >
         #{rbd_detno,jdbcType=INTEGER},
       </if>
-      <!--<if test="pb_date != null" >-->
-        <!--CONVERT(date_format(#{pb_date,jdbcType=TIMESTAMP},'%Y%m'),SIGNED),-->
-      <!--</if>-->
+      <if test="pb_date != null" >
+        CONVERT(date_format(#{pb_date,jdbcType=TIMESTAMP},'%Y%m'),SIGNED),
+      </if>
       <if test="rbd_slid != null" >
         #{rbd_slid,jdbcType=INTEGER},
       </if>

frontend/saas-web/app/view/document/customer/FormPanel.js

@@ -46,7 +46,6 @@ Ext.define('saas.view.document.customer.FormPanel', {
         storeUrl:'/api/document/customerkind/getCombo',
         name : "cu_type", 
         fieldLabel : "客户类型", 
-        allowBlank : false, 
         columnWidth : 0.25,
         hiddenBtn:false,//true 则会关闭新增按钮功能
         addHandler:function(b){
@@ -92,7 +91,7 @@ Ext.define('saas.view.document.customer.FormPanel', {
         fieldLabel : "期初应收", 
         allowBlank : true, 
         columnWidth : 0.25,
-        decimalPrecision: 8,
+        decimalPrecision: 2,
         minValue:0,
         renderer : function(v) {
             var arr = (v + '.').split('.');
@@ -107,7 +106,7 @@ Ext.define('saas.view.document.customer.FormPanel', {
         fieldLabel : "期初预收", 
         allowBlank : true, 
         columnWidth : 0.25,
-        decimalPrecision: 8,
+        decimalPrecision: 2,
         minValue:0,
         renderer : function(v) {
             var arr = (v + '.').split('.');

frontend/saas-web/app/view/document/vendor/FormPanel.js

@@ -58,7 +58,6 @@ Ext.define('saas.view.document.vendor.FormPanel', {
         storeUrl:'/api/document/vendorkind/getCombo',
         name : "ve_type", 
         fieldLabel : "供应商类型", 
-        allowBlank : false, 
         columnWidth : 0.25,
         addHandler:function(b){
             var document = Ext.create('saas.view.document.kind.Kind',{});
@@ -95,10 +94,10 @@ Ext.define('saas.view.document.vendor.FormPanel', {
         xtype : "numberfield", 
         hideTrigger:true,
         name : "ve_beginapamount", 
-        fieldLabel : "期初应付", 
+        fieldLabel : "期初应付",
         allowBlank : true, 
         columnWidth : 0.25,
-        decimalPrecision: 8,
+        decimalPrecision: 2,
         minValue:0,
         renderer : function(v) {
             var arr = (v + '.').split('.');
@@ -113,7 +112,7 @@ Ext.define('saas.view.document.vendor.FormPanel', {
         fieldLabel : "期初预付", 
         allowBlank : true, 
         columnWidth : 0.25,
-        decimalPrecision: 8,
+        decimalPrecision: 2,
         minValue:0,
         renderer : function(v) {
             var arr = (v + '.').split('.');