From 604cfecd1c78927b122e84789cd5312b459e466a Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Tue, 15 Oct 2024 14:10:37 +0800
Subject: [PATCH] =?UTF-8?q?1.=20=E5=9C=A8`BeforehandOrderCartInfoLists`?=
 =?UTF-8?q?=E7=B1=BB=E4=B8=AD=E6=B7=BB=E5=8A=A0=E4=BA=86=E5=A4=87=E6=B3=A8?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=88=B0=E6=98=BE=E7=A4=BA=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E4=B8=AD=E3=80=82=202.=20=E5=9C=A8`WarehouseProductLogic`?=
 =?UTF-8?q?=E7=B1=BB=E7=9A=84=E9=87=87=E8=B4=AD=E5=85=A5=E5=BA=93=E6=96=B9?=
 =?UTF-8?q?=E6=B3=95=E4=B8=AD=EF=BC=8C=E5=BD=93=E4=BB=93=E5=BA=93=E5=95=86?=
 =?UTF-8?q?=E5=93=81=E4=B8=8D=E5=AD=98=E5=9C=A8=E6=97=B6=EF=BC=8C=E5=BC=82?=
 =?UTF-8?q?=E5=B8=B8=E6=8F=90=E7=A4=BA=E4=B8=AD=E5=A2=9E=E5=8A=A0=E4=BA=86?=
 =?UTF-8?q?=E4=BA=A7=E5=93=81ID=E4=BF=A1=E6=81=AF=E3=80=82=203.=20?=
 =?UTF-8?q?=E5=9C=A8`AdminTokenCache`=E7=B1=BB=E4=B8=AD=EF=BC=8C=E7=BC=93?=
 =?UTF-8?q?=E5=AD=98=E7=AE=A1=E7=90=86=E5=91=98=E4=BF=A1=E6=81=AF=E6=97=B6?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=86=E5=B2=97=E4=BD=8DID=E6=95=B0?=
 =?UTF-8?q?=E7=BB=84=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BeforehandOrderCartInfoLists.php                           | 1 +
 app/admin/logic/warehouse_product/WarehouseProductLogic.php    | 2 +-
 app/common/cache/AdminTokenCache.php                           | 3 +++
 3 files changed, 5 insertions(+), 1 deletion(-)

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,