|
|
@@ -43,8 +43,14 @@ class StockOutController extends BaseController
|
|
|
$changeList = $post['changeList'] ?? [];
|
|
|
$changeData = [];
|
|
|
if (!empty($changeList)) {
|
|
|
- $changeData = json_decode($changeList, true);
|
|
|
- print_r($changeData);die;
|
|
|
+ $changeFormatData = json_decode($changeList, true);
|
|
|
+ if (!empty($changeFormatData)) {
|
|
|
+ foreach ($changeFormatData as $k => $v) {
|
|
|
+ $productId = $v['productId'];
|
|
|
+ $actPutNum = $v['actPutNum'] ?? 0;
|
|
|
+ $changeData[$productId] = ['actPutNum' => $actPutNum];
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
$inItemList = StockInOrderItemClass::getAllByCondition(['orderSn' => $orderSn], null, '*');
|
|
|
@@ -55,6 +61,12 @@ class StockOutController extends BaseController
|
|
|
foreach ($inItemList as $key => $info) {
|
|
|
$productId = $info['productId'] ?? 0;
|
|
|
$itemNum = $info['itemNum'] ? floatval($info['itemNum']) : 0;
|
|
|
+ if (!empty($changeData)) {
|
|
|
+ if (isset($changeData[$productId])) {
|
|
|
+ $changeResult = $changeData[$productId];
|
|
|
+ $itemNum = $changeResult['actPutNum'];
|
|
|
+ }
|
|
|
+ }
|
|
|
$itemInfo[] = ['productId' => $productId, 'bigNum' => $itemNum, 'smallNum' => 0];
|
|
|
}
|
|
|
$arr = [
|
|
|
@@ -75,6 +87,9 @@ class StockOutController extends BaseController
|
|
|
$transaction = $connection->beginTransaction();
|
|
|
try {
|
|
|
StockOutOrderClass::addOrder($arr);
|
|
|
+ //回调次数+1
|
|
|
+ $in->callbackTime += 1;
|
|
|
+ $in->save();
|
|
|
$transaction->commit();
|
|
|
util::complete('出库成功');
|
|
|
} catch (\Exception $exception) {
|