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

feat(warehouse): 添加商品状态修改功能并优化库存校验逻辑

Browse Source 
- 在 WarehouseProductStoregeController 中添加 verify 方法，用于修改商品状态
- 在 WarehouseProductStoregeLists 中添加 is_verify 字段，用于显示商品状态
- 在 BeforehandOrderLogic 中重新启用并优化库存校验逻辑，提高系统稳定性
This commit is contained in:
mkm 2025-02-07 10:49:23 +08:00
parent 4d462cbabb
commit e67ae33478
3 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/admin/controller/warehouse_product_storege/WarehouseProductStoregeController.php
View File

@ -7,7 +7,7 @@ use app\admin\controller\BaseAdminController;
use app\admin\lists\warehouse_product_storege\WarehouseProductStoregeLists;
use app\admin\logic\warehouse_product_storege\WarehouseProductStoregeLogic;
use app\admin\validate\warehouse_product_storege\WarehouseProductStoregeValidate;
use app\common\model\warehouse_product_storege\WarehouseProductStorege;
/**
* 仓库商品存储控制器
@ -88,6 +88,15 @@ class WarehouseProductStoregeController extends BaseAdminController
// $result = WarehouseProductStoregeLogic::detail($params);
// return $this->data($result);
// }
/**
* @notes 修改商品状态
* @return \think\response\Json
* @date 2024/05/31 10:53
*/
public function verify(){
$params=$this->request->post();
WarehouseProductStorege::where('id',$params['id'])->update(['is_verify'=>$params['is_verify']]);
return $this->success('操作成功',[],1,1);
}
}

3
app/admin/lists/warehouse_product_storege/WarehouseProductStoregeLists.php
View File

@ -85,7 +85,7 @@ class WarehouseProductStoregeLists extends BaseAdminDataLists implements ListsSe
}
}
return WarehouseProductStorege::where($this->searchWhere)
->field(['id', 'warehouse_id', 'product_id', 'nums', 'price', 'total_price', 'status'])
->field(['id','is_verify','warehouse_id', 'product_id', 'nums', 'price', 'total_price', 'status'])
->limit($this->limitOffset, $this->limitLength)
->order($this->sortOrder)
->select()->each(function ($item) {
@ -96,6 +96,7 @@ class WarehouseProductStoregeLists extends BaseAdminDataLists implements ListsSe
$item->image = $find->image;
$item->bar_code = $find->bar_code;
$item->price = $find->price;
$item->vip_price = $find->vip_price;
$item->cost = $find->cost;
$item->purchase = $find->purchase;
$item->store_info = $find->store_info;

19
app/admin/logic/beforehand_order/BeforehandOrderLogic.php
View File

@ -377,19 +377,20 @@ class BeforehandOrderLogic extends BaseLogic
throw new BusinessException('该订单已创建出库单');
}
$info = BeforehandOrderCartInfo::where('bhoid', $params['bhoid'])->select()->toArray();
// $product_column = array_column($info, 'product_id');
// $storege_arr=WarehouseProductStorege::where('warehouse_id', $params['warehouse_id'])->where('product_id','in',$product_column)->select();
$product_column = array_column($info, 'product_id');
$storege_arr=WarehouseProductStorege::where('warehouse_id', $params['warehouse_id'])->where('product_id','in',$product_column)->select();
foreach ($info as $k => $v) {
if ($v['pay_price'] <= 0) {
throw new BusinessException('商品价格为空 不能生成出库订单,对应id:' . $v['id']);
}
// foreach ($storege_arr as $key => $value) {
// if ($value['is_verify']==1 && $v['product_id'] == $value['product_id']) {
// if ($v['cart_num'] > $value['nums']) {
// throw new BusinessException('仓库库存不足 不能生成出库订单,对应id:' . $v['id']);
// }
// }
// }
foreach ($storege_arr as $key => $value) {
if ($value['is_verify']==1 && $v['product_id'] == $value['product_id']) {
if ($v['cart_num'] < $value['nums']) {
$store_name=StoreProduct::where('id', $v['product_id'])->withTrashed()->value('store_name');
throw new BusinessException('商品:'.$store_name.'已开启强制库存校验,库存不足，库存数量' . $value['nums'].',需求数量:' . $v['cart_num']);
}
}
}
}
$count = BeforehandOrderCartInfo::where('bhoid', $params['bhoid'])->where('cart_num', 0)->count('id');
if ($count > 0) {