Merge remote-tracking branch 'origin/dev' into hejq-redhot-201809

src/main/java/com/uas/platform/b2b/openapi/service/impl/TradingDataServiceImpl.java

@@ -131,15 +131,15 @@ public class TradingDataServiceImpl implements TradingDataService {
         RecentOfYear ofYear6 = new RecentOfYear("实收金额");
         ofYear6.setTwoYear(ofYear2.getTwoYear() - ofYear4.getTwoYear());
         ofYear6.setOneYear(ofYear2.getOneYear() - ofYear4.getOneYear());
-        ofYear6.setThisYear(ofYear2.getThisYear() - ofYear2.getThisYear());
+        ofYear6.setThisYear(ofYear2.getThisYear() - ofYear4.getThisYear());
         ofYear6.setOneYearNum(NumFormat.getIncrease(ofYear6.getTwoYear(), ofYear6.getOneYear()));
         ofYear6.setThisYearNum(NumFormat.getIncrease(ofYear6.getOneYear(), ofYear6.getThisYear()));
         years.add(ofYear6);
         // 实收笔数
         RecentOfYear ofYear7 = new RecentOfYear("实收笔数");
-        ofYear7.setTwoYear(ofYear3.getTwoYear() - ofYear3.getTwoYear());
-        ofYear7.setOneYear(ofYear3.getOneYear() - ofYear3.getOneYear());
-        ofYear7.setThisYear(ofYear3.getThisYear() - ofYear3.getThisYear());
+        ofYear7.setTwoYear(ofYear3.getTwoYear() - ofYear5.getTwoYear());
+        ofYear7.setOneYear(ofYear3.getOneYear() - ofYear5.getOneYear());
+        ofYear7.setThisYear(ofYear3.getThisYear() - ofYear5.getThisYear());
         ofYear7.setOneYearNum(NumFormat.getIncrease(ofYear7.getTwoYear(), ofYear7.getOneYear()));
         ofYear7.setThisYearNum(NumFormat.getIncrease(ofYear7.getOneYear(), ofYear7.getThisYear()));
         years.add(ofYear7);
@@ -402,7 +402,7 @@ public class TradingDataServiceImpl implements TradingDataService {
     private Double getOrderSum(Long enUU) {
         StringBuffer sql = new StringBuffer("SELECT sum(case currency when 'RMB' then a.amount when 'USD' "
                 + "then a.amount * " + ErpRate.USD_RATE + " when 'HKD' then a.amount * " + ErpRate.HKD_RATE + " end) result "
-                + "FROM (SELECT sum(pd_price) amount,pu_currency currency FROM purc$orders LEFT JOIN purc$orderitems "
+                + "FROM (SELECT sum(pd_price*pd_qty) amount,pu_currency currency FROM purc$orders LEFT JOIN purc$orderitems "
                 + "on pu_id=pd_puid where pu_venduu = " + enUU + " GROUP BY pu_currency) a");
         Double result = commonDao.queryForObject(sql.toString(), Double.class);
         return NumFormat.getTwo(NumFormat.getTenThousand(result));
@@ -454,7 +454,7 @@ public class TradingDataServiceImpl implements TradingDataService {
      */
     private Integer getAcceptCust(Long enUU, Date startTime, Date endTime) {
         StringBuffer sql = new StringBuffer("SELECT COUNT(1) from purc$orders WHERE pu_venduu= " + enUU
-                + " AND pu_date >= '" + startTime + "' and pu_date < " + endTime);
+                + " AND pu_date >= '" + startTime + "' and pu_date < " + "'" + endTime + "'");
         Integer result = commonDao.queryForObject(sql.toString(), Integer.class);
         return result;
     }
@@ -470,7 +470,7 @@ public class TradingDataServiceImpl implements TradingDataService {
         StringBuffer sql = new StringBuffer("SELECT sum(case currency when 'RMB' then a.amount when 'USD' "
                 + "then a.amount * " + ErpRate.USD_RATE + " when 'HKD' then a.amount * " + ErpRate.HKD_RATE + " end) result "
                 + "FROM (SELECT SUM(pai_qty*pai_orderprice) amount,pa_currency currency FROM purc$accept LEFT JOIN purc$acceptitem "
-                + "on pai_paid=pa_id WHERE pa_venduu= " + enUU + " and pa_date >= " + startTime + " and pa_date < " + endTime
+                + "on pai_paid=pa_id WHERE pa_venduu= " + enUU + " and pa_date >= '" + startTime + "' and pa_date < " + "'" + endTime + "'"
                 + " GROUP BY pa_currency) a");
         Double result = commonDao.queryForObject(sql.toString(), Double.class);
         return NumFormat.getTwo(result);
@@ -487,7 +487,7 @@ public class TradingDataServiceImpl implements TradingDataService {
         StringBuffer sql = new StringBuffer("SELECT sum(case currency when 'RMB' then a.amount when 'USD' "
                 + "then a.amount * " + ErpRate.USD_RATE + " when 'HKD' then a.amount * " + ErpRate.HKD_RATE + " end) result "
                 + "FROM (SELECT SUM(pri_qty*pri_orderprice) amount,pr_currency currency FROM purc$return LEFT JOIN purc$returnitem "
-                + "on pri_prid=pr_id WHERE pr_venduu= " + enUU + " and pr_date >= " + startTime + " and pr_date < " + endTime
+                + "on pri_prid=pr_id WHERE pr_venduu= " + enUU + " and pr_date >= '" + startTime + "' and pr_date < " + "'" + endTime + "'"
                 + " GROUP BY pr_currency) a");
         Double result = commonDao.queryForObject(sql.toString(), Double.class);
         return NumFormat.getTwo(result);
@@ -502,7 +502,7 @@ public class TradingDataServiceImpl implements TradingDataService {
      */
     private Integer getAcceptNumTime(Long enUU, Date startTime, Date endTime) {
         StringBuffer sql = new StringBuffer("SELECT COUNT(1) FROM purc$accept WHERE pa_venduu= " + enUU
-                + " and pa_date >= " + startTime + " and pa_date < " + endTime);
+                + " and pa_date >= '" + startTime + "' and pa_date < " + "'" + endTime + "'");
         Integer result = commonDao.queryForObject(sql.toString(), Integer.class);
         return result;
     }
@@ -516,7 +516,7 @@ public class TradingDataServiceImpl implements TradingDataService {
      */
     private Integer getReturnNumTime(Long enUU, Date startTime, Date endTime) {
         StringBuffer sql = new StringBuffer("SELECT COUNT(1) FROM purc$return  WHERE pr_venduu= " + enUU
-                + " and pr_date >= " + startTime + " and pr_date < " + endTime);
+                + " and pr_date >= '" + startTime + "' and pr_date < " + "'" + endTime + "'");
         Integer result = commonDao.queryForObject(sql.toString(), Integer.class);
         return result;
     }
@@ -532,7 +532,7 @@ public class TradingDataServiceImpl implements TradingDataService {
         StringBuffer sql = new StringBuffer("SELECT sum(case currency when 'RMB' then a.amount when 'USD' "
                 + " then a.amount * " + ErpRate.USD_RATE + " when 'HKD' then a.amount * " + ErpRate.HKD_RATE + " end) result "
                 + " FROM (select sum(pa_checkamount) amount,pa_currency currency from purc$apcheck where pa_enuu = " + enUU
-                + " and pa_checkstatus = '已确认' and pa_recorddate >= " + startTime + " and pa_recorddate < " + endTime
+                + " and pa_checkstatus = '已确认' and pa_recorddate >= '" + startTime + "' and pa_recorddate < " + "'" + endTime + "'"
                 + " GROUP BY pa_currency) a");
         Double result = commonDao.queryForObject(sql.toString(), Double.class);
         return NumFormat.getTwo(result);
@@ -577,7 +577,7 @@ public class TradingDataServiceImpl implements TradingDataService {
      */
     private Double getApBillNumTime(Long enUU, Date startTime, Date endTime) {
         StringBuffer sql = new StringBuffer("SELECT COUNT(1) from purc$apbill WHERE pad_venduu=" + enUU
-                + " and pab_date >= " + startTime + " and pab_date < " + endTime);
+                + " and pab_date >= '" + startTime + "' and pab_date < " + "'" + endTime + "'");
         Double result = commonDao.queryForObject(sql.toString(), Double.class);
         return NumFormat.getTwo(result);
     }

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

@@ -75,7 +75,8 @@ public class ErpProdIODetailServiceImpl implements ErpProdIODetailService {
 	    StringBuffer sql = new StringBuffer("select  mr_code as inoutno, mr_date as pidate, mr_rate as rate, mr_receivecode as receivecode, " +
                 "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, " +
+                "mri_whname as whname, mri_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, " +
                 "((-(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 " +

src/main/webapp/resources/js/index/app.js

@@ -10107,14 +10107,19 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 
             //保存生成的应收对账单
             $scope.saveApCheck = function () {
-                FaApCheck.saveApCheck({}, $scope.apCheck, function (data) {
+                if ($scope.apCheck.items.length == 0) {
                     $scope.loading = false;
-                    toaster.pop('success', '成功', '生成应收对账成功');
-                    $state.go('fa.apCheck_detail', {id: data.id}, {reload: true});
-                }, function (response) {
-                    $scope.loading = false;
-                    toaster.pop('error', '生成对账单失败', response.data);
-                })
+                    toaster.pop('error', '请先选择需要对账的数据');
+                } else {
+                    FaApCheck.saveApCheck({}, $scope.apCheck, function (data) {
+                        $scope.loading = false;
+                        toaster.pop('success', '成功', '生成应收对账成功');
+                        $state.go('fa.apCheck_detail', {id: data.id}, {reload: true});
+                    }, function (response) {
+                        $scope.loading = false;
+                        toaster.pop('error', '生成对账单失败', response.data);
+                    })
+                }
             };
 
             //如果是同一家客户，生成对账单的同时，关闭模态框