对账单、客户采购单增加字段

applications/commons/commons-dto/src/main/java/com/usoftchina/saas/commons/po/Status.java

@@ -90,6 +90,22 @@ public enum Status {
      */
     PAYPART("部分付款"),
 
+    /**
+     * 未确认
+     */
+    UNCONFIRM("未确认"),
+
+    /**
+     * 确认
+     */
+    CONFIRMED("确认"),
+
+    /**
+     * 确认
+     */
+    REJECT("不同意"),
+
+
     /**
      * 已付款
      */

applications/money/money-dto/src/main/java/com/usoftchina/saas/money/po/ApcheckDetail.java

@@ -26,6 +26,36 @@ public class ApcheckDetail extends CommonBaseEntity{
 
     private Double ad_b2bqty;
 
+    private String pr_detail;
+
+    private String pr_spec;
+
+    private String pr_orispeccode;
+
+    public String getPr_detail() {
+        return pr_detail;
+    }
+
+    public void setPr_detail(String pr_detail) {
+        this.pr_detail = pr_detail;
+    }
+
+    public String getPr_spec() {
+        return pr_spec;
+    }
+
+    public void setPr_spec(String pr_spec) {
+        this.pr_spec = pr_spec;
+    }
+
+    public String getPr_orispeccode() {
+        return pr_orispeccode;
+    }
+
+    public void setPr_orispeccode(String pr_orispeccode) {
+        this.pr_orispeccode = pr_orispeccode;
+    }
+
     public Long getAd_acid() {
         return ad_acid;
     }

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

@@ -50,6 +50,9 @@
     <result column="createTime" property="createTime" jdbcType="TIMESTAMP" />
     <result column="creatorId" property="creatorId" jdbcType="INTEGER" />
     <result column="creatorName" property="creatorName" jdbcType="VARCHAR" />
+    <result column="pr_detail" property="pr_detail" jdbcType="VARCHAR" />
+    <result column="creatorName" property="pr_spec" jdbcType="VARCHAR" />
+    <result column="pr_orispeccode" property="pr_orispeccode" jdbcType="VARCHAR" />
   </resultMap>
 
   <sql id="Base_Column_List" >
@@ -72,7 +75,8 @@
     order by ac_id desc
   </select>
   <select id="selectByFK" resultMap="detailMap" parameterType="long">
-    select * from apcheckdetail where ad_acid=#{id}
+    select * from apcheckdetail left join product on pr_code = ad_prodcode
+     and apcheckdetail.companyid=product.companyid where ad_acid=#{id}
   </select>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="long" >
     select 

applications/sale/sale-server/src/main/java/com/usoftchina/saas/sale/po/SaleDown.java

@@ -62,6 +62,26 @@ public class SaleDown extends CommonBaseEntity{
 
     private String sa_turnstatuscode;
 
+    private String sa_salecode;
+
+    private String sa_sendstatus;
+
+    public String getSa_salecode() {
+        return sa_salecode;
+    }
+
+    public void setSa_salecode(String sa_salecode) {
+        this.sa_salecode = sa_salecode;
+    }
+
+    public String getSa_sendstatus() {
+        return sa_sendstatus;
+    }
+
+    public void setSa_sendstatus(String sa_sendstatus) {
+        this.sa_sendstatus = sa_sendstatus;
+    }
+
     public String getSa_turnstatus() {
         return sa_turnstatus;
     }

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

@@ -32,6 +32,8 @@
     <result column="creatorId" property="creatorId" jdbcType="INTEGER" />
     <result column="updateTime" property="updateTime" jdbcType="TIMESTAMP" />
     <result column="updaterId" property="updaterId" jdbcType="INTEGER" />
+    <result column="sa_salecode" property="sa_salecode" jdbcType="VARCHAR" />
+    <result column="sa_sendstatus" property="sa_sendstatus" jdbcType="VARCHAR" />
   </resultMap>
 
   <sql id="Base_Column_List" >
@@ -436,7 +438,8 @@
   </select>
 
   <select id="selectListByCon" resultMap="BaseResultMap">
-    select  *  from saledown
+    select  *  from
+    (select saledown.*,sale.sa_sendstatus from saledown left join sale on sa_saleid = sale.sa_id)tab_
     <where>
       <if test="con != null">
         ${con}

applications/transfers/transfers-server/src/main/java/com/usoftchina/saas/transfers/service/impl/ApCheckServiceImpl.java

@@ -2,6 +2,7 @@ package com.usoftchina.saas.transfers.service.impl;
 
 import com.usoftchina.saas.commons.api.MaxnumberService;
 import com.usoftchina.saas.commons.po.BillCodeSeq;
+import com.usoftchina.saas.commons.po.Status;
 import com.usoftchina.saas.document.entities.Vendor;
 import com.usoftchina.saas.money.dto.ApcheckFormDTO;
 import com.usoftchina.saas.money.po.Apcheck;
@@ -64,6 +65,8 @@ public class ApCheckServiceImpl implements ApCheckService{
             main.setAc_vendname(vendor.getVe_name());
             main.setCompanyId(companyId);
             main.setCreateTime(new Date());
+            main.setAc_confirmstatus(Status.UNCONFIRM.getDisplay());
+            main.setAc_confirmstatuscode(Status.UNCONFIRM.name());
             //获取编号
             String code = maxnumberService.getMaxnumberByCompanyid(BillCodeSeq.APCHECK.getCaller(), true, companyId).getData();
             main.setAc_code(code);