From 9da7292a9e1684ca70004d8d4a2b20200b0946bc Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Wed, 8 Jan 2025 15:27:02 +0800
Subject: [PATCH] =?UTF-8?q?refactor(admin):=20=E4=BC=98=E5=8C=96=E5=85=A5?=
 =?UTF-8?q?=E5=BA=93=E5=8D=95=E7=A1=AE=E8=AE=A4=E6=B5=81=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 注释掉订单类型判断逻辑，统一入库单确认操作
- 移除不必要的 else 逻辑，简化代码结构
---
 .../system_store_storage/SystemStoreStorageLogic.php      | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/admin/logic/system_store_storage/SystemStoreStorageLogic.php b/app/admin/logic/system_store_storage/SystemStoreStorageLogic.php
index 9ddcf05ff..e3837097a 100644
--- a/app/admin/logic/system_store_storage/SystemStoreStorageLogic.php
+++ b/app/admin/logic/system_store_storage/SystemStoreStorageLogic.php
@@ -65,7 +65,7 @@ class SystemStoreStorageLogic extends BaseLogic
         try {
             $find=SystemStoreStorage::where(['id' => $params['id']])->find();
             if($find){
-                if($find['order_type']==1){
+                // if($find['order_type']==1){
                     $find->save(['status'=>1,'staff_id'=>$params['staff_id']??0,'admin_id'=>$params['admin_id']??0,'mark'=>'入库时间:'.date('Y-m-d H:i:s',time())]);
                     $branch_product=StoreBranchProduct::where(['product_id'=>$find['product_id'],'store_id'=>$find['store_id']])->find();
                     if($branch_product){
@@ -79,9 +79,9 @@ class SystemStoreStorageLogic extends BaseLogic
                         $storeBranchProduct->save();
                         SqlChannelLog('StoreBranchProduct', $storeBranchProduct['id'], $find['nums'], 1,Request()->url(),$admin_id);
                     }
-                }else{
-                    $find->save(['status'=>1,'staff_id'=>$params['staff_id']??0,'admin_id'=>$params['admin_id']??0,'mark'=>'确认时间:'.date('Y-m-d H:i:s',time())]);
-                }
+                // }else{
+                //     $find->save(['status'=>1,'staff_id'=>$params['staff_id']??0,'admin_id'=>$params['admin_id']??0,'mark'=>'确认时间:'.date('Y-m-d H:i:s',time())]);
+                // }
 
             }
             Db::commit();