diff --git a/app/admin/lists/beforehand_order_cart_info/BeforehandOrderCartInfoLists.php b/app/admin/lists/beforehand_order_cart_info/BeforehandOrderCartInfoLists.php index 0dd2ef973..9f9afe3cb 100644 --- a/app/admin/lists/beforehand_order_cart_info/BeforehandOrderCartInfoLists.php +++ b/app/admin/lists/beforehand_order_cart_info/BeforehandOrderCartInfoLists.php @@ -120,6 +120,7 @@ class BeforehandOrderCartInfoLists extends BaseAdminDataLists implements ListsSe 'unit_name' => '单位', 'price' => '单价', 'total_price' => '总价', + 'mark' => '备注', ]; return $data; } diff --git a/app/admin/logic/warehouse_product/WarehouseProductLogic.php b/app/admin/logic/warehouse_product/WarehouseProductLogic.php index a567b737d..5505e2896 100644 --- a/app/admin/logic/warehouse_product/WarehouseProductLogic.php +++ b/app/admin/logic/warehouse_product/WarehouseProductLogic.php @@ -165,7 +165,7 @@ class WarehouseProductLogic extends BaseLogic $total_price = bcmul($after_nums, $params['purchase'], 2); WarehouseProductStorege::update(['nums' =>bcsub($storege['nums'], $params['nums']), 'total_price' => $total_price], ['id' => $storege['id']]); } else { - throw new BusinessException('仓库商品不存在'); + throw new BusinessException('仓库商品不存在'.'|'.$params['product_id']); } $batch_count = WarehouseProduct::where(['product_id' => $params['product_id'], 'warehouse_id' => $params['warehouse_id'], 'financial_pm' => $params['financial_pm'], 'store_id' => $params['store_id']])->count(); diff --git a/app/common/cache/AdminTokenCache.php b/app/common/cache/AdminTokenCache.php index b85645a4f..45575f999 100644 --- a/app/common/cache/AdminTokenCache.php +++ b/app/common/cache/AdminTokenCache.php @@ -5,6 +5,7 @@ namespace app\common\cache; use app\common\model\auth\Admin; +use app\common\model\auth\AdminJobs; use app\common\model\auth\AdminSession; use app\common\model\auth\SystemRole; use app\common\model\BaseModel; @@ -78,8 +79,10 @@ class AdminTokenCache extends BaseCache if(isset($auth_shop)){ $supplier_id=$auth_shop['pid']; } + $job_ids=AdminJobs::where('admin_id',$admin->id)->column('jobs_id'); $adminInfo = [ 'admin_id' => $admin->id, + 'job_ids' => $job_ids, 'supplier_id' => $supplier_id, 'root' => $admin->root, 'name' => $admin->name,