Bladeren bron

feat(apCheckAmount): 新增对账时保存发货单id,发货数量和价格

hejq 7 jaren geleden
bovenliggende
commit
d098158cfb

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

@@ -725,7 +725,7 @@ public class ErpProdIODetailServiceImpl implements ErpProdIODetailService {
      * @return 客户采购验收单信息
      */
     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," +
+        StringBuilder sql = new StringBuilder("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," +

+ 6 - 2
src/main/java/com/uas/platform/b2b/service/impl/PurchaseApCheckServiceImpl.java

@@ -344,8 +344,8 @@ public class PurchaseApCheckServiceImpl implements PurchaseApCheckService {
 	        commonDao.getJdbcTemplate().batchUpdate("insert into purc$apcheckitem(pai_number, pai_custuseruu, pai_prid, pai_ordercode,pai_orderclass, " +
                 "pai_orderdetno, pai_inoutno, pai_inoutnodetno, pai_prodcode, pai_prodtitle, pai_prodspec, pai_produnit, pai_price,pai_taxrate, pai_checkqty, " +
                 "pai_amount, pai_custcheckqty, pai_remark, pai_status, pai_sourcetable, pai_sourceid, pai_source_date, pai_oldycheckqty, pai_receivecode, pai_receivename, " +
-                "pai_sendcode, pai_whname, pai_billed, pai_paid, pai_payment) " +
-                "values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)",
+                "pai_sendcode, pai_whname, pai_billed, pai_paid, pai_payment,pai_send_id,pai_send_qty,pai_send_price) " +
+                "values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)",
                 items, items.size(), (pa, i) -> {
 	                pa.setObject(1, num[0]++);
                     pa.setObject(2, i.getCustUserUU());
@@ -379,6 +379,10 @@ public class PurchaseApCheckServiceImpl implements PurchaseApCheckService {
                     pa.setObject(28, i.getBilled());
                     pa.setObject(29, apCheckId);
                     pa.setObject(30, i.getPayment());
+
+                    pa.setObject(31, i.getSendId());
+                    pa.setObject(32, i.getSendQty());
+                    pa.setObject(33, i.getSendPrice());
                 });
         }
     }

+ 9 - 1
src/main/webapp/resources/js/index/app.js

@@ -11158,7 +11158,11 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
                         sendcode: '',
                         whname: '',
                         custUserUU: '',
-                        pidate: ''
+                        pidate: '',
+                        sendId: null,
+                        sendQty: null,
+                        sendPrice: null,
+                        payment: null
                     };
 
                     //应收对账单明细行来源表信息
@@ -11252,6 +11256,10 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
                         $scope.item.whname = check.whname;
                         $scope.item.custUserUU = check.custuseruu;
                         $scope.item.sourceDate = check.pidate
+                        $scope.item.sendId = check.sendId;
+                        $scope.item.sendQty = check.sendQty;
+                        $scope.item.sendPrice = check.sendPrice;
+                        $scope.item.payment = check.payment;
                         //来源表相关信息
                         $scope.sourceInfo.sourceid = check.sourceid;
                         $scope.sourceInfo.sourcetable = check.sourcetable;