merge

applications/money/money-server/src/main/java/com/usoftchina/saas/money/controller/MoneyReportColltroller.java

@@ -55,4 +55,11 @@ public class MoneyReportColltroller {
         PageInfo listData = moneyReportService.customercheck(page, req);
         return Result.success(listData);
     }
+
+    //冲账明细表
+    @GetMapping("/accountdetails")
+    public Result accountdetails(PageRequest page, ListReqDTO req) {
+        PageInfo listData = moneyReportService.accountdetails(page, req);
+        return Result.success(listData);
+    }
 }

applications/money/money-server/src/main/java/com/usoftchina/saas/money/mapper/AccountDetailsViewMapper.java

@@ -0,0 +1,10 @@
+package com.usoftchina.saas.money.mapper;
+
+import com.usoftchina.saas.money.po.AccountDetailsView;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+public interface AccountDetailsViewMapper {
+    List<AccountDetailsView> selectByCondition(@Param("con") String con, @Param("companyId") Long companyId);
+}

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

@@ -0,0 +1,94 @@
+package com.usoftchina.saas.money.po;
+
+import java.util.Date;
+
+public class AccountDetailsView {
+    private String SL_CODE;
+
+    private String SL_KIND;
+
+    private String VE_NAME;
+
+    private Double SL_AMOUNT;
+
+    private Integer PB_ID;
+
+    private String PB_KIND;
+
+    private String PB_CODE;
+
+    private Double total;
+    private Date date;
+
+    public Date getDate() {
+        return date;
+    }
+
+    public void setDate(Date date) {
+        this.date = date;
+    }
+
+    public String getSL_CODE() {
+        return SL_CODE;
+    }
+
+    public void setSL_CODE(String SL_CODE) {
+        this.SL_CODE = SL_CODE == null ? null : SL_CODE.trim();
+    }
+
+    public String getSL_KIND() {
+        return SL_KIND;
+    }
+
+    public void setSL_KIND(String SL_KIND) {
+        this.SL_KIND = SL_KIND == null ? null : SL_KIND.trim();
+    }
+
+    public String getVE_NAME() {
+        return VE_NAME;
+    }
+
+    public void setVE_NAME(String VE_NAME) {
+        this.VE_NAME = VE_NAME == null ? null : VE_NAME.trim();
+    }
+
+    public Double getSL_AMOUNT() {
+        return SL_AMOUNT;
+    }
+
+    public void setSL_AMOUNT(Double SL_AMOUNT) {
+        this.SL_AMOUNT = SL_AMOUNT;
+    }
+
+    public Integer getPB_ID() {
+        return PB_ID;
+    }
+
+    public void setPB_ID(Integer PB_ID) {
+        this.PB_ID = PB_ID;
+    }
+
+    public String getPB_KIND() {
+        return PB_KIND;
+    }
+
+    public void setPB_KIND(String PB_KIND) {
+        this.PB_KIND = PB_KIND == null ? null : PB_KIND.trim();
+    }
+
+    public String getPB_CODE() {
+        return PB_CODE;
+    }
+
+    public void setPB_CODE(String PB_CODE) {
+        this.PB_CODE = PB_CODE == null ? null : PB_CODE.trim();
+    }
+
+    public Double getTotal() {
+        return total;
+    }
+
+    public void setTotal(Double total) {
+        this.total = total;
+    }
+}

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

@@ -14,4 +14,5 @@ public interface MoneyReportService {
     PageInfo recDetail(PageRequest page, ListReqDTO req);
     PageInfo acountBalance(PageRequest page, ListReqDTO req);
     PageInfo customercheck(PageRequest page, ListReqDTO req);
+    PageInfo accountdetails(PageRequest page, ListReqDTO req);
 }

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

