瀏覽代碼

采购统计

shish 4 年之前
父節點
當前提交
732168541b

+ 2 - 1
biz-ghs/order/classes/PurchaseOrderClass.php

@@ -281,7 +281,8 @@ class PurchaseOrderClass extends BaseClass
             $ghs->save();
 
             //采购统计
-            StatCgClass::replace($shop, $currentPrice);
+            $cgNum = $order->itemNum ?? 0;
+            StatCgClass::replace($shop, $currentPrice, $cgNum);
             //采购按供货商统计
             StatCgGhsClass::ghsReplace($order);
             //当天和当月支出统计

+ 2 - 1
biz-hd/purchase/services/PurchaseService.php

@@ -400,7 +400,8 @@ class PurchaseService extends BaseService
         ShopCapitalClass::addCapital($capitalData);
 
         //采购统计
-        StatCgClass::replace($shop, $info->orderPrice);
+        $cgNum = $info->bigNum ?? 0;
+        StatCgClass::replace($shop, $info->orderPrice, $cgNum);
         //采购按供货商统计
         StatCgGhsClass::hdCgGhsReplace($info);
         //支出统计

+ 4 - 4
biz/stat/classes/StatCgClass.php

@@ -18,8 +18,8 @@ class StatCgClass extends BaseClass
         return empty($amount) ? 0 : $amount;
     }
 
-    //采购统计 shish 2021-528
-    public static function replace($shop, $amount)
+    //采购统计 ssh 20210828
+    public static function replace($shop, $amount, $num = 0)
     {
         $mainId = $shop->mainId ?? 0;
         $sjId = $shop->sjId ?? 0;
@@ -36,10 +36,10 @@ class StatCgClass extends BaseClass
         $currentAmount = bcadd($unique->amount, $amount, 2);
         $unique->amount = $currentAmount;
         $unique->totalAmount = $shop->totalPurchase;
-        $unique->num += 1;
+        $unique->num += $num;
         $unique->save();
         //当月
-        StatCgMonthClass::replace($shop, $amount);
+        StatCgMonthClass::replace($shop, $amount, $num);
     }
 
     //今日采购

+ 3 - 0
biz/stat/classes/StatCgGhsClass.php

@@ -25,6 +25,9 @@ class StatCgGhsClass extends BaseClass
         $unique = self::getLockById($id);
         $currentAmount = bcadd($unique->amount, $amount, 2);
         $unique->amount = $currentAmount;
+        //只统计大单位数量
+        $num = $cgInfo->bigNum ?? 0;
+        $unique->num = bcadd($unique->num, $num);
         $unique->save();
         StatCgGhsMonthClass::hdCgGhsReplace($cgInfo, $time);
     }

+ 3 - 0
biz/stat/classes/StatCgGhsMonthClass.php

@@ -33,6 +33,9 @@ class StatCgGhsMonthClass extends BaseClass
         $amount = $cgInfo->orderPrice ?? 0;
         $currentAmount = bcadd($unique->amount, $amount, 2);
         $unique->amount = $currentAmount;
+        //只统计大单位数量
+        $num = $order->bigNum ?? 0;
+        $unique->num = bcadd($unique->num, $num);
         $unique->save();
     }
 

+ 2 - 2
biz/stat/classes/StatCgMonthClass.php

@@ -11,7 +11,7 @@ class StatCgMonthClass extends BaseClass
     public static $baseFile = '\biz\stat\models\StatCgMonth';
 
     //采购统计 shish 20210528
-    public static function replace($shop, $amount)
+    public static function replace($shop, $amount, $num)
     {
         $time = date('Ym');
         $year = date('Y');
@@ -30,7 +30,7 @@ class StatCgMonthClass extends BaseClass
         $currentAmount = bcadd($unique->amount, $amount, 2);
         $unique->amount = $currentAmount;
         $unique->totalAmount = $shop->totalPurchase;
-        $unique->num += 1;
+        $unique->num += $num;
         $unique->save();
     }
 

+ 3 - 2
biz/stat/classes/StatOutClass.php

@@ -25,10 +25,11 @@ class StatOutClass extends BaseClass
     public static function updateOrInsert($shop, $amount)
     {
         $mainId = $shop->mainId ?? 0;
+        $sjId = $shop->sjId ?? 0;
         $time = date('Ymd');
-        $stat = self::getByCondition(['mainId' => $mainId, 'time' => $time], true);
+        $stat = self::getByCondition(['mainId' => $mainId, 'sjId' => $sjId, 'time' => $time], true);
         if (empty($stat)) {
-            $stat = self::add(['mainId' => $mainId, 'time' => $time], true);
+            $stat = self::add(['mainId' => $mainId, 'sjId' => $sjId, 'time' => $time], true);
         }
         $id = $stat->id;
         $unique = self::getLockById($id);