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

applications/document/document-server/src/main/resources/mapper/BankinformationMapper.xml

@@ -23,6 +23,7 @@
     <result column="bk_text3" property="bk_text3" jdbcType="VARCHAR" />
     <result column="bk_text4" property="bk_text4" jdbcType="VARCHAR" />
     <result column="bk_text5" property="bk_text5" jdbcType="VARCHAR" />
+    <result column="bk_remark" property="bk_remark" jdbcType="VARCHAR" />
   </resultMap>
   <resultMap id="ResultMapWithBLOBs" type="com.usoftchina.saas.document.entities.Bankinformation" extends="BaseResultMap" >
     <result column="bk_remark" property="bk_remark" jdbcType="LONGVARCHAR" />
@@ -30,7 +31,7 @@
   <sql id="Base_Column_List" >
     bk_id, bk_bankcode, bk_bankname, bk_date, bk_type, bk_beginamount, bk_thisamount, 
     bk_status, bk_statuscode, bk_recorderid, bk_recorder, bk_recorddate, bk_ym, companyid, 
-    updaterId, updateTime, bk_text1, bk_text2, bk_text3, bk_text4, bk_text5
+    updaterId, updateTime, bk_text1, bk_text2, bk_text3, bk_text4, bk_text5, bk_remark
   </sql>
   <sql id="Blob_Column_List" >
     bk_remark

applications/purchase/purchase-server/src/main/java/com/usoftchina/saas/purchase/service/impl/ProdInOutServiceImpl.java

@@ -428,6 +428,8 @@ public class ProdInOutServiceImpl extends CommonBaseServiceImpl<ProdInOutMapper,
         targetPi.setPi_inoutno(piInoutno);
         targetPi.setPi_class(BillCodeSeq.PURCHASEOUT.getName());
         targetPi.setPi_date(new Date());
+        targetPi.setPi_status("未审核");
+        targetPi.setPi_statuscode("UNAUDITED");
         targetPi.setPi_recorddate(new Date());
         targetPi.setPi_vendid(sourcePi.getPi_vendid());
         targetPi.setPi_vendcode(sourcePi.getPi_vendcode());

applications/purchase/purchase-server/src/main/resources/application.yml

@@ -47,7 +47,7 @@ eureka:
   client:
     registryFetchIntervalSeconds: 5
     serviceUrl:
-      defaultZone: http://${spring.security.user.name}:${spring.security.user.password}@192.168.0.181:8510/eureka/
+      defaultZone: http://${spring.security.user.name}:${spring.security.user.password}@127.0.0.1:8500/eureka/
 management:
   endpoints:
     web:

applications/purchase/purchase-server/src/main/resources/mapper/PurchaseListMapper.xml

@@ -96,7 +96,7 @@
             <if test="companyId != null">
               and   purchase.companyId = #{companyId}
             </if>
-        </where>  order by pu_id desc,pd_detno desc
+        </where>  order by pu_date desc
     </select>
 
     <select id="selectPurchaseBycondition"  resultMap="BaseResultMap">

applications/sale/sale-server/src/main/resources/mapper/SaleListMapper.xml

@@ -91,7 +91,7 @@
             <if test="companyId != null">
                 and   sale.companyId = #{companyId}
             </if>
-        </where>  order by sd_detno desc
+        </where>  order by sa_date desc
     </select>
 
     <select id="selectSaleByCondition" resultMap="BaseResultMap">

applications/storage/storage-dto/src/main/java/com/usoftchina/saas/storage/po/report/ProdinoutCountView.java

@@ -10,4 +10,23 @@ import java.io.Serializable;
  */
 @Data
 public class ProdinoutCountView implements Serializable{
+
+    private String  pwm_yearmonth;
+    private String pr_kind;
+    private String pr_code;
+    private String pr_detail;
+    private String pr_spec;
+    private String pr_unit;
+    private String wh_description;
+    private Double pwm_beginqty;
+    private Double pwm_beginamount;
+    private Double pwm_nowinqty;
+    private Double pwm_nowinamount;
+    private Double pwm_nowoutqty;
+    private Double pwm_nowoutamount;
+    private Double pwm_endqty;
+    private Double pwm_endamount;
+    private Integer companyid;
+
+
 }

applications/storage/storage-server/src/main/resources/mapper/ProdInOutReportMapper.xml

@@ -22,6 +22,27 @@
   </resultMap>
 
 
