mkm/multi-store
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev

Browse Source
This commit is contained in:
lewis 2025-01-08 15:15:02 +08:00
commit 5417d58b6b
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/admin/logic/system_store_storage/SystemStoreStorageLogic.php
View File

@ -69,7 +69,8 @@ class SystemStoreStorageLogic extends BaseLogic
$find->save(['status'=>1,'staff_id'=>$params['staff_id']??0,'admin_id'=>$params['admin_id']??0,'mark'=>'入库时间:'.date('Y-m-d H:i:s',time())]); $find->save(['status'=>1,'staff_id'=>$params['staff_id']??0,'admin_id'=>$params['admin_id']??0,'mark'=>'入库时间:'.date('Y-m-d H:i:s',time())]);
$branch_product=StoreBranchProduct::where(['product_id'=>$find['product_id'],'store_id'=>$find['store_id']])->find(); $branch_product=StoreBranchProduct::where(['product_id'=>$find['product_id'],'store_id'=>$find['store_id']])->find();
if($branch_product){ if($branch_product){
$branch_product->save(['stock'=>$branch_product['stock']+$find['nums']]); $branch_product->stock=$branch_product['stock']+$find['nums'];
$branch_product->save();
SqlChannelLog('StoreBranchProduct', $branch_product['id'], $find['nums'], 1,Request()->url(),$admin_id); SqlChannelLog('StoreBranchProduct', $branch_product['id'], $find['nums'], 1,Request()->url(),$admin_id);
}else{ }else{
$storeProduct = StoreProduct::where('id', $find['product_id'])->findOrEmpty(); $storeProduct = StoreProduct::where('id', $find['product_id'])->findOrEmpty();

16
app/admin/logic/warehouse_product_return/WarehouseProductReturnLogic.php
View File

@ -76,15 +76,15 @@ class WarehouseProductReturnLogic extends BaseLogic
throw new BusinessException('该商品库存:'.$params['nums'].'小于仓库库存'.$proudct['nums']); throw new BusinessException('该商品库存:'.$params['nums'].'小于仓库库存'.$proudct['nums']);
} }
} }
$offer = PurchaseProductOffer::where('order_id', $params['bhoid'])->where('product_id', $find['product_id'])->find(); // $offer = PurchaseProductOffer::where('order_id', $params['bhoid'])->where('product_id', $find['product_id'])->find();
if (!$offer) { // if (!$offer) {
throw new BusinessException('该商品没有采购信息'); // throw new BusinessException('该商品没有采购信息');
} // }
$datas = [ $datas = [
'source_id' => $params['id'], 'source_id' => $params['id'],
'bhoid' => $params['bhoid'] ?? 0, 'bhoid' => $params['bhoid'] ?? 0,
'warehouse_id' => $find['warehouse_id'], 'warehouse_id' => $find['warehouse_id'],
'supplier_id' => $offer['supplier_id'], 'supplier_id' => 0,
'store_id' => $find['store_id'], 'store_id' => $find['store_id'],
'product_id' => $find['product_id'], 'product_id' => $find['product_id'],
'unit' => $find['unit'], 'unit' => $find['unit'],
@ -93,8 +93,10 @@ class WarehouseProductReturnLogic extends BaseLogic
'nums' => $params['nums'], 'nums' => $params['nums'],
'return_type' => $params['return_type'], 'return_type' => $params['return_type'],
'mark' => $params['mark'], 'mark' => $params['mark'],
'price' => $offer['price'], // 'price' => $offer['price'],
'total_price' => bcmul($params['nums'], $offer['price'], 2), // 'total_price' => bcmul($params['nums'], $offer['price'], 2),
'price' => 0,
'total_price' => 0,
]; ];
} }