|
|
@@ -642,8 +642,8 @@ class PurchaseOrderClass extends BaseClass
|
|
|
|
|
|
//组装详情表数据
|
|
|
$batchData = self::groupOrderItem($ghsItemInfo, $orderSn);
|
|
|
-print_r($batchData);
|
|
|
-die;
|
|
|
+ print_r($batchData);
|
|
|
+ die;
|
|
|
//加库存
|
|
|
foreach ($batchData as $currentKey => $v) {
|
|
|
$itemId = $v['itemId'];
|
|
|
@@ -977,6 +977,8 @@ die;
|
|
|
$tmp['onStock'] = $productData[$productId]['onStock'] ?? 0;
|
|
|
if (isset($v['bigNum']) && $v['bigNum'] > 0) {
|
|
|
$tmp['itemNum'] = $v['bigNum'];
|
|
|
+ $tmp['bigPrice'] = $v['itemPrice'];
|
|
|
+ $tmp['totalPrice'] = bcmul($v['itemPrice'], $tmp['itemNum'], 2);
|
|
|
} else {
|
|
|
$smallNum = $v['smallNum'] ?? 0;
|
|
|
if ($smallNum <= 0) {
|
|
|
@@ -990,11 +992,12 @@ die;
|
|
|
if ($ratio <= 1) {
|
|
|
util::fail('小单位,单位比必须大于1的哦');
|
|
|
}
|
|
|
- $bigNum = bcdiv($smallNum, $ratio, 2);
|
|
|
- $tmp['itemNum'] = $bigNum;
|
|
|
+ $changeToBigNum = bcdiv($smallNum, $ratio, 2);
|
|
|
+ $tmp['itemNum'] = $changeToBigNum;
|
|
|
+ $bigPrice = bcmul($v['itemPrice'], $ratio, 2);
|
|
|
+ $tmp['bigPrice'] = $bigPrice;
|
|
|
+ $tmp['totalPrice'] = bcmul($v['itemPrice'], $smallNum, 2);
|
|
|
}
|
|
|
- $tmp['bigPrice'] = $v['itemPrice'];
|
|
|
- $tmp['totalPrice'] = bcmul($v['itemPrice'], $tmp['itemNum'], 2);
|
|
|
$batchData[] = $tmp;
|
|
|
}
|
|
|
return $batchData;
|