@@ -28,6 +28,8 @@ public class MoneyReportServiceImpl implements MoneyReportService {
     private AcountbalanceViewMapper acountbalanceViewMapper;
     @Autowired
     private CustomerCheckViewMapper customerCheckViewMapper;
+    @Autowired
+    private AccountDetailsViewMapper accountDetailsViewMapper;
 
     @Override
     public PageInfo vendorCheck(PageRequest page, ListReqDTO req) {
@@ -54,6 +56,11 @@ public class MoneyReportServiceImpl implements MoneyReportService {
         return getListDATA(page, req, "customercheck");
     }
 
+    @Override
+    public PageInfo accountdetails(PageRequest page, ListReqDTO req) {
+        return getListDATA(page, req, "accountdetails");
+    }
+
     private PageInfo getListDATA(PageRequest page, ListReqDTO req, String type) {
         //设置默认分页
         if (null == page || page.getSize() == 0 || page.getNumber() == 0) {
@@ -88,6 +95,8 @@ public class MoneyReportServiceImpl implements MoneyReportService {
             list = acountbalanceViewMapper.selectByCondition(con, companyId);
         }else if ("customercheck".equals(type)){
             list = customerCheckViewMapper.selectByCondition(con, companyId);
+        }else if ("accountdetails".equals(type)){
+            list = accountDetailsViewMapper.selectByCondition(con, companyId);
         }
         return list;
     }

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

@@ -147,29 +147,31 @@ public class OthreceiptsServiceImpl extends CommonBaseServiceImpl<OthreceiptsMap
          * cu_recamount=nvl(cu_recamount,0)-rb_rbdamount,
          * cu_leftamount=cu_beginaramount-cu_beginprerecamount+cu_recamount-cu_preamount;
          */
-        Customer customerData = recbalanceMapper.selectCustomerByPrimaryKey(othreceipts.getOr_custid());
-        Double preamount = customerData.getCu_preamount()==null?new Double(0):customerData.getCu_preamount();
-        Double beginapamount = customerData.getCu_beginaramount()==null?new Double(0):customerData.getCu_beginaramount();
-        Double beginprepayamount= customerData.getCu_beginprerecamount()==null?new Double(0):customerData.getCu_beginprerecamount();
-        Double recamount = customerData.getCu_recamount()==null?new Double(0):customerData.getCu_recamount();
-
-        Customer customer = new Customer();
-        customer.setId(Long.valueOf(othreceipts.getOr_custid()));
-        customer.setCu_preamount(preamount);
-        customer.setCu_recamount(recamount-or_amount);
-        customer.setCu_leftamount(beginapamount-beginprepayamount+recamount-or_amount-preamount);
-        recbalanceMapper.updateCustomerByPrimaryKeySelective(customer);
-
-        //插入subledger中间表
-        Subledger subledger = new Subledger();
-        subledger.setSl_code(othreceipts.getOr_code());
-        subledger.setSl_kind("其他收入单");
-        subledger.setSl_custid(othreceipts.getOr_custid());
-        subledger.setSl_vendid(0);
-        subledger.setSl_date(othreceipts.getOr_date());
-        subledger.setSl_amount(or_amount);
-        subledger.setCompanyId(BaseContextHolder.getCompanyId());
-        subledgerMapper.insertSelective(subledger);
+        if (othreceipts.getOr_custid() != null && othreceipts.getOr_custid() != 0) {
+            Customer customerData = recbalanceMapper.selectCustomerByPrimaryKey(othreceipts.getOr_custid());
+            Double preamount = customerData.getCu_preamount() == null ? new Double(0) : customerData.getCu_preamount();
+            Double beginapamount = customerData.getCu_beginaramount() == null ? new Double(0) : customerData.getCu_beginaramount();
+            Double beginprepayamount = customerData.getCu_beginprerecamount() == null ? new Double(0) : customerData.getCu_beginprerecamount();
+            Double recamount = customerData.getCu_recamount() == null ? new Double(0) : customerData.getCu_recamount();
+
+            Customer customer = new Customer();
+            customer.setId(Long.valueOf(othreceipts.getOr_custid()));
+            customer.setCu_preamount(preamount);
+            customer.setCu_recamount(recamount - or_amount);
+            customer.setCu_leftamount(beginapamount - beginprepayamount + recamount - or_amount - preamount);
+            recbalanceMapper.updateCustomerByPrimaryKeySelective(customer);
+
+            //插入subledger中间表
+            Subledger subledger = new Subledger();
+            subledger.setSl_code(othreceipts.getOr_code());
+            subledger.setSl_kind("其他收入单");
+            subledger.setSl_custid(othreceipts.getOr_custid());
+            subledger.setSl_vendid(0);
+            subledger.setSl_date(othreceipts.getOr_date());
+            subledger.setSl_amount(or_amount);
+            subledger.setCompanyId(BaseContextHolder.getCompanyId());
+            subledgerMapper.insertSelective(subledger);
+        }
 
 
         //计算期间金额
@@ -209,7 +211,6 @@ public class OthreceiptsServiceImpl extends CommonBaseServiceImpl<OthreceiptsMap
         //删除中间表
         othreceipts = othreceiptsMapper.selectByPrimaryKey(id);
         banksubledgerMapper.deleteByPrimaryKey(othreceipts.getOr_code(), "其他收入单");
-        subledgerMapper.deleteByPrimaryKey(othreceipts.getOr_code(), "其他收入单");
 
         //更新资金
         Double amount = banksubledgerMapper.selectThisamount(othreceipts.getOr_bankcode());
@@ -242,18 +243,21 @@ public class OthreceiptsServiceImpl extends CommonBaseServiceImpl<OthreceiptsMap
          * cu_recamount=nvl(cu_recamount,0)-rb_rbdamount,
          * cu_leftamount=cu_beginaramount-cu_beginprerecamount+cu_recamount-cu_preamount;
          */
-        Customer customerData = recbalanceMapper.selectCustomerByPrimaryKey(othreceipts.getOr_custid());
-        Double preamount = customerData.getCu_preamount()==null?new Double(0):customerData.getCu_preamount();
-        Double beginapamount = customerData.getCu_beginaramount()==null?new Double(0):customerData.getCu_beginaramount();
-        Double beginprepayamount= customerData.getCu_beginprerecamount()==null?new Double(0):customerData.getCu_beginprerecamount();
-        Double recamount = customerData.getCu_recamount()==null?new Double(0):customerData.getCu_recamount();
-
-        Customer customer = new Customer();
-        customer.setId(Long.valueOf(othreceipts.getOr_custid()));
-        customer.setCu_preamount(preamount);
-        customer.setCu_recamount(recamount-or_amount);
-        customer.setCu_leftamount(beginapamount+beginprepayamount-recamount+or_amount+preamount);
-        recbalanceMapper.updateCustomerByPrimaryKeySelective(customer);
+        if (othreceipts.getOr_custid() != null && othreceipts.getOr_custid() != 0) {
+            Customer customerData = recbalanceMapper.selectCustomerByPrimaryKey(othreceipts.getOr_custid());
+            Double preamount = customerData.getCu_preamount() == null ? new Double(0) : customerData.getCu_preamount();
+            Double beginapamount = customerData.getCu_beginaramount() == null ? new Double(0) : customerData.getCu_beginaramount();
+            Double beginprepayamount = customerData.getCu_beginprerecamount() == null ? new Double(0) : customerData.getCu_beginprerecamount();
+            Double recamount = customerData.getCu_recamount() == null ? new Double(0) : customerData.getCu_recamount();
+
+            Customer customer = new Customer();
+            customer.setId(Long.valueOf(othreceipts.getOr_custid()));
+            customer.setCu_preamount(preamount);
+            customer.setCu_recamount(recamount - or_amount);
+            customer.setCu_leftamount(beginapamount + beginprepayamount - recamount + or_amount + preamount);
+            recbalanceMapper.updateCustomerByPrimaryKeySelective(customer);
+            subledgerMapper.deleteByPrimaryKey(othreceipts.getOr_code(), "其他收入单");
+        }
 
 
         //计算期间金额

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

@@ -184,29 +184,31 @@ public class OthspendingsServiceImpl extends CommonBaseServiceImpl<OthspendingsM
          * ve_payamount=nvl(ve_payamount,0)-pb_pbdamount,
          * ve_leftamount=ve_beginapamount-ve_beginprepayamount+ve_payamount-ve_preamount;
          */
-        Vendor vendorData = paybalanceMapper.selectVendorByPrimaryKey(othspendings.getOs_vendid());
-        Double preamount = vendorData.getVe_preamount()==null?new Double(0):vendorData.getVe_preamount();
-        Double beginapamount = vendorData.getVe_beginapamount()==null?new Double(0):vendorData.getVe_beginapamount();
-        Double beginprepayamount= vendorData.getVe_beginprepayamount()==null?new Double(0):vendorData.getVe_beginprepayamount();
-        Double payamount = vendorData.getVe_payamount()==null?new Double(0):vendorData.getVe_payamount();
-
-        Vendor vendor = new Vendor();
-        vendor.setId(Long.valueOf(othspendings.getOs_vendid()));
-        vendor.setVe_preamount(preamount);
-        vendor.setVe_payamount(payamount - bk_amount);
-        vendor.setVe_leftamount(beginapamount-beginprepayamount+payamount-bk_amount-preamount);
-        paybalanceMapper.updateVendorByPrimaryKeySelective(vendor);
-
-        //插入subledger中间表
-        Subledger subledger = new Subledger();
-        subledger.setSl_code(othspendings.getOs_code());
-        subledger.setSl_kind("其他支出单");
-        subledger.setSl_custid(0);
-        subledger.setSl_vendid(othspendings.getOs_vendid());
-        subledger.setSl_date(othspendings.getOs_date());
-        subledger.setSl_amount(bk_amount);
-        subledger.setCompanyId(BaseContextHolder.getCompanyId());
-        subledgerMapper.insertSelective(subledger);
+        if (othspendings.getOs_vendid() != null && othspendings.getOs_vendid() != 0) {
+            Vendor vendorData = paybalanceMapper.selectVendorByPrimaryKey(othspendings.getOs_vendid());
+            Double preamount = vendorData.getVe_preamount() == null ? new Double(0) : vendorData.getVe_preamount();
+            Double beginapamount = vendorData.getVe_beginapamount() == null ? new Double(0) : vendorData.getVe_beginapamount();
+            Double beginprepayamount = vendorData.getVe_beginprepayamount() == null ? new Double(0) : vendorData.getVe_beginprepayamount();
+            Double payamount = vendorData.getVe_payamount() == null ? new Double(0) : vendorData.getVe_payamount();
+
+            Vendor vendor = new Vendor();
+            vendor.setId(Long.valueOf(othspendings.getOs_vendid()));
+            vendor.setVe_preamount(preamount);
+            vendor.setVe_payamount(payamount - bk_amount);
+            vendor.setVe_leftamount(beginapamount - beginprepayamount + payamount - bk_amount - preamount);
+            paybalanceMapper.updateVendorByPrimaryKeySelective(vendor);
+
+            //插入subledger中间表
+            Subledger subledger = new Subledger();
+            subledger.setSl_code(othspendings.getOs_code());
+            subledger.setSl_kind("其他支出单");
+            subledger.setSl_custid(0);
+            subledger.setSl_vendid(othspendings.getOs_vendid());
+            subledger.setSl_date(othspendings.getOs_date());
+            subledger.setSl_amount(bk_amount);
+            subledger.setCompanyId(BaseContextHolder.getCompanyId());
+            subledgerMapper.insertSelective(subledger);
+        }
 
         //计算期间金额
         Statsinfo statsinfo = new Statsinfo();
@@ -241,7 +243,6 @@ public class OthspendingsServiceImpl extends CommonBaseServiceImpl<OthspendingsM
         //删除中间表
         othspendings = othspendingsMapper.selectByPrimaryKey(id);
         banksubledgerMapper.deleteByPrimaryKey(othspendings.getOs_code(), "其他支出单");
-        subledgerMapper.deleteByPrimaryKey(othspendings.getOs_code(), "其他支出单");
 
         //资金
         Double amount = banksubledgerMapper.selectThisamount(othspendings.getOs_bankcode());
@@ -273,18 +274,22 @@ public class OthspendingsServiceImpl extends CommonBaseServiceImpl<OthspendingsM
          * ve_payamount=nvl(ve_payamount,0)-pb_pbdamount,
          * ve_leftamount=ve_beginapamount-ve_beginprepayamount+ve_payamount-ve_preamount;
          */
-        Vendor vendorData = paybalanceMapper.selectVendorByPrimaryKey(othspendings.getOs_vendid());
-        Double preamount = vendorData.getVe_preamount()==null?new Double(0):vendorData.getVe_preamount();
-        Double beginapamount = vendorData.getVe_beginapamount()==null?new Double(0):vendorData.getVe_beginapamount();
-        Double beginprepayamount= vendorData.getVe_beginprepayamount()==null?new Double(0):vendorData.getVe_beginprepayamount();
-        Double payamount = vendorData.getVe_payamount()==null?new Double(0):vendorData.getVe_payamount();
-
-        Vendor vendor = new Vendor();
-        vendor.setId(Long.valueOf(othspendings.getOs_vendid()));
-        vendor.setVe_preamount(preamount);
-        vendor.setVe_payamount(payamount + bk_amount);
-        vendor.setVe_leftamount(beginapamount+beginprepayamount-payamount+bk_amount+preamount);
-        paybalanceMapper.updateVendorByPrimaryKeySelective(vendor);
+        if (othspendings.getOs_vendid() != null && othspendings.getOs_vendid() != 0) {
+            Vendor vendorData = paybalanceMapper.selectVendorByPrimaryKey(othspendings.getOs_vendid());
+            Double preamount = vendorData.getVe_preamount() == null ? new Double(0) : vendorData.getVe_preamount();
+            Double beginapamount = vendorData.getVe_beginapamount() == null ? new Double(0) : vendorData.getVe_beginapamount();
+            Double beginprepayamount = vendorData.getVe_beginprepayamount() == null ? new Double(0) : vendorData.getVe_beginprepayamount();
+            Double payamount = vendorData.getVe_payamount() == null ? new Double(0) : vendorData.getVe_payamount();
+
+            Vendor vendor = new Vendor();
+            vendor.setId(Long.valueOf(othspendings.getOs_vendid()));
+            vendor.setVe_preamount(preamount);
+            vendor.setVe_payamount(payamount + bk_amount);
+            vendor.setVe_leftamount(beginapamount + beginprepayamount - payamount + bk_amount + preamount);
+            paybalanceMapper.updateVendorByPrimaryKeySelective(vendor);
+
+            subledgerMapper.deleteByPrimaryKey(othspendings.getOs_code(), "其他支出单");
+        }
 
 
         //计算期间金额

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

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.usoftchina.saas.money.mapper.AccountDetailsViewMapper" >
+  <resultMap id="BaseResultMap" type="com.usoftchina.saas.money.po.AccountDetailsView" >
+    <result column="SL_CODE" property="SL_CODE" jdbcType="VARCHAR" />
+    <result column="SL_KIND" property="SL_KIND" jdbcType="VARCHAR" />
+    <result column="VE_NAME" property="VE_NAME" jdbcType="VARCHAR" />
+    <result column="SL_AMOUNT" property="SL_AMOUNT" jdbcType="DOUBLE" />
+    <result column="PB_ID" property="PB_ID" jdbcType="INTEGER" />
+    <result column="PB_KIND" property="PB_KIND" jdbcType="VARCHAR" />
+    <result column="PB_CODE" property="PB_CODE" jdbcType="VARCHAR" />
+    <result column="total" property="total" jdbcType="DOUBLE" />
+    <result column="date" property="date" jdbcType="TIMESTAMP" />
+  </resultMap>
+  <select id="selectByCondition" resultMap="BaseResultMap">
+    select  *  from account_details_view
+    <where>
+      <if test="con != null">
+        ${con}
+      </if>
+      <if test="companyId != null">
+        and  companyId = #{companyId}
+      </if>
+    </where>
+    order by date desc
+  </select>
+</mapper>

frontend/saas-web/app.json

@@ -296,7 +296,10 @@
         },*/
         "compressor":null,
         "server": {
-            "basePath": "http://192.168.0.182:8560",
+            "basePath": {
+                "https": "https://saas-api-dev.usoftchina.com:5443",
+                "http": "http://192.168.0.182:8560"
+            },
             "urlPattern": "^\/api\/"
         }
     },
@@ -306,7 +309,10 @@
      */
     "testing": {
         "server": {
-            "basePath": "http://192.168.0.182:8560",
+            "basePath": {
+                "https": "https://saas-api-dev.usoftchina.com:5443",
+                "http": "http://192.168.0.182:8560"
+            },
             "urlPattern": "^\/api\/"
         }
     },
@@ -319,7 +325,10 @@
             "delay": 250
         },
         "server": {
-            "basePath": "http://192.168.0.182:8560",
+            "basePath": {
+                "https": "https://saas-api-dev.usoftchina.com:5443",
+                "http": "http://192.168.0.182:8560"
+            },
             "urlPattern": "^\/api\/"
         }
     },

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

