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/controller/MoneyReportColltroller.java

@@ -21,9 +21,31 @@ public class MoneyReportColltroller {
     @Autowired
     private MoneyReportService moneyReportService;
 
+    //供应商对账
     @GetMapping("/vendorCheck")
     public Result vendorCheck(PageRequest page, ListReqDTO req) {
         PageInfo listData = moneyReportService.vendorCheck(page, req);
         return Result.success(listData);
     }
+
+    //应付账款明细
+    @GetMapping("/payDetail")
+    public Result payDetail(PageRequest page, ListReqDTO req) {
+        PageInfo listData = moneyReportService.payDetail(page, req);
+        return Result.success(listData);
+    }
+
+    //应收款明细表
+    @GetMapping("/recDetail")
+    public Result recDetail(PageRequest page, ListReqDTO req) {
+        PageInfo listData = moneyReportService.recDetail(page, req);
+        return Result.success(listData);
+    }
+
+    //资金账号余额表
+    @GetMapping("/accountBalance")
+    public Result acountBalance(PageRequest page, ListReqDTO req) {
+        PageInfo listData = moneyReportService.acountBalance(page, req);
+        return Result.success(listData);
+    }
 }

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

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

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

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

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

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

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

@@ -0,0 +1,134 @@
+package com.usoftchina.saas.money.po.forms;
+
+import java.util.Date;
+
+public class AcountbalanceView {
+    private String bankcode;
+
+    private String bankname;
+
+    private Integer bankid;
+
+    private Date date;
+
+    private String kind;
+
+    private Double outamount;
+
+    private Double inamount;
+
+    private Double thisamount;
+
+    private String bcode;
+
+    private String bname;
+
+    private String bmanname;
+
+    private String remark;
+    private Integer companyId;
+
+    public Integer getCompanyId() {
+        return companyId;
+    }
+
+    public void setCompanyId(Integer companyId) {
+        this.companyId = companyId;
+    }
+
+    public String getBankcode() {
+        return bankcode;
+    }
+
+    public void setBankcode(String bankcode) {
+        this.bankcode = bankcode == null ? null : bankcode.trim();
+    }
+
+    public String getBankname() {
+        return bankname;
+    }
+
+    public void setBankname(String bankname) {
+        this.bankname = bankname == null ? null : bankname.trim();
+    }
+
+    public Integer getBankid() {
+        return bankid;
+    }
+
+    public void setBankid(Integer bankid) {
+        this.bankid = bankid;
+    }
+
+    public Date getDate() {
+        return date;
+    }
+
+    public void setDate(Date date) {
+        this.date = date;
+    }
+
+    public String getKind() {
+        return kind;
+    }
+
+    public void setKind(String kind) {
+        this.kind = kind == null ? null : kind.trim();
+    }
+
+    public Double getOutamount() {
+        return outamount;
+    }
+
+    public void setOutamount(Double outamount) {
+        this.outamount = outamount;
+    }
+
+    public Double getInamount() {
+        return inamount;
+    }
+
+    public void setInamount(Double inamount) {
+        this.inamount = inamount;
+    }
+
+    public Double getThisamount() {
+        return thisamount;
+    }
+
+    public void setThisamount(Double thisamount) {
+        this.thisamount = thisamount;
+    }
+
+    public String getBcode() {
+        return bcode;
+    }
+
+    public void setBcode(String bcode) {
+        this.bcode = bcode == null ? null : bcode.trim();
+    }
+
+    public String getBname() {
+        return bname;
+    }
+
+    public void setBname(String bname) {
+        this.bname = bname == null ? null : bname.trim();
+    }
+
+    public String getBmanname() {
+        return bmanname;
+    }
+
+    public void setBmanname(String bmanname) {
+        this.bmanname = bmanname == null ? null : bmanname.trim();
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark == null ? null : remark.trim();
+    }
+}

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

