|
|
@@ -586,8 +586,9 @@ class PurchaseOrderClass extends BaseClass
|
|
|
$onRecord['itemId'] = $itemId;
|
|
|
$onRecord['relateName'] = $ghsName;
|
|
|
$onRecord['itemNum'] = $v['itemNum'];
|
|
|
- $onRecord['oldStock'] = $v['itemStock'];
|
|
|
- $newOnStock = bcadd($v['itemStock'], $v['itemNum']);
|
|
|
+ $oldOnStock = $v['onStock'] ?? 0;
|
|
|
+ $onRecord['oldStock'] = $oldOnStock;
|
|
|
+ $newOnStock = bcadd($oldOnStock, $v['itemNum']);
|
|
|
$onRecord['newStock'] = $newOnStock;
|
|
|
OnStockRecordClass::addPurchaseOrderRecord($onRecord);
|
|
|
ProductClass::addOnStockByItemNum($productId, $v['itemNum']);
|
|
|
@@ -893,7 +894,8 @@ class PurchaseOrderClass extends BaseClass
|
|
|
$tmp['orderSn'] = $orderSn;
|
|
|
$tmp['itemId'] = $itemId;
|
|
|
$tmp['productId'] = $v['productId'];
|
|
|
- $tmp['itemStock'] = $productData[$productId]['stock'] ?? 0;//当时库存
|
|
|
+ $tmp['itemStock'] = $productData[$productId]['stock'] ?? 0;
|
|
|
+ $tmp['onStock'] = $productData[$productId]['onStock'] ?? 0;
|
|
|
$tmp['itemNum'] = $v['bigNum'];
|
|
|
$tmp['bigPrice'] = $v['itemPrice'];
|
|
|
$tmp['totalPrice'] = bcmul($v['itemPrice'], $tmp['itemNum'], 2);
|
