采购库存

biz-ghs/order/classes/PurchaseOrderClass.php

@@ -529,15 +529,15 @@ class PurchaseOrderClass extends BaseClass
             $bigNum = bcadd($bigNum, $bNum, 2);
             $smallNum = bcadd($smallNum, $sNum, 2);
             $sNewNum = bcdiv($sNum, $ratio, 2);
-            $currentTotalNum = bcadd($bNum,$sNewNum,2);
+            $currentTotalNum = bcadd($bNum, $sNewNum, 2);
             $totalNum = bcadd($totalNum, $currentTotalNum, 2);
             $kindNum++;
-            $currentTotalPrice = bcmul($v['bigNum'], $v['itemPrice'], 2);
+            $currentTotalPrice = bcmul($currentTotalNum, $v['itemPrice'], 2);
             $totalItemPrice = bcadd($totalItemPrice, $currentTotalPrice, 2);
             $ghsItemInfoMap[$v['productId']] = $v;
             $currentProductId = $v['productId'] ?? 0;
             $currentWeight = $productList[$currentProductId]['weight'] ?? 0;
-            $weight = bcmul($currentWeight, $v['bigNum'], 2);
+            $weight = bcmul($currentWeight, $currentTotalNum, 2);
             $totalWeight = bcadd($totalWeight, $weight, 2);
         }
 
@@ -624,7 +624,11 @@ class PurchaseOrderClass extends BaseClass
 
         try {
             //总运费/总公斤数，计算每公斤的运费
-            $avgKgWeight = bcdiv($totalFreight, $totalWeight, 3);
+            if ($totalWeight > 0) {
+                $avgKgWeight = bcdiv($totalFreight, $totalWeight, 3);
+            } else {
+                $avgKgWeight = 0;
+            }
             $avgKgWeight = round($avgKgWeight, 2);
             $data['avgKgWeight'] = $avgKgWeight;
 
@@ -985,7 +989,6 @@ class PurchaseOrderClass extends BaseClass
                 if ($ratio <= 1) {
                     util::fail('小单位，单位比必须大于1的哦');
                 }
-                echo $ratio;die;
                 $bigNum = bcdiv($smallNum, $ratio, 2);
                 $tmp['itemNum'] = $bigNum;
             }

biz-ghs/product/classes/ProductClass.php

@@ -829,7 +829,6 @@ class ProductClass extends BaseClass
     public static function addOnStockByItemNum($productId, $itemNum)
     {
         //小单位库存不再考虑 ssh 20230303
-        $itemNum = intval($itemNum);
         $key = self::LOCK_ON_STOCK . '_' . $productId;
         $lock = util::lock($key);
         if (!$lock) {
@@ -851,9 +850,6 @@ class ProductClass extends BaseClass
     //加库存
     public static function addStockByItemNum($productId, $itemNum)
     {
-        //小单位库存不再考虑 ssh 20230303
-        $itemNum = intval($itemNum);
-
         $key = self::LOCK_STOCK . '_' . $productId;
         $lock = util::lock($key);
         if (!$lock) {