From 3d47bb1b5d5bbb94521371a0bf3f28df123a4d34 Mon Sep 17 00:00:00 2001
From: lewis <604446095@qq.com>
Date: Mon, 14 Apr 2025 17:30:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A2=84=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E5=95=86=E5=93=81=E9=80=80=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../logic/warehouse_product/WarehouseProductLogic.php    | 2 +-
 .../WarehouseProductReturnLogic.php                      | 9 ++-------
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/app/admin/logic/warehouse_product/WarehouseProductLogic.php b/app/admin/logic/warehouse_product/WarehouseProductLogic.php
index 376af570d..fa9004830 100644
--- a/app/admin/logic/warehouse_product/WarehouseProductLogic.php
+++ b/app/admin/logic/warehouse_product/WarehouseProductLogic.php
@@ -224,7 +224,7 @@ class WarehouseProductLogic extends BaseLogic
                 $res = WarehouseProduct::where('id', $params['id'])->withTrashed()->find();
                 $updateNums = bcsub($params['nums'], $res['nums'],2);
                 if ($updateNums != 0) {
-                    if ($res['status'] == 1) {
+                    if ($res['status'] == 1 && $res['store_id'] > 0) {
                         throw new BusinessException('门店已确认入库，不能修改数量');
                     }
                     $storageNum = $res['financial_pm'] == 0 ? -$updateNums : $updateNums;
diff --git a/app/admin/logic/warehouse_product_return/WarehouseProductReturnLogic.php b/app/admin/logic/warehouse_product_return/WarehouseProductReturnLogic.php
index 7f4edb2d1..01a013dbd 100644
--- a/app/admin/logic/warehouse_product_return/WarehouseProductReturnLogic.php
+++ b/app/admin/logic/warehouse_product_return/WarehouseProductReturnLogic.php
@@ -113,13 +113,8 @@ class WarehouseProductReturnLogic extends BaseLogic
                     }
                     $find->save(['nums' => $nums, 'total_price' => $total_price]);
                     $total_price = WarehouseProduct::where('oid', $find['oid'])->sum('total_price');
-                    if ($nums > 0) {
-                        WarehouseOrder::where(['id' => $find['oid']])->update(['total_price' => $total_price]);
-                        BeforehandOrder::update(['pay_price' => $total_price], ['id' => $params['bhoid']]);
-                    } elseif ($nums == 0) {
-                        WarehouseOrder::where(['id' => $find['oid']])->update(['total_price' => $total_price]);
-                        BeforehandOrder::update(['pay_price' => $total_price], ['id' => $params['bhoid']]);
-                    }
+                    WarehouseOrder::where(['id' => $find['oid']])->update(['total_price' => $total_price]);
+                    BeforehandOrder::update(['pay_price' => $total_price, 'total_price' => $total_price], ['id' => $params['bhoid']]);
                     $res=WarehouseProductStorege::where(['product_id' => $find['product_id'], 'warehouse_id' => $find['warehouse_id']])->find();
                     $res->save(['nums' =>bcadd( $res['nums'],$params['nums'],2)]);
                     SqlChannelLog('WarehouseProductStorege', $res['id'], $params['nums'], 1, Request()->url(),$params['admin_id']);