From c3acd04bf8363de890c01b6c4110ec6b381fff1a Mon Sep 17 00:00:00 2001 From: lewis <604446095@qq.com> Date: Mon, 17 Mar 2025 14:36:02 +0800 Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=93=81=E6=BA=AF=E6=BA=90=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E6=B7=BB=E5=8A=A0=E8=B7=B3=E8=BD=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../beforehand_order/BeforehandOrderLists.php | 3 ++ .../InventoryTransferOrderLists.php | 2 +- .../ProductSourceLinkInfoLists.php | 30 +++++++++++++++++++ .../lists/store_order/StoreOrderLists.php | 2 +- .../WarehouseProductLists.php | 2 +- 5 files changed, 36 insertions(+), 3 deletions(-) diff --git a/app/admin/lists/beforehand_order/BeforehandOrderLists.php b/app/admin/lists/beforehand_order/BeforehandOrderLists.php index f5108021..0ce42cbf 100644 --- a/app/admin/lists/beforehand_order/BeforehandOrderLists.php +++ b/app/admin/lists/beforehand_order/BeforehandOrderLists.php @@ -96,6 +96,7 @@ class BeforehandOrderLists extends BaseAdminDataLists implements ListsSearchInte ->order(['id' => 'desc']) ->select()->each(function ($item)use($export) { $item['outbound'] = ''; + $item['outbound_time'] = ''; $item['order_type_name'] = ''; if ($item->admin_id) { $item->admin_name = Admin::where(['id' => $item->admin_id])->value('name'); @@ -132,6 +133,8 @@ class BeforehandOrderLists extends BaseAdminDataLists implements ListsSearchInte } if ($item['outbound_id'] > 0) { $item->outbound = '已出库|' . $item['outbound_id']; + $outboundTime = WarehouseOrder::where('id', $item['outbound_id'])->value('create_time'); + $item->outbound_time = date('Y-m-d H:i:s', $outboundTime); } if ($item['store_id'] > 0) { $item->system_store = SystemStore::where(['id' => $item['store_id']])->value('name'); diff --git a/app/admin/lists/inventory_transfer_order/InventoryTransferOrderLists.php b/app/admin/lists/inventory_transfer_order/InventoryTransferOrderLists.php index ce8b0e39..86115fe9 100644 --- a/app/admin/lists/inventory_transfer_order/InventoryTransferOrderLists.php +++ b/app/admin/lists/inventory_transfer_order/InventoryTransferOrderLists.php @@ -28,7 +28,7 @@ class InventoryTransferOrderLists extends BaseAdminDataLists implements ListsSea public function setSearch(): array { return [ - '=' => ['order_id', 'one_type', 'two_type', 'types'], + '=' => ['id', 'order_id', 'one_type', 'two_type', 'types'], ]; } diff --git a/app/admin/lists/product_source_link_info/ProductSourceLinkInfoLists.php b/app/admin/lists/product_source_link_info/ProductSourceLinkInfoLists.php index 80061173..346b64d2 100644 --- a/app/admin/lists/product_source_link_info/ProductSourceLinkInfoLists.php +++ b/app/admin/lists/product_source_link_info/ProductSourceLinkInfoLists.php @@ -4,8 +4,11 @@ namespace app\admin\lists\product_source_link_info; use app\admin\lists\BaseAdminDataLists; +use app\common\model\inventory_transfer\InventoryTransfer; use app\common\model\product_source_link_info\ProductSourceLinkInfo; use app\common\lists\ListsSearchInterface; +use app\common\model\store_order_cart_info\StoreOrderCartInfo; +use app\common\model\warehouse_product\WarehouseProduct; /** @@ -48,6 +51,7 @@ class ProductSourceLinkInfoLists extends BaseAdminDataLists implements ListsSear ->order(['id' => 'desc']) ->select() ->each(function ($item) { + $item['route'] = $this->getRoute($item); $item['type_name'] = $item->getTypeName(); }) ->toArray(); @@ -65,4 +69,30 @@ class ProductSourceLinkInfoLists extends BaseAdminDataLists implements ListsSear return ProductSourceLinkInfo::where($this->searchWhere)->count(); } + public function getRoute($item) + { + if ($item['types'] == ProductSourceLinkInfo::TypeIn) { + $path = '/procure/warehouse_product'; + $query = ['id' => $item['link_id']]; + } elseif (in_array($item['types'], [ProductSourceLinkInfo::TypeOut, ProductSourceLinkInfo::TypeStoreIn, ProductSourceLinkInfo::TypeStoreOut])) { + $path = '/sales_inventory/outbound_list'; + $query = ['id' => $item['link_id']]; + } elseif ($item['types'] == ProductSourceLinkInfo::TypeOrder) { + $path = '/order/store_order'; + $linkId = StoreOrderCartInfo::where('id', $item['link_id'])->value('oid'); + $query = ['id' => $linkId]; + } elseif ($item['types'] == ProductSourceLinkInfo::TypeOrderRefund) { + $path = '/order/store_order'; + $query = ['id' => $item['link_id']]; + } elseif (in_array($item['types'], [ProductSourceLinkInfo::TypeS2W, ProductSourceLinkInfo::TypeS2S, ProductSourceLinkInfo::TypeW2W])) { + $path = '/warehouse/inventory_transfer_order'; + $linkId = InventoryTransfer::where('id', $item['link_id'])->value('oid'); + $query = ['id' => $linkId]; + } + return [ + 'path' => $path ?? '', + 'query' => $query ?? [] + ]; + } + } \ No newline at end of file diff --git a/app/admin/lists/store_order/StoreOrderLists.php b/app/admin/lists/store_order/StoreOrderLists.php index 83aedbb0..f5491b8b 100644 --- a/app/admin/lists/store_order/StoreOrderLists.php +++ b/app/admin/lists/store_order/StoreOrderLists.php @@ -32,7 +32,7 @@ class StoreOrderLists extends BaseAdminDataLists implements ListsSearchInterface public function setSearch(): array { return [ - '=' => ['store_id', 'pay_type', 'staff_id', 'shipping_type', 'delivery_id', 'paid', 'status', 'is_writeoff', 'is_merge', 'uid'], + '=' => ['id', 'store_id', 'pay_type', 'staff_id', 'shipping_type', 'delivery_id', 'paid', 'status', 'is_writeoff', 'is_merge', 'uid'], 'between_time' => 'create_time', '%like%' => ['order_id'], ]; diff --git a/app/admin/lists/warehouse_product/WarehouseProductLists.php b/app/admin/lists/warehouse_product/WarehouseProductLists.php index 295e4b34..f724caaf 100644 --- a/app/admin/lists/warehouse_product/WarehouseProductLists.php +++ b/app/admin/lists/warehouse_product/WarehouseProductLists.php @@ -37,7 +37,7 @@ class WarehouseProductLists extends BaseAdminDataLists implements ListsSearchInt public function setSearch(): array { return [ - '=' => ['warehouse_id', 'financial_pm', 'product_id','store_id','oid','supplier_id','is_pay','code'], + '=' => ['id', 'warehouse_id', 'financial_pm', 'product_id','store_id','oid','supplier_id','is_pay','code'], 'between_time' => 'create_time' ]; }