@@ -0,0 +1,155 @@
+package com.usoftchina.saas.money.po.forms;
+
+import java.util.Date;
+
+public class PaydetailView {
+    private String pi_inoutno;
+
+    private String pi_vendcode;
+
+    private String pi_vendname;
+
+    private String pi_class;
+
+    private String PU_BUYERCODE;
+
+    private String PU_BUYERNAME;
+
+    private Date pb_date;
+
+    private Double ve_beginapamount;
+
+    private Double pb_pdamount;
+
+    private Double pb_pbdamount;
+
+    private Double mustpay;
+
+    private Long mustdate;
+
+    private Double pi_total;
+
+    private String pi_remark;
+
+    private Integer companyId;
+
+    public Integer getCompanyId() {
+        return companyId;
+    }
+
+    public void setCompanyId(Integer companyId) {
+        this.companyId = companyId;
+    }
+
+    public String getPi_inoutno() {
+        return pi_inoutno;
+    }
+
+    public void setPi_inoutno(String pi_inoutno) {
+        this.pi_inoutno = pi_inoutno == null ? null : pi_inoutno.trim();
+    }
+
+    public String getPi_vendcode() {
+        return pi_vendcode;
+    }
+
+    public void setPi_vendcode(String pi_vendcode) {
+        this.pi_vendcode = pi_vendcode == null ? null : pi_vendcode.trim();
+    }
+
+    public String getPi_vendname() {
+        return pi_vendname;
+    }
+
+    public void setPi_vendname(String pi_vendname) {
+        this.pi_vendname = pi_vendname == null ? null : pi_vendname.trim();
+    }
+
+    public String getPi_class() {
+        return pi_class;
+    }
+
+    public void setPi_class(String pi_class) {
+        this.pi_class = pi_class == null ? null : pi_class.trim();
+    }
+
+    public String getPU_BUYERCODE() {
+        return PU_BUYERCODE;
+    }
+
+    public void setPU_BUYERCODE(String PU_BUYERCODE) {
+        this.PU_BUYERCODE = PU_BUYERCODE == null ? null : PU_BUYERCODE.trim();
+    }
+
+    public String getPU_BUYERNAME() {
+        return PU_BUYERNAME;
+    }
+
+    public void setPU_BUYERNAME(String PU_BUYERNAME) {
+        this.PU_BUYERNAME = PU_BUYERNAME == null ? null : PU_BUYERNAME.trim();
+    }
+
+    public Date getPb_date() {
+        return pb_date;
+    }
+
+    public void setPb_date(Date pb_date) {
+        this.pb_date = pb_date;
+    }
+
+    public Double getVe_beginapamount() {
+        return ve_beginapamount;
+    }
+
+    public void setVe_beginapamount(Double ve_beginapamount) {
+        this.ve_beginapamount = ve_beginapamount;
+    }
+
+    public Double getPb_pdamount() {
+        return pb_pdamount;
+    }
+
+    public void setPb_pdamount(Double pb_pdamount) {
+        this.pb_pdamount = pb_pdamount;
+    }
+
+    public Double getPb_pbdamount() {
+        return pb_pbdamount;
+    }
+
+    public void setPb_pbdamount(Double pb_pbdamount) {
+        this.pb_pbdamount = pb_pbdamount;
+    }
+
+    public Double getMustpay() {
+        return mustpay;
+    }
+
+    public void setMustpay(Double mustpay) {
+        this.mustpay = mustpay;
+    }
+
+    public Long getMustdate() {
+        return mustdate;
+    }
+
+    public void setMustdate(Long mustdate) {
+        this.mustdate = mustdate;
+    }
+
+    public Double getPi_total() {
+        return pi_total;
+    }
+
+    public void setPi_total(Double pi_total) {
+        this.pi_total = pi_total;
+    }
+
+    public String getPi_remark() {
+        return pi_remark;
+    }
+
+    public void setPi_remark(String pi_remark) {
+        this.pi_remark = pi_remark == null ? null : pi_remark.trim();
+    }
+}

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

