diff --git a/application/admin/controller/Warehousegoods.php b/application/admin/controller/Warehousegoods.php index 12356fd13c3043b78e3b636592ab1f6c7a0b75c7..b4de4b8467a7322d8bcc9c251de5317e3f5a69fb 100644 --- a/application/admin/controller/Warehousegoods.php +++ b/application/admin/controller/Warehousegoods.php @@ -80,7 +80,8 @@ class WarehouseGoods extends Common $data_params = [ 'field' => 'id,name', 'where' => [ - 'is_enable' => 1, + 'is_enable' => 1, + 'is_delete_time' => 0, ], ]; $warehouse = WarehouseService::WarehouseList($data_params); diff --git a/application/admin/form/Warehousegoods.php b/application/admin/form/Warehousegoods.php index ce79d15ad556fcb4b3069ed3d31a70f67cc74833..730a7b720445fcf82a07110afca1dfd266074730 100644 --- a/application/admin/form/Warehousegoods.php +++ b/application/admin/form/Warehousegoods.php @@ -150,10 +150,10 @@ class Warehousegoods public function WarehouseList() { $result = []; - $ids = Db::name('WarehouseGoods')->column('warehouse_id'); + $ids = array_unique(Db::name('WarehouseGoods')->column('warehouse_id')); if(!empty($ids)) { - $result = Db::name('Warehouse')->field('id,name')->where(['id'=>$ids])->select(); + $result = Db::name('Warehouse')->field('id,name')->where(['id'=>$ids, 'is_delete_time'=>0])->select(); } return $result; } diff --git a/application/admin/view/default/warehouse/index.html b/application/admin/view/default/warehouse/index.html index 4ee9a249cb9a8c62b40aba287ee0efea8efc9932..b2aec03bab3a2e3b27a012961b7c2921145ecf8a 100644 --- a/application/admin/view/default/warehouse/index.html +++ b/application/admin/view/default/warehouse/index.html @@ -6,4 +6,12 @@ 新增 {__block__} +{{/block}} + +{{block name="form_extend"}} +
1. 权重(数值越大权重越高、扣除库存按照权重依次扣除)
+2. 删除(数据仅软删除、删除后仓库将不可用、仅数据库中保留数据)
+