+  <resultMap id="ProdinoutCountMap" type="com.usoftchina.saas.storage.po.report.ProdinoutCountView">
+    <result column="pwm_yearmonth" jdbcType="VARCHAR" property="pwm_yearmonth" />
+    <result column="pr_kind" jdbcType="VARCHAR" property="pr_kind" />
+    <result column="pr_code" jdbcType="VARCHAR" property="pr_code" />
+    <result column="pr_detail" jdbcType="VARCHAR" property="pr_detail" />
+    <result column="pr_spec" jdbcType="VARCHAR" property="pr_spec" />
+    <result column="pr_unit" jdbcType="VARCHAR" property="pr_unit" />
+    <result column="wh_description" jdbcType="VARCHAR" property="wh_description" />
+    <result column="pwm_beginqty" jdbcType="DOUBLE" property="pwm_beginqty" />
+    <result column="pwm_beginamount" jdbcType="DOUBLE" property="pwm_beginamount" />
+    <result column="pwm_nowinqty" jdbcType="DOUBLE" property="pwm_nowinqty" />
+    <result column="pwm_nowinamount" jdbcType="DOUBLE" property="pwm_nowinamount" />
+    <result column="pwm_nowoutqty" jdbcType="DOUBLE" property="pwm_nowoutqty" />
+    <result column="pwm_nowoutamount" jdbcType="DOUBLE" property="pwm_nowoutamount" />
+    <result column="pwm_endqty" jdbcType="DOUBLE" property="pwm_endqty" />
+    <result column="pwm_endamount" jdbcType="DOUBLE" property="pwm_endamount" />
+    <result column="companyid" jdbcType="INTEGER" property="companyid" />
+  </resultMap>
+
+
+
 
   <select id="selectProdiodetailByCondition" resultMap="ProdiodetailMap">
     select  *  from prodiodetail_view
@@ -37,8 +58,8 @@
   </select>
 
 
-  <select id="selectProdinoutCountByCondition"  resultMap="ProdiodetailMap">
-    select  *  from prodinout
+  <select id="selectProdinoutCountByCondition"  resultMap="ProdinoutCountMap">
+    select  *  from prodinoutcount_view
     <where>
       <if test="con != null">
         ${con}
@@ -47,7 +68,6 @@
         and  companyid = #{companyId}
       </if>
     </where>
-    order by pi_id
   </select>
 
 

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

@@ -101,7 +101,8 @@ Ext.define('saas.view.money.payBalance.FormPanel', {
         }, {
             text: '期间',
             dataIndex: 'pd_ym',
-            hidden:true
+            hidden:true,
+            defaultValue: Ext.Date.format(new Date(), 'Ym'),
             // editor: {
             //     xtype: 'hidden',
                 // xtype: 'textfield,

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

@@ -97,6 +97,7 @@ Ext.define('saas.view.money.recBalance.FormPanel', {
         }, {
             text: '期间',
             dataIndex: 'rd_ym',
+            defaultValue: Ext.Date.format(new Date(), 'Ym'),
             // editor: {
             //     xtype: 'numberfield'
             // },

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

@@ -349,5 +349,37 @@ Ext.define('saas.view.money.recBalance.FormPanelController', {
             console.error(res);
             showToast('转单失败: ' + res.message);
         });
-     }
+     },
+    onSave: function() {
+        var me = this,
+            form = me.getView(),
+            viewModel = me.getViewModel(),
+            store1 = viewModel.get('detail0').detailStore,
+            store2 = viewModel.get('detail1').detailStore;
+
+        var valid = form.isValid();
+        if(!valid) {
+            showToast(form.invalidText);
+            return false;
+        }
+
+        var sum_rd_amount = store1.sum('rd_amount'); // 付款金额合计
+        var rb_discounts = viewModel.get('rb_discounts'); // 折扣金额
+        var sum_rbd_nowbalance = store2.sum('rbd_nowbalance'); // 本次核销金额合计
+
+        var flag = sum_rd_amount + rb_discounts - sum_rbd_nowbalance;
+
+        if(flag != 0) {
+            var t = flag > 0 ? '大' : '小';
+
+            showConfirm('提示', '收款金额' + t + '于本次折扣后核销金额，是否仍要保存？')
+                .then(function(y) {
+                    if(y == 'yes') {
+                        me.save();
+                    }
+                });
+        }else {
+            me.save();
+        }
+    }
 });