@@ -0,0 +1,154 @@
+package com.usoftchina.saas.money.po.forms;
+
+import java.util.Date;
+
+public class RecdetailView {
+    private String pi_inoutno;
+
+    private String pi_custcode;
+
+    private String pi_custname;
+
+    private String pi_class;
+
+    private String PU_BUYERCODE;
+
+    private String PU_BUYERNAME;
+
+    private Date pb_date;
+
+    private Double cu_beginaramount;
+
+    private Double pb_pdamount;
+
+    private Double pb_pbdamount;
+
+    private Double mustpay;
+
+    private Double mustdate;
+
+    private Double pi_total;
+
+    private String pi_remark;
+    private Integer companyId;
+
+    public Integer getCompanyId() {
+        return companyId;
+    }
+
+    public void setCompanyId(Integer companyId) {
+        this.companyId = companyId;
+    }
+
+    public String getPi_inoutno() {
+        return pi_inoutno;
+    }
+
+    public void setPi_inoutno(String pi_inoutno) {
+        this.pi_inoutno = pi_inoutno == null ? null : pi_inoutno.trim();
+    }
+
+    public String getPi_custcode() {
+        return pi_custcode;
+    }
+
+    public void setPi_custcode(String pi_custcode) {
+        this.pi_custcode = pi_custcode == null ? null : pi_custcode.trim();
+    }
+
+    public String getPi_custname() {
+        return pi_custname;
+    }
+
+    public void setPi_custname(String pi_custname) {
+        this.pi_custname = pi_custname == null ? null : pi_custname.trim();
+    }
+
+    public String getPi_class() {
+        return pi_class;
+    }
+
+    public void setPi_class(String pi_class) {
+        this.pi_class = pi_class == null ? null : pi_class.trim();
+    }
+
+    public String getPU_BUYERCODE() {
+        return PU_BUYERCODE;
+    }
+
+    public void setPU_BUYERCODE(String PU_BUYERCODE) {
+        this.PU_BUYERCODE = PU_BUYERCODE == null ? null : PU_BUYERCODE.trim();
+    }
+
+    public String getPU_BUYERNAME() {
+        return PU_BUYERNAME;
+    }
+
+    public void setPU_BUYERNAME(String PU_BUYERNAME) {
+        this.PU_BUYERNAME = PU_BUYERNAME == null ? null : PU_BUYERNAME.trim();
+    }
+
+    public Date getPb_date() {
+        return pb_date;
+    }
+
+    public void setPb_date(Date pb_date) {
+        this.pb_date = pb_date;
+    }
+
+    public Double getCu_beginaramount() {
+        return cu_beginaramount;
+    }
+
+    public void setCu_beginaramount(Double cu_beginaramount) {
+        this.cu_beginaramount = cu_beginaramount;
+    }
+
+    public Double getPb_pdamount() {
+        return pb_pdamount;
+    }
+
+    public void setPb_pdamount(Double pb_pdamount) {
+        this.pb_pdamount = pb_pdamount;
+    }
+
+    public Double getPb_pbdamount() {
+        return pb_pbdamount;
+    }
+
+    public void setPb_pbdamount(Double pb_pbdamount) {
+        this.pb_pbdamount = pb_pbdamount;
+    }
+
+    public Double getMustpay() {
+        return mustpay;
+    }
+
+    public void setMustpay(Double mustpay) {
+        this.mustpay = mustpay;
+    }
+
+    public Double getMustdate() {
+        return mustdate;
+    }
+
+    public void setMustdate(Double mustdate) {
+        this.mustdate = mustdate;
+    }
+
+    public Double getPi_total() {
+        return pi_total;
+    }
+
+    public void setPi_total(Double pi_total) {
+        this.pi_total = pi_total;
+    }
+
+    public String getPi_remark() {
+        return pi_remark;
+    }
+
+    public void setPi_remark(String pi_remark) {
+        this.pi_remark = pi_remark == null ? null : pi_remark.trim();
+    }
+}

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

@@ -10,4 +10,7 @@ import com.usoftchina.saas.page.PageRequest;
  **/
 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);
 }

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

@@ -4,7 +4,11 @@ import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.usoftchina.saas.commons.dto.ListReqDTO;
 import com.usoftchina.saas.context.BaseContextHolder;
+import com.usoftchina.saas.money.mapper.forms.AcountbalanceViewMapper;
+import com.usoftchina.saas.money.mapper.forms.PaydetailViewMapper;
+import com.usoftchina.saas.money.mapper.forms.RecdetailViewMapper;
 import com.usoftchina.saas.money.mapper.forms.VendorAcountViewMapper;
