yjc/erp
1
0
Fork 0
mirror of https://gitee.com/hzchunfen/erp.git synced 2025-12-01 14:40:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

!20 1

Browse Source 
Merge pull request !20 from develop
This commit is contained in:
赵世界 2022-08-17 10:43:39 +00:00 committed by Gitee
commit 32d6a25bfd
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/Http/Controllers/Goods/GoodsSkusController.php
View File

@ -319,9 +319,8 @@ class GoodsSkusController extends Controller
$record->save(); $record->save();
$this->setAfterUpdate($record->loss_num); $this->setAfterUpdate($record->loss_num);
$sku->stock -= $request->loss_num; $sku->stock -= $request->loss_num;
$sku->save();
} else { } else {
$sku->$updateField = $request->$updateField;
}
$this->setBeforeUpdate($sku->$updateField); $this->setBeforeUpdate($sku->$updateField);
if ('reserve' === $updateField) { if ('reserve' === $updateField) {
$changeNum = $sku->reserve - $request->reserve; $changeNum = $sku->reserve - $request->reserve;
@ -331,11 +330,13 @@ class GoodsSkusController extends Controller
} }
$sku->stock += $changeNum; $sku->stock += $changeNum;
} }
$sku->$updateField = $request->$updateField;
$sku->save(); $sku->save();
$this->setAfterUpdate($sku->$updateField);
}
if (in_array($updateField, ['reserve', 'loss_num'])) { if (in_array($updateField, ['reserve', 'loss_num'])) {
event(new StockUpdateEvent($sku)); event(new StockUpdateEvent($sku));
} }
$this->setAfterUpdate($sku->$updateField);
$this->addLog($id, $updateField); $this->addLog($id, $updateField);
end: end:

8
app/Models/Log.php
View File

@ -90,6 +90,14 @@ class Log extends Model
'cost' => '成本', 'cost' => '成本',
'stock' => '库存', 'stock' => '库存',
'inventory' => '库存盘点', 'inventory' => '库存盘点',
'reserve' => '预留量 ',
'timingInventory' => '7店盘点 ',
'pdd.ktt.goods.query.list' => '快团团下载绑定商品',
'arrived_today_num' => '今日到货',
'loss_num' => '损耗',
'pdd.pop.auth.token.create' => '快团团授权',
'reference_price' => '参考价格',
'update' => '更新',
]; ];
return $map[$value] ?? $value; return $map[$value] ?? $value;