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

Merge pull request 'dev' (#119) from dev into main

Browse Source 
Reviewed-on: #119
This commit is contained in:
mkm 2024-08-09 15:14:34 +08:00
commit fe85e166a7
2 changed files with 32 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
app/admin/controller/store_product/StoreProductController.php
View File

@ -99,20 +99,28 @@ class StoreProductController extends BaseAdminController
{
$product_arr = $this->request->post('product_arr');
$store_arr = $this->request->post('store_arr');
$stock_type = $this->request->post('stock_type',1);
$stock_type = $this->request->post('stock_type', 1);
$warehouse_id = $this->request->post('warehouse_id');
if (count($store_arr) == 1) {
$count=count($store_arr);
foreach ($product_arr as $key => $arr) {
$stock=bcmul($arr['stock'],$count);
$nums=WarehouseProductStorege::where('warehouse_id',$warehouse_id)->where('product_id',$arr['id'])->value('nums');
if($nums<$stock){
return $this->fail('商品库存不足');
}
}
if ($count == 1) {
$store_id = $store_arr[0];
foreach ($product_arr as $key => $arr) {
Redis::send('store-storage', ['product_arr' => $arr, 'store_id' => $store_id,'stock_type'=>$stock_type, 'admin_id' => $this->adminId,'warehouse_id'=>$warehouse_id]);
Redis::send('store-storage', ['product_arr' => $arr, 'store_id' => $store_id, 'stock_type' => $stock_type, 'admin_id' => $this->adminId, 'warehouse_id' => $warehouse_id]);
}
} else {
foreach ($product_arr as $key => $arr) {
foreach ($store_arr as $k => $store_id) {
Redis::send('store-storage', ['product_arr' => $arr, 'store_id' => $store_id,'stock_type'=>$stock_type, 'admin_id' => $this->adminId,'warehouse_id'=>$warehouse_id]);
Redis::send('store-storage', ['product_arr' => $arr, 'store_id' => $store_id, 'stock_type' => $stock_type, 'admin_id' => $this->adminId, 'warehouse_id' => $warehouse_id]);
}
}
}
return $this->success('已导入后台队列，请在门店入库记录中查看');
return $this->success('已导入后台队列，请在门店入库记录中查看',[],1,1);
}
}

26
app/admin/controller/system_store_storage/SystemStoreStorageController.php
View File

@ -7,7 +7,8 @@ use app\admin\controller\BaseAdminController;
use app\admin\lists\system_store_storage\SystemStoreStorageLists;
use app\admin\logic\system_store_storage\SystemStoreStorageLogic;
use app\admin\validate\system_store_storage\SystemStoreStorageValidate;
use app\common\model\store_branch_product\StoreBranchProduct;
use app\common\model\system_store_storage\SystemStoreStorage;
/**
* 门店入库记录控制器
@ -55,13 +56,24 @@ class SystemStoreStorageController extends BaseAdminController
*/
public function edit()
{
$params = (new SystemStoreStorageValidate())->post()->goCheck('edit');
$params['admin_id']=$this->adminId;
$result = SystemStoreStorageLogic::edit($params);
if (true === $result) {
return $this->success('编辑成功', [], 1, 1);
// $params = (new SystemStoreStorageValidate())->post()->goCheck('edit');
// $params['admin_id']=$this->adminId;
// $result = SystemStoreStorageLogic::edit($params);
// if (true === $result) {
// return $this->success('编辑成功', [], 1, 1);
// }
// return $this->fail(SystemStoreStorageLogic::getError());
$id = $this->request->post('id',0);
if($id==0){
return $this->fail('参数错误');
}
return $this->fail(SystemStoreStorageLogic::getError());
$res=SystemStoreStorage::where(['id' => $id])->update(['status'=>1,'staff_id'=>$this->adminId,'mark'=>'入库时间:'.date('Y-m-d H:i:s',time())]);
if($res){
$find=SystemStoreStorage::where(['id' => $id])->find();
StoreBranchProduct::where(['product_id'=>$find['product_id'],'store_id'=>$find['store_id']])->inc('stock',$find['nums'])->update();
return $this->success('操作成功',[]);
}
return $this->fail('操作失败');
}