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

README.md

@@ -111,9 +111,9 @@
 
 > 日志
 
-* [kibana](http://192.168.253.3:5601)
-* [logstash](tcp://192.168.253.3:5000)
-* [elasticsearch](http://192.168.253.3:9200/_search?pretty)
+* [kibana](http://192.168.0.63:5601)
+* [logstash](tcp://192.168.0.63:5000)
+* [elasticsearch](http://192.168.0.63:9200/_search?pretty)
 
 > 服务
 

applications/commons/commons-server/src/main/resources/logback-spring.xml

@@ -28,7 +28,7 @@
     <springProperty scope="context" name="spring.profiles.active" source="spring.profiles.active" defaultValue="dev"/>
     <springProperty scope="context" name="common-pattern" source="logging.common-pattern" defaultValue="%d{yyyy-MM-dd HH:mm:ss.SSS}:[%5p] [%t:%r] [%C{1}:%M:%L] --> %m%n"/>
     <springProperty scope="context" name="log.level.console" source="logging.level.console" defaultValue="INFO"/>
-    <springProperty scope="context" name="log.destination" source="logging.destination" defaultValue="192.168.253.3:5000"/>
+    <springProperty scope="context" name="log.destination" source="logging.destination" defaultValue="192.168.0.63:5000"/>
 
     <contextName>${spring.application.name}-${spring.profiles.active}-logback</contextName>
 

applications/commons/commons-server/src/main/resources/mapper/HomePageMapper.xml

@@ -11,9 +11,16 @@
     </select>
 
     <select id="getPurchaseDataNow" parameterType="long" resultType="string">
-        select concat('[',GROUP_CONCAT(concat('{"x":"',ifnull(si_vendname,''),'","y":',IFNULL(round(si_amount/10000,2),0),'}')),']')  from (
-        select * from statsinfo
-        where companyid=#{componyId} and si_yearmonth=DATE_FORMAT(now(),'%Y%m') and si_type='PURC' ORDER BY si_amount desc limit 10) a
+      select concat('[',five,',',other,']') from (
+	      select GROUP_CONCAT(concat('{"x":"',ifnull(si_vendname,''),'","y":',IFNULL(round(si_amount/10000,2),0),'}')) five from (
+        select * from statsinfo where companyid=#{componyId} and si_yearmonth=DATE_FORMAT(now(),'%Y%m') and si_type='PURC' ORDER BY si_amount desc limit 5) a ) a1,
+      (
+	  select concat('{"x":"其它","y":',ifnull(round((all_sum - five_sum)/10000,2),0),'}') other from (
+		(select sum(si_amount) all_sum from statsinfo  where companyid=#{componyId} and si_yearmonth=DATE_FORMAT(now(),'%Y%m') and si_type='PURC')a,
+        (select sum(si_amount) five_sum from statsinfo where companyid=#{componyId} and si_yearmonth=DATE_FORMAT(now(),'%Y%m') and si_type='PURC' ORDER BY si_amount desc limit 0,5) b)
+	  ) b1
+
+
     </select>
 
     <select id="getPurchaseDataInSixMonth" parameterType="long" resultType="string">

applications/document/document-server/src/main/resources/logback-spring.xml

@@ -28,7 +28,7 @@
     <springProperty scope="context" name="spring.profiles.active" source="spring.profiles.active" defaultValue="dev"/>
     <springProperty scope="context" name="common-pattern" source="logging.common-pattern" defaultValue="%d{yyyy-MM-dd HH:mm:ss.SSS}:[%5p] [%t:%r] [%C{1}:%M:%L] --> %m%n"/>
     <springProperty scope="context" name="log.level.console" source="logging.level.console" defaultValue="INFO"/>
-    <springProperty scope="context" name="log.destination" source="logging.destination" defaultValue="192.168.253.3:5000"/>
+    <springProperty scope="context" name="log.destination" source="logging.destination" defaultValue="192.168.0.63:5000"/>
 
     <contextName>${spring.application.name}-${spring.profiles.active}-logback</contextName>
 

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

@@ -11,6 +11,8 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.Map;
+
 /**
  * @author heqw
  * @date 2018/11/9 14:21
@@ -24,42 +26,42 @@ public class MoneyReportColltroller {
     //供应商对账
     @GetMapping("/vendorCheck")
     public Result vendorCheck(PageRequest page, ListReqDTO req) {
-        PageInfo listData = moneyReportService.vendorCheck(page, req);
+        Map<String, Object> listData = moneyReportService.vendorCheck(page, req);
         return Result.success(listData);
     }
 
     //应付账款明细
     @GetMapping("/payDetail")
     public Result payDetail(PageRequest page, ListReqDTO req) {
-        PageInfo listData = moneyReportService.payDetail(page, req);
+        Map<String, Object> listData = moneyReportService.payDetail(page, req);
         return Result.success(listData);
     }
 
     //应收款明细表
     @GetMapping("/recDetail")
     public Result recDetail(PageRequest page, ListReqDTO req) {
-        PageInfo listData = moneyReportService.recDetail(page, req);
+        Map<String, Object> listData = moneyReportService.recDetail(page, req);
         return Result.success(listData);
     }
 
     //资金账号余额表
     @GetMapping("/accountBalance")
     public Result acountBalance(PageRequest page, ListReqDTO req) {
-        PageInfo listData = moneyReportService.acountBalance(page, req);
+        Map<String, Object> listData = moneyReportService.acountBalance(page, req);
         return Result.success(listData);
     }
 
     //客户对账单
     @GetMapping("/customercheck")
     public Result customercheck(PageRequest page, ListReqDTO req) {
-        PageInfo listData = moneyReportService.customercheck(page, req);
+        Map<String, Object> listData = moneyReportService.customercheck(page, req);
         return Result.success(listData);
     }
 
     //冲账明细表
     @GetMapping("/accountdetails")
     public Result accountdetails(PageRequest page, ListReqDTO req) {
-        PageInfo listData = moneyReportService.accountdetails(page, req);
+        Map<String, Object> listData = moneyReportService.accountdetails(page, req);
         return Result.success(listData);
     }
 }

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

@@ -7,4 +7,5 @@ import java.util.List;
 
 public interface AccountDetailsViewMapper {
     List<AccountDetailsView> selectByCondition(@Param("con") String con, @Param("companyId") Long companyId);
+    String selectCalculateFields(@Param("fields") String fields, @Param("con") String con, @Param("companyId") Long companyId);
 }

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

@@ -7,4 +7,5 @@ import java.util.List;
 
 public interface AcountbalanceViewMapper {
     List<AcountbalanceView> selectByCondition(@Param("con") String con, @Param("companyId") Long companyId);
+    String selectCalculateFields(@Param("fields") String fields, @Param("con") String con, @Param("companyId") Long companyId);
 }

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

@@ -8,4 +8,5 @@ import java.util.List;
 
 public interface CustomerCheckViewMapper {
     List<CustomerCheckView> selectByCondition(@Param("con") String con, @Param("companyId") Long companyId);
+    String selectCalculateFields(@Param("fields") String fields, @Param("con") String con, @Param("companyId") Long companyId);
 }

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

@@ -7,4 +7,5 @@ import java.util.List;
 
 public interface PaydetailViewMapper {
     List<PaydetailView> selectByCondition(@Param("con") String con, @Param("companyId") Long companyId);
+    String selectCalculateFields(@Param("fields") String fields, @Param("con") String con, @Param("companyId") Long companyId);
 }

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

@@ -7,4 +7,5 @@ import java.util.List;
 
 public interface RecdetailViewMapper {
     List<RecdetailView> selectByCondition(@Param("con") String con, @Param("companyId") Long companyId);
+    String selectCalculateFields(@Param("fields") String fields, @Param("con") String con, @Param("companyId") Long companyId);
 }

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

@@ -7,4 +7,5 @@ import java.util.List;
 
 public interface VendorAcountViewMapper {
     List<VendorAcountView> selectByCondition(@Param("con")String con, @Param("companyId")Long companyId);
+    String selectCalculateFields(@Param("fields") String fields, @Param("con") String con, @Param("companyId") Long companyId);
 }

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

@@ -3,22 +3,40 @@ package com.usoftchina.saas.money.po;
 import java.util.Date;
 
 public class AccountDetailsView {
-    private String SL_CODE;
+    private String sl_code;
 
-    private String SL_KIND;
+    private String sl_kind;
 
-    private String VE_NAME;
+    private String ve_name;
+    private String cu_name;
 
-    private Double SL_AMOUNT;
+    private Double sl_amount;
 
-    private Integer PB_ID;
+    private Integer pb_id;
 
-    private String PB_KIND;
+    private String pb_kind;
 
-    private String PB_CODE;
+    private String pb_code;
 
     private Double total;
     private Date date;
+    private Long companyId;
+
+    public String getCu_name() {
+        return cu_name;
+    }
+
+    public void setCu_name(String cu_name) {
+        this.cu_name = cu_name;
+    }
+
+    public Long getCompanyId() {
+        return companyId;
+    }
+
+    public void setCompanyId(Long companyId) {
+        this.companyId = companyId;
+    }
 
     public Date getDate() {
         return date;
@@ -28,60 +46,60 @@ public class AccountDetailsView {
         this.date = date;
     }
 
-    public String getSL_CODE() {
-        return SL_CODE;
+    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 void setSl_code(String sl_code) {
+        this.sl_code = sl_code;
     }
 
-    public String getSL_KIND() {
-        return SL_KIND;
+    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 void setSl_kind(String sl_kind) {
+        this.sl_kind = sl_kind;
     }
 
-    public String getVE_NAME() {
-        return VE_NAME;
+    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 void setVe_name(String ve_name) {
+        this.ve_name = ve_name;
     }
 
-    public Double getSL_AMOUNT() {
-        return SL_AMOUNT;
+    public Double getSl_amount() {
+        return sl_amount;
     }
 
-    public void setSL_AMOUNT(Double SL_AMOUNT) {
-        this.SL_AMOUNT = SL_AMOUNT;
+    public void setSl_amount(Double sl_amount) {
+        this.sl_amount = sl_amount;
     }
 
-    public Integer getPB_ID() {
-        return PB_ID;
+    public Integer getPb_id() {
+        return pb_id;
     }
 
-    public void setPB_ID(Integer PB_ID) {
-        this.PB_ID = PB_ID;
+    public void setPb_id(Integer pb_id) {
+        this.pb_id = pb_id;
     }
 
-    public String getPB_KIND() {
-        return PB_KIND;
+    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 void setPb_kind(String pb_kind) {
+        this.pb_kind = pb_kind;
     }
 
-    public String getPB_CODE() {
-        return PB_CODE;
+    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 void setPb_code(String pb_code) {
+        this.pb_code = pb_code;
     }
 
     public Double getTotal() {

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

@@ -32,6 +32,10 @@ public class RecdetailView {
     private String pi_remark;
     private Integer companyId;
 
+    public Date getMustdate() {
+        return mustdate;
+    }
+
     public void setMustdate(Date mustdate) {
         this.mustdate = mustdate;
     }

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

@@ -4,15 +4,17 @@ import com.github.pagehelper.PageInfo;
 import com.usoftchina.saas.commons.dto.ListReqDTO;
 import com.usoftchina.saas.page.PageRequest;
 
+import java.util.Map;
+
 /**
  * @author heqw
  * @date 2018/11/9 14:50
  **/
 public interface MoneyReportService {
-    PageInfo vendorCheck(PageRequest page, ListReqDTO req);
-    PageInfo payDetail(PageRequest page, ListReqDTO req);
-    PageInfo recDetail(PageRequest page, ListReqDTO req);
-    PageInfo acountBalance(PageRequest page, ListReqDTO req);
-    PageInfo customercheck(PageRequest page, ListReqDTO req);
-    PageInfo accountdetails(PageRequest page, ListReqDTO req);
+    Map<String, Object> vendorCheck(PageRequest page, ListReqDTO req);
+    Map<String, Object> payDetail(PageRequest page, ListReqDTO req);
+    Map<String, Object> recDetail(PageRequest page, ListReqDTO req);
+    Map<String, Object> acountBalance(PageRequest page, ListReqDTO req);
+    Map<String, Object> customercheck(PageRequest page, ListReqDTO req);
+    Map<String, Object> accountdetails(PageRequest page, ListReqDTO req);
 }

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

@@ -1,5 +1,6 @@
 package com.usoftchina.saas.money.service.impl;
 
+import com.alibaba.fastjson.JSONArray;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.usoftchina.saas.commons.dto.ListReqDTO;
@@ -9,8 +10,11 @@ import com.usoftchina.saas.money.service.MoneyReportService;
 import com.usoftchina.saas.page.PageRequest;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @author heqw
@@ -32,36 +36,36 @@ public class MoneyReportServiceImpl implements MoneyReportService {
     private AccountDetailsViewMapper accountDetailsViewMapper;
 
     @Override
-    public PageInfo vendorCheck(PageRequest page, ListReqDTO req) {
+    public Map<String, Object> vendorCheck(PageRequest page, ListReqDTO req) {
         return getListDATA(page, req, "Supplier");
     }
 
     @Override
-    public PageInfo payDetail(PageRequest page, ListReqDTO req) {
+    public Map<String, Object> payDetail(PageRequest page, ListReqDTO req) {
         return getListDATA(page, req, "payDetail");
     }
 
     @Override
-    public PageInfo recDetail(PageRequest page, ListReqDTO req) {
+    public Map<String, Object> recDetail(PageRequest page, ListReqDTO req) {
         return getListDATA(page, req, "recDetail");
     }
 
     @Override
-    public PageInfo acountBalance(PageRequest page, ListReqDTO req) {
+    public Map<String, Object> acountBalance(PageRequest page, ListReqDTO req) {
         return getListDATA(page, req, "acountBalance");
     }
 
     @Override
-    public PageInfo customercheck(PageRequest page, ListReqDTO req) {
+    public Map<String, Object> customercheck(PageRequest page, ListReqDTO req) {
         return getListDATA(page, req, "customercheck");
     }
 
     @Override
-    public PageInfo accountdetails(PageRequest page, ListReqDTO req) {
+    public Map<String, Object> accountdetails(PageRequest page, ListReqDTO req) {
         return getListDATA(page, req, "accountdetails");
     }
 
-    private PageInfo getListDATA(PageRequest page, ListReqDTO req, String type) {
+    private Map<String, Object> getListDATA(PageRequest page, ListReqDTO req, String type) {
         //设置默认分页
         if (null == page || page.getSize() == 0 || page.getNumber() == 0) {
             page = new PageRequest();
@@ -70,34 +74,65 @@ public class MoneyReportServiceImpl implements MoneyReportService {
         }
         PageHelper.startPage(page.getNumber(), page.getSize());
 
-
         //查询数据
-        List list = getListByType(req, type);
+        Map<String, Object> map = getListByType(req, type);
         //取分页信息
-        PageInfo lists = new PageInfo(list);
-        return lists;
+        PageInfo lists = new PageInfo((List) map.get("list"));
+        map.remove("list");
+        map.put("list", lists);
+        return map;
     }
 
-    private List getListByType(ListReqDTO req, String type) {
+    private Map<String, Object> getListByType(ListReqDTO req, String type) {
         List list = null;
         Long companyId = BaseContextHolder.getCompanyId();
         String con = req.getFinalCondition();
+        String calculateFieldsSql = req.getCalculateFieldsSql();
+        JSONArray arr = null;
         if (null == con) {
             con = "1=1";
         }
+
+        String res = null;
         if ("Supplier".equals(type)) {
             list = vendorAcountViewMapper.selectByCondition(con, companyId);
+            if (!StringUtils.isEmpty(calculateFieldsSql)) {
+                res = vendorAcountViewMapper.selectCalculateFields(calculateFieldsSql, con, companyId);
+            }
         } else if("payDetail".equals(type)){
             list = paydetailViewMapper.selectByCondition(con, companyId);
+            if (!StringUtils.isEmpty(calculateFieldsSql)) {
+                res = paydetailViewMapper.selectCalculateFields(calculateFieldsSql, con, companyId);
+            }
         }else if("recDetail".equals(type)){
             list = recdetailViewMapper.selectByCondition(con, companyId);
+            if (!StringUtils.isEmpty(calculateFieldsSql)) {
+                res = recdetailViewMapper.selectCalculateFields(calculateFieldsSql, con, companyId);
+            }
         }else if ("acountBalance".equals(type)){
             list = acountbalanceViewMapper.selectByCondition(con, companyId);
+            if (!StringUtils.isEmpty(calculateFieldsSql)) {
+                res = acountbalanceViewMapper.selectCalculateFields(calculateFieldsSql, con, companyId);
+            }
         }else if ("customercheck".equals(type)){
             list = customerCheckViewMapper.selectByCondition(con, companyId);
+            if (!StringUtils.isEmpty(calculateFieldsSql)) {
+                res = customerCheckViewMapper.selectCalculateFields(calculateFieldsSql, con, companyId);
+            }
         }else if ("accountdetails".equals(type)){
             list = accountDetailsViewMapper.selectByCondition(con, companyId);
+            if (!StringUtils.isEmpty(calculateFieldsSql)) {
+                res = accountDetailsViewMapper.selectCalculateFields(calculateFieldsSql, con, companyId);
+            }
+        }
+
+        try {
+            arr = JSONArray.parseArray(res);
+        } catch (Exception e) {
         }
-        return list;
+        Map<String, Object> map = new HashMap<String, Object>();
+        map.put("list", list);
+        map.put("calculate", arr);
+        return map;
     }
 }

applications/money/money-server/src/main/resources/logback-spring.xml

@@ -28,7 +28,7 @@
     <springProperty scope="context" name="spring.profiles.active" source="spring.profiles.active" defaultValue="dev"/>
     <springProperty scope="context" name="common-pattern" source="logging.common-pattern" defaultValue="%d{yyyy-MM-dd HH:mm:ss.SSS}:[%5p] [%t:%r] [%C{1}:%M:%L] --> %m%n"/>
     <springProperty scope="context" name="log.level.console" source="logging.level.console" defaultValue="INFO"/>
-    <springProperty scope="context" name="log.destination" source="logging.destination" defaultValue="192.168.253.3:5000"/>
+    <springProperty scope="context" name="log.destination" source="logging.destination" defaultValue="192.168.0.63:5000"/>
 
     <contextName>${spring.application.name}-${spring.profiles.active}-logback</contextName>
 

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

@@ -2,15 +2,17 @@
 <!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="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="cu_name" property="cu_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" />
+    <result column="companyId" property="companyId" jdbcType="INTEGER" />
   </resultMap>
   <select id="selectByCondition" resultMap="BaseResultMap">
     select  *  from account_details_view
@@ -24,4 +26,16 @@
     </where>
     order by date desc
   </select>
+
+  <select id="selectCalculateFields" resultType="string">
+    select   ${fields}  from account_details_view
+    <where>
+      <if test="con != null">
+        ${con}
+      </if>
+      <if test="companyId != null">
+        and  companyId = #{companyId}
+      </if>
+    </where>
+  </select>
 </mapper>

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

@@ -30,4 +30,16 @@
     order by bankname asc, date desc, bankid desc
   </select>
 
+  <select id="selectCalculateFields" resultType="string">
+    select   ${fields}  from acountbalance_view
+    <where>
+      <if test="con != null">
+        ${con}
+      </if>
+      <if test="companyId != null">
+        and  companyId = #{companyId}
+      </if>
+    </where>
+  </select>
+
 </mapper>

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

@@ -33,4 +33,16 @@
         order by pi_custname asc, pi_date desc, pi_custcode desc
     </select>
 
+    <select id="selectCalculateFields" resultType="string">
+        select   ${fields}  from customer_amount_view
+        <where>
+            <if test="con != null">
+                ${con}
+            </if>
+            <if test="companyId != null">
+                and  companyId = #{companyId}
+            </if>
+        </where>
+    </select>
+
 </mapper>

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

@@ -32,4 +32,16 @@
     order by pi_vendname asc, pb_date desc,pi_vendcode desc
   </select>
 
+  <select id="selectCalculateFields" resultType="string">
+    select   ${fields}  from paydetail_view
+    <where>
+      <if test="con != null">
+        ${con}
+      </if>
+      <if test="companyId != null">
+        and  companyId = #{companyId}
+      </if>
+    </where>
+  </select>
+
 </mapper>

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

@@ -31,4 +31,16 @@
     </where>
     order by pi_custname asc, rb_date desc, pi_custcode desc
   </select>
+
+  <select id="selectCalculateFields" resultType="string">
+    select   ${fields}  from recdetail_view
+    <where>
+      <if test="con != null">
+        ${con}
+      </if>
+      <if test="companyId != null">
+        and  companyId = #{companyId}
+      </if>
+    </where>
+  </select>
 </mapper>

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

@@ -34,4 +34,16 @@
     </where>
     order by pi_vendname asc, pi_date desc, pi_vendcode desc
   </select>
+
+  <select id="selectCalculateFields" resultType="string">
+    select   ${fields}  from vendor_acount_view
+    <where>
+      <if test="con != null">
+        ${con}
+      </if>
+      <if test="companyId != null">
+        and  companyId = #{companyId}
+      </if>
+    </where>
+  </select>
 </mapper>

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

@@ -171,8 +171,6 @@ public class ProdInOutServiceImpl extends CommonBaseServiceImpl<ProdInOutMapper,
             //日志记录
             messageLogService.save(baseDTO);
             return baseDTO;
-        }else{
-            //setUpdateInfo(prodInOut);
         }
         //更新操作
         getMapper().updateByPrimaryKeySelective(prodInOut);
@@ -181,7 +179,6 @@ public class ProdInOutServiceImpl extends CommonBaseServiceImpl<ProdInOutMapper,
             ProdIODetail detail = BeanMapper.map(item, ProdIODetail.class);
             detail.setUpdaterId(userId);
             detail.setUpdateTime(new Date());
-//            detail.setUpdater(userName);
             if (StringUtils.isEmpty(detail.getId()) || "0".equals(detail.getId().toString())) {
                 detail.setCompanyId(companyId);
                 detail.setCreatorId(userId);
@@ -448,9 +445,9 @@ public class ProdInOutServiceImpl extends CommonBaseServiceImpl<ProdInOutMapper,
         targetPi.setCompanyId(sourcePi.getCompanyId());
         targetPi.setCreateTime(new Date());
         targetPi.setCreatorId(userId);
-//        targetPi.setCreator(userName);
+        targetPi.setCreatorName(userName);
         targetPi.setUpdaterId(userId);
-//        targetPi.setUpdater(userName);
+        targetPi.setUpdaterName(userName);
         targetPi.setUpdateTime(new Date());
 
         //保存数据
@@ -485,9 +482,9 @@ public class ProdInOutServiceImpl extends CommonBaseServiceImpl<ProdInOutMapper,
                  targetPid.setCompanyId(sourcePid.getCompanyId());
                  targetPid.setCreateTime(new Date());
                  targetPid.setCreatorId(userId);
-//                 targetPid.setCreator(userName);
+                 targetPid.setCreatorName(userName);
                  targetPid.setUpdaterId(userId);
-//                 targetPid.setUpdater(userName);
+                 targetPid.setUpdaterName(userName);
                  targetPid.setUpdateTime(new Date());
                  //本次转单数
                  targetPid.setPd_outqty(pdInqty-pdYqty);
@@ -514,7 +511,6 @@ public class ProdInOutServiceImpl extends CommonBaseServiceImpl<ProdInOutMapper,
             }
             prodInOut.setPi_statuscode(Status.CLOSE.name());
             prodInOut.setPi_status(Status.CLOSE.getDisplay());
-            //setUpdateInfo(prodInOut);
             getMapper().updateByPrimaryKeySelective(prodInOut);
             docBaseDTO = getBaseDTOById(id,prodInOut.getPi_class(),prodInOut.getPi_inoutno());
             //日志

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

@@ -442,9 +442,9 @@ public class PurchaseServiceImpl extends CommonBaseServiceImpl<PurchaseMapper, P
         prodInOut.setCompanyId(purchase.getCompanyId());
         prodInOut.setCreatorId(userId);
         prodInOut.setCreateTime(new Date());
-//        prodInOut.setCreator(userName);
+        prodInOut.setCreatorName(userName);
         prodInOut.setUpdaterId(userId);
-//        prodInOut.setUpdater(userName);
+        prodInOut.setUpdaterName(userName);
         prodInOut.setUpdateTime(new Date());
         prodInOutMapper.insertSelective(prodInOut);
         //插入验收单从表
@@ -472,10 +472,10 @@ public class PurchaseServiceImpl extends CommonBaseServiceImpl<PurchaseMapper, P
                 prodIODetail.setCompanyId(purchaseDetail.getCompanyId());
                 prodIODetail.setCreatorId(userId);
                 prodIODetail.setCreateTime(new Date());
-//                prodIODetail.setCreator(userName);
+                prodIODetail.setCreatorName(userName);
                 prodIODetail.setUpdaterId(userId);
                 prodIODetail.setUpdateTime(new Date());
-//                prodIODetail.setUpdater(userName);
+                prodIODetail.setUpdaterName(userName);
                 //本次转单数
                 prodIODetail.setPd_inqty(pdQty-pdYqty);
                 prodIODetailMapper.insertSelective(prodIODetail);
@@ -484,6 +484,8 @@ public class PurchaseServiceImpl extends CommonBaseServiceImpl<PurchaseMapper, P
                 purchasedetailMapper.updateByPrimaryKeySelective(purchaseDetail);
             }
         }
+        //取默认仓库
+        prodIODetailMapper.getDefaultWarehouseByProduct(pi_id);
         //采购验收单相关计算
         prodInOutService.calcProdInout(pi_id,"采购验收单");
         //日志记录到采购单

applications/purchase/purchase-server/src/main/resources/logback-spring.xml

@@ -28,7 +28,7 @@
     <springProperty scope="context" name="spring.profiles.active" source="spring.profiles.active" defaultValue="dev"/>
     <springProperty scope="context" name="common-pattern" source="logging.common-pattern" defaultValue="%d{yyyy-MM-dd HH:mm:ss.SSS}:[%5p] [%t:%r] [%C{1}:%M:%L] --> %m%n"/>
     <springProperty scope="context" name="log.level.console" source="logging.level.console" defaultValue="INFO"/>
-    <springProperty scope="context" name="log.destination" source="logging.destination" defaultValue="192.168.253.3:5000"/>
+    <springProperty scope="context" name="log.destination" source="logging.destination" defaultValue="192.168.0.63:5000"/>
 
     <contextName>${spring.application.name}-${spring.profiles.active}-logback</contextName>
 

applications/sale/sale-dto/src/main/java/com/usoftchina/saas/sale/dto/ProdIODetailDTO.java

@@ -52,13 +52,13 @@ public class ProdIODetailDTO implements Serializable {
 
     private Double pd_nettotal;
 
-    private Integer pd_whid;
+    private Long pd_whid;
 
     private String pd_whcode;
 
     private String pd_whname;
 
-    private Integer pd_inwhid;
+    private Long pd_inwhid;
 
     private String pd_inwhcode;
 

applications/sale/sale-server/src/main/resources/logback-spring.xml

@@ -28,7 +28,7 @@
     <springProperty scope="context" name="spring.profiles.active" source="spring.profiles.active" defaultValue="dev"/>
     <springProperty scope="context" name="common-pattern" source="logging.common-pattern" defaultValue="%d{yyyy-MM-dd HH:mm:ss.SSS}:[%5p] [%t:%r] [%C{1}:%M:%L] --> %m%n"/>
     <springProperty scope="context" name="log.level.console" source="logging.level.console" defaultValue="INFO"/>
-    <springProperty scope="context" name="log.destination" source="logging.destination" defaultValue="192.168.253.3:5000"/>
+    <springProperty scope="context" name="log.destination" source="logging.destination" defaultValue="192.168.0.63:5000"/>
 
     <contextName>${spring.application.name}-${spring.profiles.active}-logback</contextName>
 

applications/storage/storage-server/src/main/resources/logback-spring.xml

@@ -28,7 +28,7 @@
     <springProperty scope="context" name="spring.profiles.active" source="spring.profiles.active" defaultValue="dev"/>
     <springProperty scope="context" name="common-pattern" source="logging.common-pattern" defaultValue="%d{yyyy-MM-dd HH:mm:ss.SSS}:[%5p] [%t:%r] [%C{1}:%M:%L] --> %m%n"/>
     <springProperty scope="context" name="log.level.console" source="logging.level.console" defaultValue="INFO"/>
-    <springProperty scope="context" name="log.destination" source="logging.destination" defaultValue="192.168.253.3:5000"/>
+    <springProperty scope="context" name="log.destination" source="logging.destination" defaultValue="192.168.0.63:5000"/>
 
     <contextName>${spring.application.name}-${spring.profiles.active}-logback</contextName>
 

base-servers/account/account-server/src/main/resources/logback-spring.xml

@@ -28,7 +28,7 @@
     <springProperty scope="context" name="spring.profiles.active" source="spring.profiles.active" defaultValue="dev"/>
     <springProperty scope="context" name="common-pattern" source="logging.common-pattern" defaultValue="%d{yyyy-MM-dd HH:mm:ss.SSS}:[%5p] [%t:%r] [%C{1}:%M:%L] --> %m%n"/>
     <springProperty scope="context" name="log.level.console" source="logging.level.console" defaultValue="INFO"/>
-    <springProperty scope="context" name="log.destination" source="logging.destination" defaultValue="192.168.253.3:5000"/>
+    <springProperty scope="context" name="log.destination" source="logging.destination" defaultValue="192.168.0.63:5000"/>
 
     <contextName>${spring.application.name}-${spring.profiles.active}-logback</contextName>
 

base-servers/admin-server/src/main/resources/logback-spring.xml

@@ -28,7 +28,7 @@
     <springProperty scope="context" name="spring.profiles.active" source="spring.profiles.active" defaultValue="dev"/>
     <springProperty scope="context" name="common-pattern" source="logging.common-pattern" defaultValue="%d{yyyy-MM-dd HH:mm:ss.SSS}:[%5p] [%t:%r] [%C{1}:%M:%L] --> %m%n"/>
     <springProperty scope="context" name="log.level.console" source="logging.level.console" defaultValue="INFO"/>
-    <springProperty scope="context" name="log.destination" source="logging.destination" defaultValue="192.168.253.3:5000"/>
+    <springProperty scope="context" name="log.destination" source="logging.destination" defaultValue="192.168.0.63:5000"/>
 
     <contextName>${spring.application.name}-${spring.profiles.active}-logback</contextName>
 

base-servers/auth/auth-server/src/main/resources/logback-spring.xml

@@ -28,7 +28,7 @@
     <springProperty scope="context" name="spring.profiles.active" source="spring.profiles.active" defaultValue="dev"/>
     <springProperty scope="context" name="common-pattern" source="logging.common-pattern" defaultValue="%d{yyyy-MM-dd HH:mm:ss.SSS}:[%5p] [%t:%r] [%C{1}:%M:%L] --> %m%n"/>
     <springProperty scope="context" name="log.level.console" source="logging.level.console" defaultValue="INFO"/>
-    <springProperty scope="context" name="log.destination" source="logging.destination" defaultValue="192.168.253.3:5000"/>
+    <springProperty scope="context" name="log.destination" source="logging.destination" defaultValue="192.168.0.63:5000"/>
 
     <contextName>${spring.application.name}-${spring.profiles.active}-logback</contextName>
 

base-servers/eureka-server/src/main/resources/logback-spring.xml

@@ -28,7 +28,7 @@
     <springProperty scope="context" name="spring.profiles.active" source="spring.profiles.active" defaultValue="dev"/>
     <springProperty scope="context" name="common-pattern" source="logging.common-pattern" defaultValue="%d{yyyy-MM-dd HH:mm:ss.SSS}:[%5p] [%t:%r] [%C{1}:%M:%L] --> %m%n"/>
     <springProperty scope="context" name="log.level.console" source="logging.level.console" defaultValue="INFO"/>
-    <springProperty scope="context" name="log.destination" source="logging.destination" defaultValue="192.168.253.3:5000"/>
+    <springProperty scope="context" name="log.destination" source="logging.destination" defaultValue="192.168.0.63:5000"/>
 
     <contextName>${spring.application.name}-${spring.profiles.active}-logback</contextName>
 

base-servers/file/file-server/src/main/resources/application.yml

@@ -86,6 +86,6 @@ fdfs:
     width: 150
     height: 150
   tracker-list:
-    - 192.168.253.3:22122
+    - 192.168.0.63:22122
 file:
-  base-url: http://192.168.253.3:8888/
+  base-url: http://192.168.0.63:8888/

base-servers/file/file-server/src/main/resources/logback-spring.xml

@@ -28,7 +28,7 @@
     <springProperty scope="context" name="spring.profiles.active" source="spring.profiles.active" defaultValue="dev"/>
     <springProperty scope="context" name="common-pattern" source="logging.common-pattern" defaultValue="%d{yyyy-MM-dd HH:mm:ss.SSS}:[%5p] [%t:%r] [%C{1}:%M:%L] --> %m%n"/>
     <springProperty scope="context" name="log.level.console" source="logging.level.console" defaultValue="INFO"/>
-    <springProperty scope="context" name="log.destination" source="logging.destination" defaultValue="192.168.253.3:5000"/>
+    <springProperty scope="context" name="log.destination" source="logging.destination" defaultValue="192.168.0.63:5000"/>
 
     <contextName>${spring.application.name}-${spring.profiles.active}-logback</contextName>
 

base-servers/gateway-server/src/main/resources/logback-spring.xml

@@ -28,7 +28,7 @@
     <springProperty scope="context" name="spring.profiles.active" source="spring.profiles.active" defaultValue="dev"/>
     <springProperty scope="context" name="common-pattern" source="logging.common-pattern" defaultValue="%d{yyyy-MM-dd HH:mm:ss.SSS}:[%5p] [%t:%r] [%C{1}:%M:%L] --> %m%n"/>
     <springProperty scope="context" name="log.level.console" source="logging.level.console" defaultValue="INFO"/>
-    <springProperty scope="context" name="log.destination" source="logging.destination" defaultValue="192.168.253.3:5000"/>
+    <springProperty scope="context" name="log.destination" source="logging.destination" defaultValue="192.168.0.63:5000"/>
 
     <contextName>${spring.application.name}-${spring.profiles.active}-logback</contextName>
 

base-servers/mail/mail-server/src/main/resources/logback-spring.xml

@@ -28,7 +28,7 @@
     <springProperty scope="context" name="spring.profiles.active" source="spring.profiles.active" defaultValue="dev"/>
     <springProperty scope="context" name="common-pattern" source="logging.common-pattern" defaultValue="%d{yyyy-MM-dd HH:mm:ss.SSS}:[%5p] [%t:%r] [%C{1}:%M:%L] --> %m%n"/>
     <springProperty scope="context" name="log.level.console" source="logging.level.console" defaultValue="INFO"/>
-    <springProperty scope="context" name="log.destination" source="logging.destination" defaultValue="192.168.253.3:5000"/>
+    <springProperty scope="context" name="log.destination" source="logging.destination" defaultValue="192.168.0.63:5000"/>
 
     <contextName>${spring.application.name}-${spring.profiles.active}-logback</contextName>
 

base-servers/socket/socket-server/src/main/resources/logback-spring.xml

@@ -28,7 +28,7 @@
     <springProperty scope="context" name="spring.profiles.active" source="spring.profiles.active" defaultValue="dev"/>
     <springProperty scope="context" name="common-pattern" source="logging.common-pattern" defaultValue="%d{yyyy-MM-dd HH:mm:ss.SSS}:[%5p] [%t:%r] [%C{1}:%M:%L] --> %m%n"/>
     <springProperty scope="context" name="log.level.console" source="logging.level.console" defaultValue="INFO"/>
-    <springProperty scope="context" name="log.destination" source="logging.destination" defaultValue="192.168.253.3:5000"/>
+    <springProperty scope="context" name="log.destination" source="logging.destination" defaultValue="192.168.0.63:5000"/>
 
     <contextName>${spring.application.name}-${spring.profiles.active}-logback</contextName>
 

base-servers/ui-server/src/main/resources/logback-spring.xml

@@ -28,7 +28,7 @@
     <springProperty scope="context" name="spring.profiles.active" source="spring.profiles.active" defaultValue="dev"/>
     <springProperty scope="context" name="common-pattern" source="logging.common-pattern" defaultValue="%d{yyyy-MM-dd HH:mm:ss.SSS}:[%5p] [%t:%r] [%C{1}:%M:%L] --> %m%n"/>
     <springProperty scope="context" name="log.level.console" source="logging.level.console" defaultValue="INFO"/>
-    <springProperty scope="context" name="log.destination" source="logging.destination" defaultValue="192.168.253.3:5000"/>
+    <springProperty scope="context" name="log.destination" source="logging.destination" defaultValue="192.168.0.63:5000"/>
 
     <contextName>${spring.application.name}-${spring.profiles.active}-logback</contextName>
 

base-servers/zipkin-server/src/main/resources/application.yml

@@ -41,7 +41,7 @@ zipkin:
   storage:
     type: elasticsearch
     elasticsearch:
-      hosts: 192.168.253.3:9200
+      hosts: 192.168.0.63:9200
       index: zipkin
       index-shards: 5
       index-replicas: 1

base-servers/zipkin-server/src/main/resources/logback-spring.xml

@@ -28,7 +28,7 @@
     <springProperty scope="context" name="spring.profiles.active" source="spring.profiles.active" defaultValue="dev"/>
     <springProperty scope="context" name="common-pattern" source="logging.common-pattern" defaultValue="%d{yyyy-MM-dd HH:mm:ss.SSS}:[%5p] [%t:%r] [%C{1}:%M:%L] --> %m%n"/>
     <springProperty scope="context" name="log.level.console" source="logging.level.console" defaultValue="INFO"/>
-    <springProperty scope="context" name="log.destination" source="logging.destination" defaultValue="192.168.253.3:5000"/>
+    <springProperty scope="context" name="log.destination" source="logging.destination" defaultValue="192.168.0.63:5000"/>
 
     <contextName>${spring.application.name}-${spring.profiles.active}-logback</contextName>
 

frontend/saas-web/app/view/core/query/QueryGridPanel.js

@@ -281,6 +281,16 @@ Ext.define('saas.view.core.query.QueryGridPanel', {
                     tdCls: 'x-querygrid-code-column'
                 });
             }
+            if(c.xtype == 'datecolumn') {
+                Ext.applyIf(c, {
+                    exportStyle: {
+                        format: 'Medium Date'
+                    },
+                    exportRenderer: function (value) {
+                        return Ext.Date.format(new Date(value), 'Y-m-d');
+                    }
+                })
+            }
         });
 
         return columns;

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

@@ -0,0 +1,101 @@
+Ext.define('saas.view.money.report.AccountDetails', {
+    extend: 'saas.view.core.report.ReportPanel',
+    xtype: 'monry-report-accountdetails',
+
+    controller: 'money-report-accountdetails',
+    viewModel: 'money-report-accountdetails',
+
+    viewName: 'money-report-accountdetails',
+
+    // groupField: null,
+    listUrl: '/api/money/report/accountdetails',
+    defaultCondition: null,
+    reportTitle: '核销对账表',
+    QueryWidth:0.25,
+    //筛选：客户/供应商、日期、单据类型（必填）
+    searchItems: [ {
+        xtype: 'vendorDbfindTrigger',
+        name: 've_name',
+        fieldLabel: '供应商名称',
+        columnWidth: 0.25,
+        // allowBlank:false
+    }, {
+        xtype: 'customerDbfindTrigger',
+        name: 'cu_name',
+        fieldLabel: '用户名称',
+        columnWidth: 0.25,
+        // allowBlank:false
+    },{
+        xtype: 'condatefield',
+        name: 'date',
+        fieldLabel: '单据日期',
+        columnWidth: 0.5
+    }],
+    reportColumns: [
+        {
+            text: 'id',
+            dataIndex: 'pi_id',
+            hidden: true
+        }, {
+            text: '单据编号',
+            dataIndex: 'sl_code',
+            width: 150
+        }, {
+            text: '单据类型',
+            dataIndex: 'sl_kind',
+            width: 110
+        }, {
+            text: '单据日期',
+            dataIndex: 'date',
+            xtype:'datecolumn',
+            width: 110
+        },{
+            text:'供应商名称',
+            dataIndex:'ve_name',
+            width: 200
+        },{
+            text:'客户名称',
+            dataIndex:'cu_name',
+            width: 200
+        },{
+            text:'核销单号',
+            dataIndex:'pb_code',
+            width: 200
+        },{
+            text: '本期核销金额',
+            dataIndex: 'sl_amount',
+            xtype: 'numbercolumn',
+            width: 130,
+            // renderer : function(v) {
+            //     var arr = (v + '.').split('.');
+            //     var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
+            //     var format = '0.' + xr.join();
+            //     return Ext.util.Format.number(v, format);
+            // },
+            // summaryType: 'sum',
+            // summaryRenderer: function(v) {
+            //     var arr = (v + '.').split('.');
+            //     var xr = (new Array(arr[1].length > 3 ? 3 : arr[1].length)).fill('0');
+            //     var format = '0.' + xr.join();
+            //     return Ext.util.Format.number(v, format);
+            // }
+        },{
+            text: '总金额',
+            dataIndex: 'total',
+            xtype: 'numbercolumn',
+            width: 110,
+            // renderer : function(v) {
+            //     var arr = (v + '.').split('.');
+            //     var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
+            //     var format = '0,000.' + xr.join();
+            //     return Ext.util.Format.number(v, format);
+            // },
+            // summaryType: 'sum',
+            // summaryRenderer: function(v) {
+            //     var arr = (v + '.').split('.');
+            //     var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
+            //     var format = '0,000.' + xr.join();
+            //     return Ext.util.Format.number(v, format);
+            // }
+        }]
+});

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

@@ -0,0 +1,28 @@
+Ext.define('saas.view.money.report.AccountDetailsController', {
+    extend: 'saas.view.core.report.ReportPanelController',
+    alias: 'controller.money-report-accountdetails',
+    init: function (form) {
+        this.control({
+            // 供应商编号
+            'dbfindtrigger[name=ve_name]':{
+                beforerender:function(f){
+                    Ext.apply(f,{
+                        dbfinds:[{
+                            from:'ve_name',to:'ve_name'
+                        }],
+                    }) ;
+                }
+            },
+            // 客户编号
+            'dbfindtrigger[name=cu_name]':{
+                beforerender:function(f){
+                    Ext.apply(f,{
+                        dbfinds:[{
+                            from:'cu_name',to:'cu_name'
+                        }],
+                    }) ;
+                }
+            }
+        });
+    }
+});

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

@@ -0,0 +1,4 @@
+Ext.define('saas.view.money.report.AccountDetailsModel', {
+    extend: 'saas.view.core.report.ReportPanelModel',
+    alias: 'viewmodel.money-report-accountdetails'
+});

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

@@ -12,12 +12,14 @@ Ext.define('saas.view.money.report.CustomerCheckCheck', {
     defaultCondition: null,
     reportTitle: '客户对账单',
     QueryWidth:0.25,
+    autoLoad:false,
     //筛选：客户、日期（必填）
     searchItems: [ {
         xtype: 'customerDbfindTrigger',
         name: 'pi_custname',
         fieldLabel: '客户名称',
-        columnWidth: 0.25
+        columnWidth: 0.25,
+        allowBlank:false,
     }, {
         xtype: 'condatefield',
         name: 'pi_date',

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

@@ -80,7 +80,7 @@ Ext.define('saas.view.money.report.RecDetail', {
         },{
             text:'本期收款金额',
             xtype: 'numbercolumn',
-            dataIndex:'pb_pdamount',
+            dataIndex:'rb_rdamount',
             xtype: 'numbercolumn',
             width: 110,
             renderer : function(v) {

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

@@ -7,17 +7,19 @@ Ext.define('saas.view.money.report.VendorCheck', {
 
     viewName: 'money-report-vendorcheck',
 
-    groupField: 'pi_vendname',
+    // groupField: null,
     listUrl: '/api/money/report/vendorCheck',
     defaultCondition: null,
     reportTitle: '供应商对账单',
     QueryWidth:0.25,
+    autoLoad:false,
     //筛选：供应商、日期（必填）
     searchItems: [ {
         xtype: 'vendorDbfindTrigger',
         name: 'pi_vendname',
         fieldLabel: '供应商名称',
-        columnWidth: 0.25
+        columnWidth: 0.25,
+        allowBlank:false,
     }, {
         xtype: 'condatefield',
         name: 'pi_date',

frontend/saas-web/app/view/sale/saleIn/QueryPanelController.js

@@ -4,29 +4,12 @@ Ext.define('saas.view.sale.saleIn.QueryPanelController', {
     init: function (form) {
         var me = this;
         this.control({
-            // 客户名称
-            'dbfindtrigger[name=pi_custname]':{
-                beforerender:function(f){
-                    Ext.apply(f,{
-                        dbfinds:[
-                        {
-                            from:'id',to:'pi_custid',ignore:true
-                        },{
-                            from:'cu_code',to:'pi_custcode'
-                        },{
-                            from:'cu_name',to:'pi_custname'
-                        }],
-                    }) ;
-
-                }
-            },
-
             // 物料编号
-            'dbfindtrigger[name=pd_prodcode]':{
+            'dbfindtrigger[name=pr_detail]':{
                 beforerender:function(f){
                     Ext.apply(f,{
                         dbfinds:[{
-                            from:'pr_code',to:'pd_prodcode',ignore:true
+                            from:'pr_code',to:'pd_prodcode'
                         }, {
                             from:'pr_detail',to:'pr_detail'
                         }],
@@ -35,6 +18,5 @@ Ext.define('saas.view.sale.saleIn.QueryPanelController', {
                 }
             }
         });
-
     }
 });

frontend/saas-web/resources/json/navigation.json

@@ -187,7 +187,11 @@
             "text": "资金账户余额表",
             "id": "monry-report-accountbalance",
             "viewType":"monry-report-accountbalance"
-        }]
+        }, {
+                "text": "核销明细表",
+                "id": "monry-report-accountdetails",
+                "viewType":"monry-report-accountdetails"
+            }]
     }]
 }, {
     "text": "资料",

pom.xml

@@ -39,7 +39,7 @@
         <feign.form.version>3.0.3</feign.form.version>
         <commons.fileupload.version>1.3.3</commons.fileupload.version>
         <commons.compress.version>1.18</commons.compress.version>
-        <docker.repository>192.168.253.3:4000</docker.repository>
+        <docker.repository>192.168.0.63:4000</docker.repository>
         <docker.registry.name>saas</docker.registry.name>
         <guava.version>18.0</guava.version>
         <fastdfs.client.version>1.26.3</fastdfs.client.version>