diff --git a/app/admin/logic/system_store_storage/SystemStoreStorageLogic.php b/app/admin/logic/system_store_storage/SystemStoreStorageLogic.php index 2309fcf9d..9ddcf05ff 100644 --- a/app/admin/logic/system_store_storage/SystemStoreStorageLogic.php +++ b/app/admin/logic/system_store_storage/SystemStoreStorageLogic.php @@ -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())]); $branch_product=StoreBranchProduct::where(['product_id'=>$find['product_id'],'store_id'=>$find['store_id']])->find(); 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); }else{ $storeProduct = StoreProduct::where('id', $find['product_id'])->findOrEmpty(); diff --git a/app/admin/logic/warehouse_product_return/WarehouseProductReturnLogic.php b/app/admin/logic/warehouse_product_return/WarehouseProductReturnLogic.php index 19314681b..88c8a096d 100644 --- a/app/admin/logic/warehouse_product_return/WarehouseProductReturnLogic.php +++ b/app/admin/logic/warehouse_product_return/WarehouseProductReturnLogic.php @@ -76,15 +76,15 @@ class WarehouseProductReturnLogic extends BaseLogic throw new BusinessException('该商品库存:'.$params['nums'].'小于仓库库存'.$proudct['nums']); } } - $offer = PurchaseProductOffer::where('order_id', $params['bhoid'])->where('product_id', $find['product_id'])->find(); - if (!$offer) { - throw new BusinessException('该商品没有采购信息'); - } + // $offer = PurchaseProductOffer::where('order_id', $params['bhoid'])->where('product_id', $find['product_id'])->find(); + // if (!$offer) { + // throw new BusinessException('该商品没有采购信息'); + // } $datas = [ 'source_id' => $params['id'], 'bhoid' => $params['bhoid'] ?? 0, 'warehouse_id' => $find['warehouse_id'], - 'supplier_id' => $offer['supplier_id'], + 'supplier_id' => 0, 'store_id' => $find['store_id'], 'product_id' => $find['product_id'], 'unit' => $find['unit'], @@ -93,8 +93,10 @@ class WarehouseProductReturnLogic extends BaseLogic 'nums' => $params['nums'], 'return_type' => $params['return_type'], 'mark' => $params['mark'], - 'price' => $offer['price'], - 'total_price' => bcmul($params['nums'], $offer['price'], 2), + // 'price' => $offer['price'], + // 'total_price' => bcmul($params['nums'], $offer['price'], 2), + 'price' => 0, + 'total_price' => 0, ]; }