Browse Source

feat(apCheckAmount): 前端增加发货单数量,发货单价格返回

hejq 7 years ago
parent
commit
0f4066ec00

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

@@ -725,17 +725,18 @@ public class ErpProdIODetailServiceImpl implements ErpProdIODetailService {
      * @return 客户采购验收单信息
      * @return 客户采购验收单信息
      */
      */
     private List<ErpProdIODetail> getSaleAccepts(StringBuffer distributes, ApcheckKeyWord keyword, String fromDate, String endDate, Long enUU) {
     private List<ErpProdIODetail> getSaleAccepts(StringBuffer distributes, ApcheckKeyWord keyword, String fromDate, String endDate, Long enUU) {
-        StringBuffer sql = new StringBuffer("select pa_code as inoutno, pa_date as pidate, pa_rate as rate, pa_receivecode as receivcode, pa_receivename as receivename, '客户采购验收单' as piclass, 'purc$acceptitem' as sourcetable, pu_code as ordercode, " +
-                "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, pu_useruu custuseruu, pa_venduu as enuu, pai_id as sourceid, pa_sendcode as sendcode, pd_factory as factory, en_name custname," +
-                " pai_payment payment, b2b_si_id sendId 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 " +
-                "left join sec$enterprises on pa_enuu = en_uu " +
-                "where pai_qty > coalesce(pai_ycheckqty, 0) and pa_venduu = ").append(enUU).append(" ");
+        StringBuffer sql = new StringBuffer("select pa_code as inoutno, pa_date as pidate, pa_rate as rate, pa_receivecode as receivcode, pa_receivename as receivename, '客户采购验收单' as piclass, 'purc$acceptitem' as sourcetable, pu_code as ordercode," +
+            " 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, pu_useruu custuseruu, pa_venduu as enuu, pai_id as sourceid, pa_sendcode as sendcode, pd_factory as factory, en_name custname," +
+            " pai_payment payment, b2b_si_id sendId,si_price sendPrice,si_qty sendQty 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" +
+            " left join sec$enterprises on pa_enuu = en_uu" +
+            " left join sale$senditem on b2b_si_id = si_id" +
+            " where pai_qty > coalesce(pai_ycheckqty, 0) and pa_venduu =").append(enUU).append(" ");
         if (!StringUtils.isEmpty(keyword.getReceiveName())) {
         if (!StringUtils.isEmpty(keyword.getReceiveName())) {
             sql.append("and pa_receivename = '").append(keyword.getReceiveName()).append("' ");
             sql.append("and pa_receivename = '").append(keyword.getReceiveName()).append("' ");
         }
         }