From 1caae07bb9c200b7e8cd6a49a15ed2cb29ac6a7a Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Mon, 6 Jan 2025 14:15:12 +0800
Subject: [PATCH] =?UTF-8?q?feat(warehouse):=20=E4=BC=98=E5=8C=96=E4=BB=93?=
 =?UTF-8?q?=E5=BA=93=E4=BA=A7=E5=93=81=E7=BC=96=E8=BE=91=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E5=92=8C=E5=8F=98=E6=9B=B4=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 修改 WarehouseProductController 中的 edit 方法，增加 adminId 参数
- 更新 WarehouseProductLogic 中的 edit 方法，接收 adminId 参数
- 在 ChangeLogLists 中添加 admin_name 字段，关联管理员名称
- 调整 WarehouseProductLogic 中的 dec
---
 .../warehouse_product/WarehouseProductController.php   |  2 +-
 app/admin/lists/ChangeLogLists.php                     | 10 +++++++---
 .../logic/warehouse_product/WarehouseProductLogic.php  |  6 +++---
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/app/admin/controller/warehouse_product/WarehouseProductController.php b/app/admin/controller/warehouse_product/WarehouseProductController.php
index 9799ff4e..edb3c8ca 100644
--- a/app/admin/controller/warehouse_product/WarehouseProductController.php
+++ b/app/admin/controller/warehouse_product/WarehouseProductController.php
@@ -76,7 +76,7 @@ class WarehouseProductController extends BaseAdminController
     {
         $params = $this->request->post();
         $params['admin_id'] = $this->adminId;
-        $result = WarehouseProductLogic::edit($params);
+        $result = WarehouseProductLogic::edit($params,$this->adminId);
         return $this->success('编辑成功', [], 1, 1);
     }
 
diff --git a/app/admin/lists/ChangeLogLists.php b/app/admin/lists/ChangeLogLists.php
index b01da57c..c2ce43f6 100644
--- a/app/admin/lists/ChangeLogLists.php
+++ b/app/admin/lists/ChangeLogLists.php
@@ -6,7 +6,7 @@ namespace app\admin\lists;
 use app\admin\lists\BaseAdminDataLists;
 use app\common\model\ChangeLog;
 use app\common\lists\ListsSearchInterface;
-
+use app\common\model\auth\Admin;
 
 /**
  * ChangeLog列表
@@ -45,10 +45,14 @@ class ChangeLogLists extends BaseAdminDataLists implements ListsSearchInterface
     public function lists(): array
     {
         return ChangeLog::where($this->searchWhere)
-            ->field(['id', 'model', 'link_id', 'nums', 'pm', 'url', 'mark'])
+            ->field(['id', 'admin_id','model', 'link_id', 'nums', 'pm', 'url', 'mark'])
             ->limit($this->limitOffset, $this->limitLength)
             ->order(['id' => 'desc'])
-            ->select()
+            ->select()->each(function ($item) {
+                if($item->admin_id){
+                    $item->admin_name = Admin::where('id', $item->admin_id)->value('name');
+                }}
+            )
             ->toArray();
     }
 
diff --git a/app/admin/logic/warehouse_product/WarehouseProductLogic.php b/app/admin/logic/warehouse_product/WarehouseProductLogic.php
index e031fb19..52e77797 100644
--- a/app/admin/logic/warehouse_product/WarehouseProductLogic.php
+++ b/app/admin/logic/warehouse_product/WarehouseProductLogic.php
@@ -199,15 +199,15 @@ class WarehouseProductLogic extends BaseLogic
      * @author admin
      * @date 2024/07/31 16:55
      */
-    public static function edit(array $params)
+    public static function edit(array $params,$admin_id=0)
     {
         Db::startTrans();
         try {
             $find = WarehouseOrder::where('id', $params['oid'])->find();
             if ($find) {
                 $res = WarehouseProduct::where('id', $params['id'])->withTrashed()->find();
-                self::decStock($res);
-                self::incStock($res, $params);
+                self::decStock($res,$admin_id);
+                self::incStock($res, $params,$admin_id);
                 $datas = [
                     'nums' => $params['nums'],
                     'total_price' => $params['total_price'],