From 9a3b4646fe68d9f9db282dc6e965244f963b02c9 Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Tue, 11 Mar 2025 10:58:19 +0800
Subject: [PATCH] =?UTF-8?q?feat(inventory=5Ftransfer):=20=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E8=AE=A2=E5=8D=95=E5=8F=B7=E6=90=9C=E7=B4=A2=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E5=B9=B6=E6=9B=B4=E6=96=B0=E5=88=97=E8=A1=A8=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在库存调拨列表中添加订单号搜索功能
- 在列表中增加订单号字段显示
- 优化库存调拨数据查询逻辑，支持按订单号筛选
---
 .../inventory_transfer/InventoryTransferLists.php  | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/app/admin/lists/inventory_transfer/InventoryTransferLists.php b/app/admin/lists/inventory_transfer/InventoryTransferLists.php
index 858f69aa..289d7b92 100644
--- a/app/admin/lists/inventory_transfer/InventoryTransferLists.php
+++ b/app/admin/lists/inventory_transfer/InventoryTransferLists.php
@@ -10,6 +10,7 @@ use app\common\model\store_product\StoreProduct;
 use app\common\model\system_store\SystemStore;
 use app\common\model\warehouse\Warehouse;
 use app\common\lists\ListsExcelInterface;
+use app\common\model\inventory_transfer_order\InventoryTransferOrder;
 
 /**
  * 商品调拨列表
@@ -59,23 +60,23 @@ class InventoryTransferLists extends BaseAdminDataLists implements ListsSearchIn
                 return [];
             }
         }
-        if ($this->request->get('bar_code')) {
-            $this->bar_code = $this->request->get('bar_code');
-            $ids = StoreProduct::where('bar_code', 'like', '%' . $this->bar_code . '%')->column('id');
+        if ($this->request->get('order_id')) {
+            $this->store_name = $this->request->get('order_id');
+            $ids = InventoryTransferOrder::where('order_id', 'like', $this->request->get('order_id') . '%')->column('id');
             if ($ids) {
-                $this->searchWhere[] = ['product_id', 'in', $ids];
+                $this->searchWhere[] = ['oid', 'in', $ids];
                 $this->ids = $ids;
             } else {
                 return [];
             }
         }
-
         return InventoryTransfer::where($this->searchWhere)
-            ->field(['id', 'product_id', 'nums', 'one_before_nums', 'one_after_nums','two_before_nums','two_after_nums', 'one_type','two_type', 'one_id', 'two_id', 'create_time'])
+            ->field(['id','oid', 'product_id', 'nums', 'one_before_nums', 'one_after_nums','two_before_nums','two_after_nums', 'one_type','two_type', 'one_id', 'two_id', 'create_time'])
             ->limit($this->limitOffset, $this->limitLength)
             ->order(['id' => 'desc'])
             ->select()->each(function($item){
                 $find= StoreProduct::where('id',$item->product_id)->withTrashed()->field('store_name,price')->find();
+                $item->order_id= InventoryTransferOrder::where('id',$item->oid)->value('order_id');
                 $item->store_name=$find['store_name'];
                 $item->price=$find['price'];
                 $item->total_price=bcmul($find['price'],$item['nums'],2);
@@ -141,6 +142,7 @@ class InventoryTransferLists extends BaseAdminDataLists implements ListsSearchIn
     public function setExcelFields(): array
     {
         $data = [
+            'order_id' => '订单号',
             'store_name' => '商品名称',
             'one_before_nums' => '数量',
             'one_name' => '转出方',