Browse Source

针对应收对账单明细增加用户个人UU记录,修改个人对账金额查询方法

hejq 7 years ago
parent
commit
36608544a3

+ 27 - 3
src/main/java/com/uas/platform/b2b/model/ApbillAdjustment.java

@@ -4,8 +4,17 @@ import com.uas.platform.b2b.erp.model.PurchaseAPBill;
 import com.uas.platform.b2b.erp.model.PurchaseAPBillDetail;
 import com.uas.platform.b2b.support.SystemSession;
 
-import javax.persistence.*;
-import java.io.Serializable;
+import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Index;
+import javax.persistence.JoinColumn;
+import javax.persistence.OneToOne;
+import javax.persistence.Table;
+import java.io.*;
 import java.util.Date;
 
 /**
@@ -179,6 +188,12 @@ public class ApbillAdjustment implements Serializable {
 	@Column(name = "aa_custname")
 	private String custname;
 
+    /**
+     * 客户用户UU
+     */
+	@Column(name = "aa_custuseruu")
+    private Long customerUserUU;
+
 	/**
 	 * 企业uu
 	 */
@@ -399,7 +414,15 @@ public class ApbillAdjustment implements Serializable {
 		this.custname = custname;
 	}
 
-	public Long getEnuu() {
+    public Long getCustomerUserUU() {
+        return customerUserUU;
+    }
+
+    public void setCustomerUserUU(Long customerUserUU) {
+        this.customerUserUU = customerUserUU;
+    }
+
+    public Long getEnuu() {
 		return enuu;
 	}
 
@@ -471,6 +494,7 @@ public class ApbillAdjustment implements Serializable {
 		this.setEnuu(apBill.getAb_vendoruu());
 		this.setCustuu(enterprise.getUu());
 		this.setCustname(enterprise.getEnName());
+		this.setCustomerUserUU(SystemSession.getUser().getUserUU());
 		this.setInoutno(apBill.getAb_code());
 		this.setRate(apBill.getAb_rate());
 		this.setProdcode(detail.getAbd_prodcode());

+ 20 - 2
src/main/java/com/uas/platform/b2b/model/ErpProdIODetail.java

@@ -1,7 +1,12 @@
 package com.uas.platform.b2b.model;
 
-import javax.persistence.*;
-import java.io.Serializable;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.NamedStoredProcedureQueries;
+import javax.persistence.NamedStoredProcedureQuery;
+import javax.persistence.ParameterMode;
+import javax.persistence.StoredProcedureParameter;
+import java.io.*;
 import java.util.Date;
 
 /**
@@ -122,6 +127,11 @@ public class ErpProdIODetail implements Serializable {
      */
     private Long custuu;
 
+    /**
+     * 客户用户UU
+     */
+    private Long custuseruu;
+
     /**
      * sourceid
      */
@@ -327,6 +337,14 @@ public class ErpProdIODetail implements Serializable {
         this.custuu = custuu;
     }
 
+    public Long getCustuseruu() {
+        return custuseruu;
+    }
+
+    public void setCustuseruu(Long custuseruu) {
+        this.custuseruu = custuseruu;
+    }
+
     public Long getSourceid() {
         return sourceid;
     }

+ 28 - 4
src/main/java/com/uas/platform/b2b/model/PurchaseApCheckItem.java

@@ -3,8 +3,17 @@ package com.uas.platform.b2b.model;
 import com.alibaba.fastjson.annotation.JSONField;
 import org.codehaus.jackson.annotate.JsonIgnore;
 
-import javax.persistence.*;
-import java.io.Serializable;
+import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Index;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
+import java.io.*;
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
@@ -39,7 +48,14 @@ public class PurchaseApCheckItem implements Serializable {
 	@Column(name = "pai_number")
 	private Short number;
 
-	/**
+    /**
+     * 客户用户UU号
+     */
+    @Column(name = "pai_custuseruu")
+    private Long custUserUU;
+
+
+    /**
 	 * 客户物料ID
 	 */
 	@Column(name = "pai_prid")
@@ -220,7 +236,15 @@ public class PurchaseApCheckItem implements Serializable {
 		this.prid = prid;
 	}
 
-	public String getOrderCode() {
+    public Long getCustUserUU() {
+        return custUserUU;
+    }
+
+    public void setCustUserUU(Long custUserUU) {
+        this.custUserUU = custUserUU;
+    }
+
+    public String getOrderCode() {
 		return orderCode;
 	}
 

+ 8 - 171
src/main/java/com/uas/platform/b2b/publicapi/service/impl/ApCheckApiServiceImpl.java

@@ -35,20 +35,8 @@ public class ApCheckApiServiceImpl implements ApCheckApiService {
     public Double getUserApCheckAmount(Long userUU, Long enUU, Long startTime, Long endTime) {
         Date fromDate = new java.sql.Date(startTime);
         Date endDate = new java.sql.Date(endTime);
-        // 采购验收单
-        Double purchaseAccept = getPurchaseAcceptAmount(userUU, enUU, fromDate, endDate);
-        // 采购退单
-        Double purchaseReturn = getPurchaseReturnAmount(userUU, enUU, fromDate, endDate);
-        // 不良品入库单
-        Double badIn = getBadInAmount(userUU, enUU, fromDate, endDate);
-        // 不良品出库单
-        Double badOut = getBadOutAmount(userUU, enUU, fromDate, endDate);
-        // 委外验收单
-        Double makeAccept = getMakeAcceptAmount(userUU, enUU, fromDate, endDate);
-        // 委外验退单
-        Double makeReturn = getMakeReturnAmount(userUU, enUU, fromDate, endDate);
         // 总金额
-        Double amount = purchaseAccept + purchaseReturn + badIn + badOut + makeAccept + makeReturn;
+        Double amount = getUserApCheckAmount(userUU, enUU, fromDate, endDate);
         return amount;
     }
 
@@ -61,170 +49,19 @@ public class ApCheckApiServiceImpl implements ApCheckApiService {
      * @param endDate 截止时间
      * @return 委外验退单对账金额
      */
-    private Double getMakeReturnAmount(Long userUU, Long enUU, Date fromDate, Date endDate) {
+    private Double getUserApCheckAmount(Long userUU, Long enUU, Date fromDate, Date endDate) {
         StringBuffer stringBuffer = new StringBuffer("select coalesce(sum(case currency " +
                 "when 'RMB' then a.amount " +
-                "when 'USD' then a.amount * " + UsoftRate.USD_RATE +
-                "when 'HKD' then a.amount * " + UsoftRate.HKD_RATE +
-                " end), 0.00) amount from (" +
-                "select sum(e.pa_checkamount) amount,pa_currency currency from purc$apcheckitem c " +
-                "left join purc$apcheck e on c.pai_paid = e.pa_id " +
-                "left join make$returnitem r on c.pai_sourceid = r.mri_id " +
-                "left join make$orders m on r.mri_odid = m.ma_id " +
-                "where c.pai_sourcetable = 'make$returnitem' and m.ma_useruu = " + userUU +
-                " and pa_apdate >= '" + fromDate + "' " +
-                "and pa_apdate <= '" + endDate + "' ");
-        if (null != enUU) {
-            stringBuffer.append("and m.ma_enuu = ").append(enUU);
-        }
-        stringBuffer.append(" group by pa_currency) a");
-        return commonDao.queryForObject(stringBuffer.toString(), Double.class);
-    }
-
-    /**
-     * 获取委外验收单对账金额
-     *
-     * @param userUU 用户UU
-     * @param enUU 企业UU
-     * @param fromDate 开始时间
-     * @param endDate 截止时间
-     * @return 委外验收单对账金额
-     */
-    private Double getMakeAcceptAmount(Long userUU, Long enUU, Date fromDate, Date endDate) {
-        StringBuffer stringBuffer = new StringBuffer("select coalesce(sum(case currency " +
-                "when 'RMB' then a.amount " +
-                "when 'USD' then a.amount * " + UsoftRate.USD_RATE +
-                "when 'HKD' then a.amount * " + UsoftRate.HKD_RATE +
-                " end), 0.00) amount from (" +
-                "select sum(e.pa_checkamount) amount,pa_currency currency from purc$apcheckitem c " +
-                "left join purc$apcheck e on c.pai_paid = e.pa_id " +
-                "left join make$acceptitem i on c.pai_sourceid = i.mai_id " +
-                "left join make$orders m on i.mai_odid = m.ma_id " +
-                "where c.pai_sourcetable = 'make$acceptitem' and m.ma_useruu = " + userUU +
-                " and pa_apdate >= '" + fromDate + "' " +
-                "and pa_apdate <= '" + endDate + "' ");
-        if (null != enUU) {
-            stringBuffer.append("and m.ma_enuu = ").append(enUU);
-        }
-        stringBuffer.append(" group by pa_currency) a");
-        return commonDao.queryForObject(stringBuffer.toString(), Double.class);
-    }
-
-    /**
-     * 获取不良品出库单对账金额
-     *
-     * @param userUU 用户UU
-     * @param enUU 企业UU
-     * @param fromDate 开始时间
-     * @param endDate 截止时间
-     * @return 不良品出库单对账金额
-     */
-    private Double getBadOutAmount(Long userUU, Long enUU, Date fromDate, Date endDate) {
-        StringBuffer stringBuffer = new StringBuffer("select coalesce(sum(case currency " +
-                "when 'RMB' then a.amount " +
-                "when 'USD' then a.amount * " + UsoftRate.USD_RATE +
-                "when 'HKD' then a.amount * " + UsoftRate.HKD_RATE +
-                " end), 0.00) amount from (" +
-                "select sum(e.pa_checkamount) amount,pa_currency currency from purc$apcheckitem c " +
-                "left join purc$apcheck e on c.pai_paid = e.pa_id " +
-                "left join purc$badoutitem b on c.pai_sourceid = b.poi_id " +
-                "left join purc$orderitems i on b.poi_pdid = i.pd_id " +
-                "left join purc$orders o on i.pd_puid = o.pu_id " +
-                "where c.pai_sourcetable = 'purc$badoutitem' and o.pu_useruu = " + userUU +
-                " and pa_apdate >= '" + fromDate + "' " +
-                "and pa_apdate <= '" + endDate + "' ");
-        if (null != enUU) {
-            stringBuffer.append("and o.pu_enuu = ").append(enUU);
-        }
-        stringBuffer.append(" group by pa_currency) a");
-        return commonDao.queryForObject(stringBuffer.toString(), Double.class);
-    }
-
-    /**
-     * 获取不良品入库单对账金额
-     *
-     * @param userUU 用户UU
-     * @param enUU 企业UU
-     * @param fromDate 开始时间
-     * @param endDate 截止时间
-     * @return 不良品入库单对账金额
-     */
-    private Double getBadInAmount(Long userUU, Long enUU, Date fromDate, Date endDate) {
-        StringBuffer stringBuffer = new StringBuffer("select coalesce(sum(case currency " +
-                "when 'RMB' then a.amount " +
-                "when 'USD' then a.amount * " + UsoftRate.USD_RATE +
-                "when 'HKD' then a.amount * " + UsoftRate.HKD_RATE +
-                " end), 0.00) amount from (" +
-                "select sum(e.pa_checkamount) amount,pa_currency currency from purc$apcheckitem c " +
-                "left join purc$apcheck e on c.pai_paid = e.pa_id " +
-                "left join purc$badinitem b on c.pai_sourceid = b.pbi_id " +
-                "left join purc$orderitems i on b.pbi_pdid = i.pd_id " +
-                "left join purc$orders o on i.pd_puid = o.pu_id " +
-                "where c.pai_sourcetable = 'purc$badinitem' and o.pu_useruu = " + userUU +
-                " and pa_apdate >= '" + fromDate + "' " +
-                "and pa_apdate <= '" + endDate + "' ");
-        if (null != enUU) {
-            stringBuffer.append("and o.pu_enuu = ").append(enUU);
-        }
-        stringBuffer.append(" group by pa_currency) a");
-        return commonDao.queryForObject(stringBuffer.toString(), Double.class);
-    }
-
-    /**
-     * 获取采购验退单对账金额
-     *
-     * @param userUU 用户UU
-     * @param enUU 企业UU
-     * @param fromDate 开始时间
-     * @param endDate 截止时间
-     * @return 采购验退单对账金额
-     */
-    private Double getPurchaseReturnAmount(Long userUU, Long enUU, Date fromDate, Date endDate) {
-        StringBuffer stringBuffer = new StringBuffer("select coalesce(sum(case currency " +
-                "when 'RMB' then a.amount " +
-                "when 'USD' then a.amount * " + UsoftRate.USD_RATE +
-                "when 'HKD' then a.amount * " + UsoftRate.HKD_RATE +
+                " when 'USD' then a.amount * " + UsoftRate.USD_RATE +
+                " when 'HKD' then a.amount * " + UsoftRate.HKD_RATE +
                 " end), 0.00) amount from (" +
-                "select sum(e.pa_checkamount) amount,pa_currency currency from purc$apcheckitem c " +
-                "left join purc$apcheck e on c.pai_paid = e.pa_id " +
-                "left join purc$returnitem r on c.pai_sourceid = r.pri_id " +
-                "left join purc$orderitems i on r.pri_pdid = i.pd_id " +
-                "left join purc$orders o on i.pd_puid = o.pu_id " +
-                "where c.pai_sourcetable = 'purc$returnitem' and o.pu_useruu = " + userUU +
+                "select sum(pa_checkamount) amount,pa_currency currency from purc$apcheckitem  " +
+                "left join purc$apcheck on pai_paid = pa_id " +
+                "where pai_custuseruu = " + userUU +
                 " and pa_apdate >= '" + fromDate + "' " +
                 "and pa_apdate <= '" + endDate + "' ");
         if (null != enUU) {
-            stringBuffer.append("and o.pu_enuu = ").append(enUU);
-        }
-        stringBuffer.append(" group by pa_currency) a");
-        return commonDao.queryForObject(stringBuffer.toString(), Double.class);
-    }
-
-    /**
-     * 获取采购验收单对账金额
-     *
-     * @param userUU 用户UU
-     * @param enUU 企业UU
-     * @param fromDate 开始时间
-     * @param endDate 截止时间
-     * @return 采购验收单对账金额
-     */
-    private Double getPurchaseAcceptAmount(Long userUU, Long enUU, Date fromDate, Date endDate) {
-        StringBuffer stringBuffer = new StringBuffer("select coalesce(sum(case currency " +
-                "when 'RMB' then a.amount " +
-                "when 'USD' then a.amount * " + UsoftRate.USD_RATE +
-                "when 'HKD' then a.amount * " + UsoftRate.HKD_RATE +
-                " end), 0.00) amount from (" +
-                " select sum(e.pa_checkamount) amount,pa_currency currency from purc$apcheckitem c " +
-                " left join purc$apcheck e on c.pai_paid = e.pa_id " +
-                " left join purc$acceptitem a on c.pai_sourceid = a.pai_id " +
-                " left join purc$orderitems i on a.pai_pdid = i.pd_id " +
-                " left join purc$orders o on i.pd_puid = o.pu_id " +
-                " where c.pai_sourcetable = 'purc$acceptitem' and o.pu_useruu = " + userUU +
-                " and pa_apdate >= '" + fromDate + "' " +
-                " and pa_apdate <= '" + endDate + "' ");
-        if (null != enUU) {
-            stringBuffer.append("and o.pu_enuu = ").append(enUU);
+            stringBuffer.append("and pa_custuu = ").append(enUU);
         }
         stringBuffer.append(" group by pa_currency) a");
         return commonDao.queryForObject(stringBuffer.toString(), Double.class);

+ 7 - 7
src/main/java/com/uas/platform/b2b/service/impl/ErpProdIODetailServiceImpl.java

@@ -76,7 +76,7 @@ public class ErpProdIODetailServiceImpl implements ErpProdIODetailService {
                 "mr_receivename as receivename, '客户委外验退单' as piclass, 'make$returnitem' as sourcetable, ma_code as ordercode, 0 as orderdetno, " +
                 "mri_number as detno,  (-(1) *  mri_qty ) as qty, mri_orderpice as orderprice, mr_currency as currency, mri_taxrate as taxrate, " +
                 "mri_whname as whname, mri_ycheckqty as ycheckqty, pr_code as prodcode, pr_spec as prodspec, pr_title as prodtitle, pr_unit as produnit, " +
-                "((-(1) *  mri_qty ) - coalesce(mri_ycheckqty, 0)) as thischeckqty, mr_enuu as custuu, mr_venduu as enuu, mri_id as sourceid, " +
+                "((-(1) *  mri_qty ) - coalesce(mri_ycheckqty, 0)) as thischeckqty, mr_enuu as custuu, ma_useruu custuseruu, mr_venduu as enuu, mri_id as sourceid, " +
                 "mr_sendcode as sendcode, ma_factory as pd_factory, en_name custname from make$return  " +
                 "join make$returnitem on mr_id =  mri_paid " +
                 "join make$orders on mri_odid = ma_id  " +
@@ -129,7 +129,7 @@ public class ErpProdIODetailServiceImpl implements ErpProdIODetailService {
                 "make$orders.ma_code as ordercode, 0 as orderdetno, mai_number as detno, mai_qty as qty, mai_orderpice as orderprice, " +
                 "make$accept.ma_currency as currency, mai_taxrate as taxrate, mai_whname as whname, mai_ycheckqty as ycheckqty, " +
                 "make$orders.pr_code as prodcode, make$orders.pr_spec as prodspec, make$orders.pr_title as prodtitle, make$orders.pr_unit as produnit, " +
-                "(mai_qty - coalesce(mai_ycheckqty, 0)) as thischeckqty, make$accept.ma_enuu as custuu, make$accept.ma_venduu as enuu, " +
+                "(mai_qty - coalesce(mai_ycheckqty, 0)) as thischeckqty, make$accept.ma_enuu as custuu, make$orders.ma_useruu custuseruu, make$accept.ma_venduu as enuu, " +
                 "mai_id as sourceid, ma_sendcode as sendcode, ma_factory as factory, en_name custname from make$accept " +
                 "join make$acceptitem on make$accept.ma_id = mai_paid " +
                 "join make$orders on mai_odid = make$orders.ma_id " +
@@ -181,7 +181,7 @@ public class ErpProdIODetailServiceImpl implements ErpProdIODetailService {
                 "po_receivename as receivename, '客户不良品出库单' as piclass, 'purc$badoutitem' as sourcetable, pu_code as pd_ordercode, " +
                 "purc$orderitems.pd_number as orderdetno, poi_number as detno, (-(1) * poi_qty ) as qty, 0 as pd_orderprice, po_currency as currency, " +
                 "poi_taxrate as taxrate, poi_whname as whname, poi_ycheckqty as ycheckqty, pr_code as prodcode, pr_spec as prodspec, pr_title as prodtitle, pr_unit as produnit, " +
-                "((-(1) * poi_qty ) - coalesce( poi_ycheckqty, 0)) as thischeckqty, po_enuu as custuu, po_venduu as enuu, poi_id as sourceid, " +
+                "((-(1) * poi_qty ) - coalesce( poi_ycheckqty, 0)) as thischeckqty, po_enuu as custuu, pu_useruu custuseruu, po_venduu as enuu, poi_id as sourceid, " +
                 "po_sendcode as sendcode, purc$orderitems.pd_factory as factory, en_name custname from purc$badout " +
                 "join purc$badoutitem on po_id = poi_poid  " +
                 "left join purc$orderitems on poi_pdid = pd_id " +
@@ -234,7 +234,7 @@ public class ErpProdIODetailServiceImpl implements ErpProdIODetailService {
                 "pb_receivename as receivename, '客户不良品入库单' as piclass, 'purc$badinitem' as sourcetable, pu_code as ordercode, " +
                 "pd_number as orderdetno, pbi_number as detno, pbi_qty as qty, 0 as pd_orderprice, pb_currency as currency, pbi_taxrate as taxrate, " +
                 "pbi_whname as whname, pbi_ycheckqty as ycheckqty, pr_code as prodcode, pr_spec as prodspec, pr_title as prodtitle, pr_unit as produnit, " +
-                "(pbi_qty - coalesce(pbi_ycheckqty, 0)) as thischeckqty, pb_enuu as custuu, pb_venduu as enuu, pbi_id as sourceid, " +
+                "(pbi_qty - coalesce(pbi_ycheckqty, 0)) as thischeckqty, pb_enuu as custuu, pu_useruu custuseruu, pb_venduu as enuu, pbi_id as sourceid, " +
                 "pb_sendcode as sendcode, pd_factory as factory, en_name custname from purc$badin " +
                 "join purc$badinitem on pb_id = pbi_pbid " +
                 "left join purc$orderitems on pbi_pdid = pd_id " +
@@ -287,7 +287,7 @@ public class ErpProdIODetailServiceImpl implements ErpProdIODetailService {
                 "pr_receivename as receivename, '客户采购验退单' as piclass, 'purc$returnitem' as sourcetable, pu_code as ordercode, pd_number as orderdetno, " +
                 "pri_number as detno, (-(1) * pri_qty ) as qty, pri_orderprice as orderprice, pr_currency as currency, pri_taxrate as taxrate, " +
                 "pri_whname as whname, purc$returnitem.pr_code as prodcode, purc$returnitem.pr_spec as prodspec, purc$returnitem.pr_title as prodtitle, purc$returnitem.pr_unit as produnit, " +
-                "pri_ycheckqty as ycheckqty, ((-(1) * pri_qty ) - coalesce(pri_ycheckqty, 0)) as thischeckqty, pr_enuu as custuu, pr_venduu as enuu, " +
+                "pri_ycheckqty as ycheckqty, ((-(1) * pri_qty ) - coalesce(pri_ycheckqty, 0)) as thischeckqty, pr_enuu as custuu, pu_useruu custuseruu, pr_venduu as enuu, " +
                 "pri_id as sourceid, pr_sendcode as sendcode, pd_factory as factory, en_name custname from purc$return " +
                 "join purc$returnitem on pr_id = pri_prid " +
                 "left join purc$orderitems on pri_pdid = pd_id " +
@@ -341,7 +341,7 @@ public class ErpProdIODetailServiceImpl implements ErpProdIODetailService {
                 "pd_number as orderdetno, pai_number as detno, pai_qty as qty, pai_orderprice as orderprice, pa_currency as currency, " +
                 "pai_taxrate as taxrate,  pai_whname as whname, purc$acceptitem.pr_code as prodcode, purc$acceptitem.pr_spec as prodspec, purc$acceptitem.pr_unit as produnit, " +
                 "purc$acceptitem.pr_title as prodtitle, pai_ycheckqty as ycheckqty, (pai_qty - coalesce(pai_ycheckqty, 0)) as thischeckqty, " +
-                "pa_enuu as custuu, pa_venduu as enuu, pai_id as sourceid, pa_sendcode as sendcode, pd_factory as factory, en_name custname from purc$accept " +
+                "pa_enuu as custuu, pu_useruu custuseruu, pa_venduu as enuu, pai_id as sourceid, pa_sendcode as sendcode, pd_factory as factory, en_name custname from purc$accept " +
                 "join purc$acceptitem on pai_paid = pa_id " +
                 "left join purc$orderitems on pai_pdid = pd_id " +
                 "left join purc$orders on purc$orders.pu_id = pd_puid " +
@@ -393,7 +393,7 @@ public class ErpProdIODetailServiceImpl implements ErpProdIODetailService {
                 "aa_receivename receivename, '货款调账' as piclass, 'purc$apbilladjustment' as sourcetable, aa_ordercode ordercode, " +
                 "aa_orderdetno orderdetno, aa_detno detno, aa_prid prid, aa_prodcode prodcode, aa_prodspec prodspec, aa_prodtitle prodtitle, aa_produnit as produnit, " +
                 "aa_qty qty, aa_orderprice orderprice, aa_currency currency, aa_taxrate taxrate, aa_whname whname, aa_ycheckqty ycheckqty, " +
-                "(aa_qty - coalesce(aa_ycheckqty, 0)) as thischeckqty, aa_custuu custuu, aa_enuu enuu, aa_id sourceid, aa_sendcode sendcode, " +
+                "(aa_qty - coalesce(aa_ycheckqty, 0)) as thischeckqty, aa_custuu custuu, aa_custuseruu custuseruu, aa_enuu enuu, aa_id sourceid, aa_sendcode sendcode, " +
                 "aa_factory factory, aa_custname custname from purc$apbilladjustment where coalesce(aa_thischeckqty, 0) <> 0 and aa_enuu = ").append(enUU).append(" ");
         if (!StringUtils.isEmpty(keyword.getReceiveName())) {
             sql.append("and aa_receivename = '").append(keyword.getReceiveName()).append("' ");

+ 2 - 0
src/main/webapp/resources/js/index/app.js

@@ -10000,6 +10000,7 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
                     taxrate: '',
                     sendcode: '',
                     whname: '',
+                    custUserUU: ''
                 };
 
                 //应收对账单明细行来源表信息
@@ -10091,6 +10092,7 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
                     $scope.item.receiveName = check.receivename;
                     $scope.item.sendcode = check.sendcode;
                     $scope.item.whname = check.whname;
+                    $scope.item.custUserUU = check.custuseruu;
 
                     //来源表相关信息
                     $scope.sourceInfo.sourceid = check.sourceid;