@@ -139,7 +139,7 @@ Ext.define('saas.view.money.fundtransfer.QueryPanel', {
             width: 120
         }, {
             text: '备注',
-            dataIndex: 'ftd_remark',
+            dataIndex: 'ft_remark',
             width: 250
         }],
         relativeColumn: []

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

@@ -38,7 +38,7 @@ Ext.define('saas.view.money.othreceipts.FormPanel', {
          xtype : "customerDbfindTrigger", 
          name : "or_custname", 
          fieldLabel : "客户名称",
-         allowBlank : false
+         // allowBlank : false
      }, {
          xtype : 'hidden',
          name : 'or_bankid', 

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

@@ -38,7 +38,7 @@ Ext.define('saas.view.money.othspendings.FormPanel', {
          xtype : "vendorDbfindTrigger",
          name : "os_vendname", 
          fieldLabel : "供应商名称",
-         allowBlank : false
+         // allowBlank : false
      }, {
         xtype : 'hidden',
          name : 'os_bankid', 

frontend/saas-web/app/view/money/report/AccountBalance.js

@@ -44,7 +44,7 @@ Ext.define('saas.view.money.report.AccountBalance', {
             dataIndex: 'kind'
         },{
             text:'收入',
-            dataIndex:'outamount',
+            dataIndex:'inamount',
             xtype: 'numbercolumn',
             renderer : function(v) {
                 var arr = (v + '.').split('.');
@@ -61,7 +61,7 @@ Ext.define('saas.view.money.report.AccountBalance', {
             }
         },{
             text:'支出',
-            dataIndex:'inamount',
+            dataIndex:'outamount',
             xtype: 'numbercolumn',
             renderer : function(v) {
                 var arr = (v + '.').split('.');

frontend/saas-web/overrides/data/Connection.js

@@ -16,12 +16,19 @@ Ext.define('saas.override.data.Connection', {
     },
 
     privates: {
+        parseBasePath: function(basePath) {
+            if (Ext.isObject(basePath)) {
+                return basePath[window.location.protocol.split(":")[0]];
+            }
+            return basePath;
+        },
         setupServerOptions: function(options) {
             var serverOptions = Ext.manifest.server, originUrl = options.url;
             if (serverOptions && serverOptions.basePath && !this.urlRegexp.test(originUrl) &&
               (!serverOptions.urlPattern || new RegExp(serverOptions.urlPattern).test(originUrl))) {
                 Ext.Object.merge(options, {
-                    url: serverOptions.basePath + (originUrl.indexOf('/') == 0 ? '' : '/') + originUrl,
+                    url: this.parseBasePath(serverOptions.basePath)
+                        + (originUrl.indexOf('/') == 0 ? '' : '/') + originUrl,
                     headers: this.getDefaultServerHeaders() || {}
                 });
             }