+import com.usoftchina.saas.money.po.forms.AcountbalanceView;
 import com.usoftchina.saas.money.service.MoneyReportService;
 import com.usoftchina.saas.page.PageRequest;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -20,12 +24,33 @@ import java.util.List;
 public class MoneyReportServiceImpl implements MoneyReportService {
     @Autowired
     private VendorAcountViewMapper vendorAcountViewMapper;
+    @Autowired
+    private PaydetailViewMapper paydetailViewMapper;
+    @Autowired
+    private RecdetailViewMapper recdetailViewMapper;
+    @Autowired
+    private AcountbalanceViewMapper acountbalanceViewMapper;
 
     @Override
     public PageInfo vendorCheck(PageRequest page, ListReqDTO req) {
         return getListDATA(page, req, "Supplier");
     }
 
+    @Override
+    public PageInfo payDetail(PageRequest page, ListReqDTO req) {
+        return getListDATA(page, req, "payDetail");
+    }
+
+    @Override
+    public PageInfo recDetail(PageRequest page, ListReqDTO req) {
+        return getListDATA(page, req, "recDetail");
+    }
+
+    @Override
+    public PageInfo acountBalance(PageRequest page, ListReqDTO req) {
+        return getListDATA(page, req, "acountBalance");
+    }
+
     private PageInfo getListDATA(PageRequest page, ListReqDTO req, String type) {
         //设置默认分页
         if (null == page || page.getSize() == 0 || page.getNumber() == 0) {
@@ -52,10 +77,13 @@ public class MoneyReportServiceImpl implements MoneyReportService {
         }
         if ("Supplier".equals(type)) {
             list = vendorAcountViewMapper.selectByCondition(con, companyId);
+        } else if("payDetail".equals(type)){
+            list = paydetailViewMapper.selectByCondition(con, companyId);
+        }else if("recDetail".equals(type)){
+            list = recdetailViewMapper.selectByCondition(con, companyId);
+        }else if ("acountBalance".equals(type)){
+            list = acountbalanceViewMapper.selectByCondition(con, companyId);
         }
-//        } else if ("SaleRec".equals(type)){
-//            list = salerecViewMapper.selectByCondition(con, companyId);
-//        }
         return list;
     }
 }

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

@@ -70,9 +70,7 @@
       <if test="ft_recorder != null" >
         ft_recorder,
       </if>
-      <if test="ft_recorddate != null" >
         ft_recorddate,
-      </if>
       <if test="ft_status != null" >
         ft_status,
       </if>
@@ -117,9 +115,7 @@
       <if test="ft_recorder != null" >
         #{ft_recorder,jdbcType=VARCHAR},
       </if>
-      <if test="ft_recorddate != null" >
-        #{ft_recorddate,jdbcType=TIMESTAMP},
-      </if>
+        now(),
       <if test="ft_status != null" >
         #{ft_status,jdbcType=VARCHAR},
       </if>
@@ -188,7 +184,6 @@
       <if test="updaterId != null" >
         updaterId = #{updaterId,jdbcType=INTEGER},
       </if>
-      updatedate = now(),
       <if test="ft_text1 != null" >
         ft_text1 = #{ft_text1,jdbcType=VARCHAR},
       </if>

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

@@ -106,9 +106,7 @@
       <if test="or_recorder != null" >
         or_recorder,
       </if>
-      <if test="or_recorddate != null" >
         or_recorddate,
-      </if>
       <if test="or_status != null" >
         or_status,
       </if>
@@ -124,9 +122,6 @@
       <if test="updaterId != null" >
         updaterId,
       </if>
-      <if test="updatedate != null" >
-        updatedate,
-      </if>
       <if test="or_text1 != null" >
         or_text1,
       </if>
@@ -177,9 +172,7 @@
       <if test="or_recorder != null" >
         #{or_recorder,jdbcType=VARCHAR},
       </if>
-      <if test="or_recorddate != null" >
-        #{or_recorddate,jdbcType=TIMESTAMP},
-      </if>
+      now(),
       <if test="or_status != null" >
         #{or_status,jdbcType=VARCHAR},
       </if>
@@ -195,9 +188,6 @@
       <if test="updaterId != null" >
         #{updaterId,jdbcType=INTEGER},
       </if>
-      <if test="updatedate != null" >
-        #{updatedate,jdbcType=TIMESTAMP},
-      </if>
       <if test="or_text1 != null" >
         #{or_text1,jdbcType=VARCHAR},
       </if>
@@ -272,7 +262,6 @@
       <if test="updaterId != null" >
         updaterId = #{updaterId,jdbcType=INTEGER},
       </if>
-      updatedate = now(),
       <if test="or_text1 != null" >
         or_text1 = #{or_text1,jdbcType=VARCHAR},
       </if>

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

@@ -100,9 +100,7 @@
       <if test="os_recorder != null" >
         os_recorder,
       </if>
-      <if test="os_recorddate != null" >
         os_recorddate,
-      </if>
       <if test="os_status != null" >
         os_status,
       </if>
@@ -118,9 +116,6 @@
       <if test="updaterId != null" >
         updaterId,
       </if>
-      <if test="updatedate != null" >
-        updatedate,
-      </if>
       <if test="os_text1 != null" >
         os_text1,
       </if>
@@ -165,9 +160,7 @@
       <if test="os_amount != null" >
         #{os_amount,jdbcType=DOUBLE},
       </if>
-      <if test="os_recorderid != null" >
-        #{os_recorderid,jdbcType=INTEGER},
-      </if>
+      now(),
       <if test="os_recorder != null" >
         #{os_recorder,jdbcType=VARCHAR},
       </if>
@@ -189,9 +182,6 @@
       <if test="updaterId != null" >
         #{updaterId,jdbcType=INTEGER},
       </if>
-      <if test="updatedate != null" >
-        #{updatedate,jdbcType=TIMESTAMP},
-      </if>
       <if test="os_text1 != null" >
         #{os_text1,jdbcType=VARCHAR},
       </if>

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

@@ -183,9 +183,7 @@
       <if test="pb_recorder != null">
         pb_recorder,
       </if>
-      <if test="pb_recorddate != null">
         pb_recorddate,
-      </if>
       <if test="pb_status != null">
         pb_status,
       </if>
@@ -201,9 +199,6 @@
       <if test="updaterId != null">
         updaterId,
       </if>
-      <if test="updatedate != null">
-        updatedate,
-      </if>
       <if test="pb_text1 != null">
         pb_text1,
       </if>
@@ -263,9 +258,7 @@
       <if test="pb_recorder != null">
         #{pb_recorder,jdbcType=VARCHAR},
       </if>
-      <if test="pb_recorddate != null">
-        #{pb_recorddate,jdbcType=TIMESTAMP},
-      </if>
+      now(),
       <if test="pb_status != null">
         #{pb_status,jdbcType=INTEGER},
       </if>
@@ -281,9 +274,6 @@
       <if test="updaterId != null">
         #{updaterId,jdbcType=INTEGER},
       </if>
-      <if test="updatedate != null">
-        #{updatedate,jdbcType=TIMESTAMP},
-      </if>
       <if test="pb_text1 != null">
         #{pb_text1,jdbcType=VARCHAR},
       </if>
@@ -374,7 +364,6 @@
       <if test="updaterId != null">
         updaterId = #{updaterId,jdbcType=INTEGER},
       </if>
-      updatedate = now(),
       <if test="pb_text1 != null">
         pb_text1 = #{pb_text1,jdbcType=VARCHAR},
       </if>

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

@@ -23,7 +23,7 @@
     <result column="rb_remark" jdbcType="VARCHAR" property="rb_remark" />
     <result column="companyId" jdbcType="INTEGER" property="companyId" />
     <result column="updaterId" jdbcType="INTEGER" property="updaterId" />
-    <result column="updatedate" jdbcType="TIMESTAMP" property="updateTime" />
+    <result column="updatedate" jdbcType="TIMESTAMP" property="updatedate" />
     <result column="rb_text1" jdbcType="VARCHAR" property="rb_text1" />
     <result column="rb_text2" jdbcType="VARCHAR" property="rb_text2" />
     <result column="rb_text3" jdbcType="VARCHAR" property="rb_text3" />
@@ -224,9 +224,7 @@
       <if test="rb_recorder != null">
         rb_recorder,
       </if>
-      <if test="rb_recorddate != null">
         rb_recorddate,
-      </if>
       <if test="rb_status != null">
         rb_status,
       </if>
@@ -242,9 +240,6 @@
       <if test="updaterId != null">
         updaterId,
       </if>
-      <if test="updateTime != null">
-        updateTime,
-      </if>
       <if test="rb_text1 != null">
         rb_text1,
       </if>
@@ -304,9 +299,7 @@
       <if test="rb_recorder != null">
         #{rb_recorder,jdbcType=VARCHAR},
       </if>
-      <if test="rb_recorddate != null">
-        #{rb_recorddate,jdbcType=TIMESTAMP},
-      </if>
+      now(),
       <if test="rb_status != null">
         #{rb_status,jdbcType=INTEGER},
       </if>
@@ -322,9 +315,6 @@
       <if test="updaterId != null">
         #{updaterId,jdbcType=INTEGER},
       </if>
-      <if test="updateTime != null">
-        #{updateTime,jdbcType=TIMESTAMP},
-      </if>
       <if test="rb_text1 != null">
         #{rb_text1,jdbcType=VARCHAR},
       </if>
@@ -536,7 +526,6 @@
       <if test="updaterId != null">
         updaterId = #{updaterId,jdbcType=INTEGER},
       </if>
-      updatedate = now(),
       <if test="rb_text1 != null">
         rb_text1 = #{rb_text1,jdbcType=VARCHAR},
       </if>

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

@@ -0,0 +1,33 @@
+<?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.AcountbalanceViewMapper" >
+  <resultMap id="BaseResultMap" type="com.usoftchina.saas.money.po.AcountbalanceView" >
+    <result column="bankcode" property="bankcode" jdbcType="VARCHAR" />
+    <result column="bankname" property="bankname" jdbcType="VARCHAR" />
+    <result column="bankid" property="bankid" jdbcType="INTEGER" />
+    <result column="date" property="date" jdbcType="TIMESTAMP" />
+    <result column="kind" property="kind" jdbcType="VARCHAR" />
+    <result column="outamount" property="outamount" jdbcType="DOUBLE" />
+    <result column="inamount" property="inamount" jdbcType="DOUBLE" />
+    <result column="thisamount" property="thisamount" jdbcType="DOUBLE" />
+    <result column="bcode" property="bcode" jdbcType="VARCHAR" />
+    <result column="bname" property="bname" jdbcType="VARCHAR" />
+    <result column="bmanname" property="bmanname" jdbcType="VARCHAR" />
+    <result column="remark" property="remark" jdbcType="VARCHAR" />
+    <result column="companyId" property="companyId" jdbcType="INTEGER" />
+  </resultMap>
+
+  <select id="selectByCondition" resultMap="BaseResultMap">
+    select  *  from acountbalance_view
+    <where>
+      <if test="con != null">
+        ${con}
+      </if>
+      <if test="companyId != null">
+        and  companyId = #{companyId}
+      </if>
+    </where>
+    order by date desc
+  </select>
+
+</mapper>

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

@@ -0,0 +1,35 @@
+<?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.PaydetailViewMapper" >
+  <resultMap id="BaseResultMap" type="com.usoftchina.saas.money.po.PaydetailView" >
+    <result column="pi_inoutno" property="pi_inoutno" jdbcType="VARCHAR" />
+    <result column="pi_vendcode" property="pi_vendcode" jdbcType="VARCHAR" />
+    <result column="pi_vendname" property="pi_vendname" jdbcType="VARCHAR" />
+    <result column="pi_class" property="pi_class" jdbcType="VARCHAR" />
+    <result column="PU_BUYERCODE" property="PU_BUYERCODE" jdbcType="VARCHAR" />
+    <result column="PU_BUYERNAME" property="PU_BUYERNAME" jdbcType="VARCHAR" />
+    <result column="pb_date" property="pb_date" jdbcType="TIMESTAMP" />
+    <result column="ve_beginapamount" property="ve_beginapamount" jdbcType="DOUBLE" />
+    <result column="pb_pdamount" property="pb_pdamount" jdbcType="DOUBLE" />
+    <result column="pb_pbdamount" property="pb_pbdamount" jdbcType="DOUBLE" />
+    <result column="mustpay" property="mustpay" jdbcType="DOUBLE" />
+    <result column="mustdate" property="mustdate" jdbcType="DECIMAL" />
+    <result column="pi_total" property="pi_total" jdbcType="DOUBLE" />
+    <result column="pi_remark" property="pi_remark" jdbcType="VARCHAR" />
+    <result column="companyId" property="companyId" jdbcType="INTEGER" />
+  </resultMap>
+
+  <select id="selectByCondition" resultMap="BaseResultMap">
+    select  *  from paydetail_view
+    <where>
+      <if test="con != null">
+        ${con}
+      </if>
+      <if test="companyId != null">
+        and  companyId = #{companyId}
+      </if>
+    </where>
+    order by pb_date desc
+  </select>
+
+</mapper>

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

@@ -0,0 +1,34 @@
+<?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.RecdetailViewMapper" >
+  <resultMap id="BaseResultMap" type="com.usoftchina.saas.money.po.RecdetailView" >
+    <result column="pi_inoutno" property="pi_inoutno" jdbcType="VARCHAR" />
+    <result column="pi_custcode" property="pi_custcode" jdbcType="VARCHAR" />
+    <result column="pi_custname" property="pi_custname" jdbcType="VARCHAR" />
+    <result column="pi_class" property="pi_class" jdbcType="VARCHAR" />
+    <result column="PU_BUYERCODE" property="PU_BUYERCODE" jdbcType="VARCHAR" />
+    <result column="PU_BUYERNAME" property="PU_BUYERNAME" jdbcType="VARCHAR" />
+    <result column="pb_date" property="pb_date" jdbcType="TIMESTAMP" />
+    <result column="cu_beginaramount" property="cu_beginaramount" jdbcType="DOUBLE" />
+    <result column="pb_pdamount" property="pb_pdamount" jdbcType="DOUBLE" />
+    <result column="pb_pbdamount" property="pb_pbdamount" jdbcType="DOUBLE" />
+    <result column="mustpay" property="mustpay" jdbcType="DOUBLE" />
+    <result column="mustdate" property="mustdate" jdbcType="DOUBLE" />
+    <result column="pi_total" property="pi_total" jdbcType="DOUBLE" />
+    <result column="pi_remark" property="pi_remark" jdbcType="VARCHAR" />
+  <result column="companyId" property="companyId" jdbcType="INTEGER" />
+  </resultMap>
+
+  <select id="selectByCondition" resultMap="BaseResultMap">
+    select  *  from recdetail_view
+    <where>
+      <if test="con != null">
+        ${con}
+      </if>
+      <if test="companyId != null">
+        and  companyId = #{companyId}
+      </if>
+    </where>
+    order by pb_date desc
+  </select>
+</mapper>

frontend/saas-web/app/Application.scss

@@ -83,12 +83,13 @@ body.launching {
 .x-form-text-default,
 .x-column-header,
 .x-grid-item,
-.x-grid-row-summary .x-grid-cell, .x-grid-row-summary .x-grid-rowwrap, .x-grid-row-summary .x-grid-cell-rowbody {
-  font-family: 'pingFangSC-Regular';
+.x-grid-row-summary .x-grid-cell, .x-grid-row-summary .x-grid-rowwrap, .x-grid-row-summary .x-grid-cell-rowbody,
+.x-boundlist-item {
+  // font-family: 'pingFangSC-Regular';
 }
 
 .x-form-item-label-default {
-  font-family: PingFangSC-Medium;
+  // font-family: PingFangSC-Medium;
   font-size: 14px;
   color: #505363;
   text-align: right;
@@ -133,6 +134,10 @@ body.launching {
 .x-keyboard-mode .x-btn-focus.x-btn-default-toolbar-small {
   background: #34BAF6;
   opacity: 0.72;
+  box-shadow: none;
+}
+.x-keyboard-mode .x-btn-focus.x-btn-over.x-btn-default-toolbar-small {
+  box-shadow: none;
 }
 
 .x-btn-wrap-default-toolbar-small.x-btn-arrow-right:after {
@@ -187,7 +192,7 @@ body.launching {
   letter-spacing: 0;
   text-align: center;
   line-height: 20px;
-  font-family: PingFangSC-Medium;
+  // font-family: PingFangSC-Medium;
   font-weight: normal;
 }
 

frontend/saas-web/app/util/FormUtil.js

@@ -170,6 +170,7 @@ Ext.define('saas.util.FormUtil', {
             me.loadData(form);
         })
         .catch(function(response) {
+            showToast('错误：' + response.message);
             console.error(response);
         });
 
@@ -226,10 +227,9 @@ Ext.define('saas.util.FormUtil', {
                         var o = {};
                         o[form._codeField] = code;
 
-                        var formData = {
-                            main: o
-                        };
-                        Ext.Array.each(detailGrids, function(grid, index) {
+                        var formData = form.initData || {main: {}};
+                        Ext.apply(formData.main, o);
+                        form.initData || Ext.Array.each(detailGrids, function(grid, index) {
                             var detno = 0;
                             var detnoColumn = grid.detnoColumn;
                             var datas = [];

frontend/saas-web/app/view/core/form/FormPanel.js

@@ -63,6 +63,13 @@ Ext.define('saas.view.core.form.FormPanel', {
                 hidden: '{!id}'
             },
             handler: 'add'
+        }, {
+            xtype: 'button',
+            text: '复制',
+            handler: 'onCopy',
+            bind: {
+                hidden: '{!'+ me._idField + '}',
+            }
         }, {
             xtype: 'button',
             text: '保存',

frontend/saas-web/app/view/core/form/FormPanel.scss

@@ -1,11 +1,14 @@
 .x-core-form {
-    padding: 10px;
+    padding: 24px;
 
     .x-tb {
         color: #A2A2A2;
         letter-spacing: 0.72px;
         text-align: left;
-        font: 400 18px/16px 'PingFangSC-Regular';
+        font-size: 18px;
+        line-height: 16px;
+        font-weight: 400;
+        // font: 400 18px/16px 'PingFangSC-Regular';
     }
     .x-codeeditor {
         top: -2px !important;
@@ -22,7 +25,10 @@
                 letter-spacing: 0.72px;
                 font-size: 18px;
                 min-height: inherit;
-                font: 400 18px/16px 'PingFangSC-Regular';
+                font-size: 18px;
+                line-height: 16px;
+                font-weight: 400;
+                // font: 400 18px/16px 'PingFangSC-Regular';
             }
         }
     }

frontend/saas-web/app/view/core/form/FormPanelController.js

@@ -20,6 +20,53 @@ Ext.define('saas.view.core.form.FormPanelController', {
         var id = form.xtype + '-add';
         openTab(form.xtype,'新增' + form._title, id);
     },
+
+    onCopy: function() {
+        var me = this;
+        var form = this.getView();
+        var id = form.xtype + '-add';
+
+        var formData = me.initCopyData(form.getFormData());
+
+        openTab(form.xtype,'新增' + form._title, id, {initData: formData});
+    },
+
+    initCopyData: function(formData) {
+        var form = this.getView();
+        var detailCount = form.detailCount;
+        var main = formData.main;
+        var auditTexts = form.auditTexts;
+
+        // 单号、id清空
+        main[form._idField] = 0;
+        main[form._codeField] = '';
+        // 单据状态为录入状态（未审核）
+        main[form._statusCodeField] = auditTexts.unAuditCode;
+        main[form._statusField] = auditTexts.unAuditText;
+
+        for(var k in main) {
+            // 主表日期改为当前日期
+            if(isDateString(main[k])) {
+                main[k] = Ext.Date.format(new Date, 'Y-m-d H:i:s');
+            }
+        }
+
+        for(var j = 0; j < detailCount; j++) {
+            var detail = formData['detail' + j];
+            for(var x = 0; x < detail.length; x ++) {
+                var d = detail[x];
+
+                for(var k in d) {
+                    // 从表日期清空
+                    if(isDateString(main[k])) {
+                        main[k] = '';
+                    }
+                }
+            }
+        }
+
+        return formData;
+    },
     
     delete: function(){
         var me = this;

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

@@ -10,7 +10,7 @@ Ext.define('saas.view.document.bom.FormPanel', {
     //字段属性
     _title:'BOM资料',
     _idField: 'id',
-    _codeField: 'codefield',
+    _codeField: 'bo_mothercode',
     _statusField: 'bo_status',
     _statusCodeField: 'bo_statuscode',
     _readUrl:'/api/document/bom/read/',

frontend/saas-web/app/view/document/kind/ChildForm.js

@@ -96,14 +96,17 @@ Ext.define('KitchenSink.view.binding.ChildForm', {
                 mouseWheelEnabled: false,
                 minValue: 0
             },{
-                xtype:'textfield',
+                xtype:'combo',
                 name:'bk_type',
                 allowBlank:false,
                 fieldLabel:'账户类别',
+                store: [
+                    '现金',
+                    '银行'
+                ]
             },{
                 xtype:'datefield',
                 name:'bk_date',
-                readOnly:true,
                 fieldLabel:'建账日期',
                 format:'Y-m-d H:i:s',
                 listeners:{
@@ -111,6 +114,11 @@ Ext.define('KitchenSink.view.binding.ChildForm', {
                         d.setValue(new Date())
                     }
                 }
+            }, {
+                xtype:'textfield',
+                name:'bk_remark',
+                allowBlank:true,
+                fieldLabel:'备注',
             }]
         },
         productbrand:{

frontend/saas-web/app/view/document/kind/Kind.js

@@ -143,7 +143,7 @@ Ext.define('saas.view.document.kind.Kind', {
             },{
                 text: '账户类别',
                 dataIndex: 'bk_type',
-                flex: 1
+                flex: 1,
             },{
                 text: '账户期初金额',
                 dataIndex: 'bk_beginamount',
@@ -152,6 +152,10 @@ Ext.define('saas.view.document.kind.Kind', {
                 text: '账户期末余额',
                 dataIndex: 'bk_thisamount',
                 flex: 1
+            }, {
+                text: '备注',
+                dataIndex: 'bk_remark',
+                flex: 1
             }],
             keyField:'id',
             reqUrl: '/api/document/bankinformation/save',

frontend/saas-web/app/view/main/Main.scss

@@ -72,7 +72,7 @@ $treelist-nav-ui: (
         }
 
         .logo-text {
-            font-family: 'pingFangSC-Regular';
+            // font-family: 'pingFangSC-Regular';
             font-size: 18px;
             color: #FFFFFF;
             text-align: left;

frontend/saas-web/app/view/purchase/purchase/FormPanel.js

@@ -70,7 +70,7 @@ Ext.define('saas.view.purchase.purchase.FormPanel', {
         name : "pu_shipaddresscode", 
         fieldLabel : "交货地址", 
         allowBlank : false, 
-        columnWidth : 0.25,
+        columnWidth : 0.5,
         hiddenBtn:false,//true 则会关闭新增按钮功能
         addHandler:function(b){
             var document = Ext.create('saas.view.document.kind.Kind',{});

frontend/saas-web/app/view/purchase/purchaseIn/FormPanel.js

@@ -329,6 +329,11 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanel', {
                 }
             }
         ]
+    },{
+        xtype : "textfield", 
+        name : "pi_remark", 
+        fieldLabel : "备注", 
+        columnWidth : 1
     },{
         xtype : "textfield", 
         name : "pi_recordman", 

frontend/saas-web/app/view/purchase/purchaseOut/FormPanel.js

@@ -308,6 +308,11 @@ Ext.define('saas.view.purchase.purchaseOut.FormPanel', {
                 }
             }
         ]
+    },{
+        xtype : "textfield", 
+        name : "pi_remark", 
+        fieldLabel : "备注", 
+        columnWidth : 1
     }, {
         xtype : "textfield", 
         name : "pi_recordman", 

frontend/saas-web/overrides/i18n.js

@@ -25,23 +25,6 @@ function openTab(xtype, title, id, config) {
     }
 }
 
-/**
- * 显示toast提示
- * @param content: 内容
- * @param title: 标题
- * 
- */
-function showToast(content, title) {
-    Ext.toast({
-        html: content,
-        title: title,
-        closable: false,
-        align: 't',
-        slideDUration: 400,
-        maxWidth: 400
-    });
-}
-
 /**
  * 重设tab标题
  */
@@ -61,6 +44,29 @@ function getCurrentTab() {
     return currentTab;
 }
 
+/**
+ * 显示toast提示（无需用户操作）
+ * @param content: 内容
+ * @param title: 标题
+ * 
+ */
+function showToast(content, title) {
+    Ext.toast({
+        html: content,
+        title: title,
+        closable: false,
+        align: 't',
+        slideDUration: 400,
+        maxWidth: 400
+    });
+}
+
+/**
+ * 显示警告（需要选择是、否）
+ * @param title: 标题
+ * @param message: 内容
+ * @return : Promise
+ */
 function showConfirm(title, message) {
     return new Ext.Promise(function (resolve, reject) {
         Ext.MessageBox.confirm(title, message, function(buttonId) {
@@ -88,4 +94,15 @@ function deleteWarn(msg, fn){
          fn: fn,
          renderTo: Ext.getCmp('main-tab-panel').getActiveTab().getEl()
 	});
+}
+
+/**
+ * 判断字符串是否日期字符串
+ * 需要满足格式 yyyy-MM-dd hh:mm:ss
+ * 或者yyyy-M-d h:m:s
+ * @param str: 字符串
+ * @returns Boolean
+ */
+function isDateString(str) {
+    return (/^(\d{4})-(\d{1,2})-(\d{1,2}) (\d{1,2}):(\d{1,2}):(\d{1,2})$/).test(str);
 }