From 1aceb8f58e6b40454805760111bd66edb2c47ba3 Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Wed, 27 Nov 2024 14:13:31 +0800
Subject: [PATCH 1/2] =?UTF-8?q?feat(warehouse):=20=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E5=85=A5=E5=BA=93=E5=8D=95=E5=92=8C=E5=87=BA=E5=BA=93=E5=8D=95?=
 =?UTF-8?q?=E7=9A=84=20code=20=E5=AD=97=E6=AE=B5=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在仓库产品列表中添加了 code 字段，用于显示入库单和出库单的编号
- 分别在入库和出库的字段定义中加入了 'code' => '入库单' 和 'code' => '出库单' 的映射
---
 app/admin/lists/warehouse_product/WarehouseProductLists.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/admin/lists/warehouse_product/WarehouseProductLists.php b/app/admin/lists/warehouse_product/WarehouseProductLists.php
index ffed56121..48fddd180 100644
--- a/app/admin/lists/warehouse_product/WarehouseProductLists.php
+++ b/app/admin/lists/warehouse_product/WarehouseProductLists.php
@@ -185,6 +185,7 @@ class WarehouseProductLists extends BaseAdminDataLists implements ListsSearchInt
                 'supplier_name' => '供应商',
                 'store_name' => '商品名称',
                 'financial_pm_name' => '出入库',
+                'code' => '入库单',
                 'batch' => '批次',
                 'nums' => '数量',
                 'manufacture' => '生产日期',
@@ -204,6 +205,7 @@ class WarehouseProductLists extends BaseAdminDataLists implements ListsSearchInt
                 'store_info' => '规格',
                 'unit_name' => '单位',
                 'financial_pm_name' => '出入库',
+                'code' => '出库单',
                 'system_store_name' => '门店',
                 'nums' => '数量',
                 'purchase' => '供货价',

From 14247dc4ea153d2dc4fb55c3e43220ad5ce9647a Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Wed, 27 Nov 2024 14:13:57 +0800
Subject: [PATCH 2/2] =?UTF-8?q?feat(warehouse):=20=E4=BB=93=E5=BA=93?=
 =?UTF-8?q?=E4=BA=A7=E5=93=81=E5=88=97=E8=A1=A8=E5=A2=9E=E5=8A=A0=20code?=
 =?UTF-8?q?=20=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在仓库产品列表中添加 code 字段，以便于显示产品编号
---
 app/admin/lists/warehouse_product/WarehouseProductLists.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/admin/lists/warehouse_product/WarehouseProductLists.php b/app/admin/lists/warehouse_product/WarehouseProductLists.php
index 48fddd180..320a6586c 100644
--- a/app/admin/lists/warehouse_product/WarehouseProductLists.php
+++ b/app/admin/lists/warehouse_product/WarehouseProductLists.php
@@ -73,7 +73,7 @@ class WarehouseProductLists extends BaseAdminDataLists implements ListsSearchInt
             }
         }
         return WarehouseProduct::where($this->searchWhere)
-            ->field(['id', 'pay_type','oid','admin_id','supplier_id', 'store_id', 'warehouse_id', 'product_id', 'financial_pm', 'batch', 'nums', 'price', 'purchase', 'cost', 'total_price', 'manufacture', 'expiration_date', 'status', 'mark', 'create_time','is_pay'])
+            ->field(['id', 'code','pay_type','oid','admin_id','supplier_id', 'store_id', 'warehouse_id', 'product_id', 'financial_pm', 'batch', 'nums', 'price', 'purchase', 'cost', 'total_price', 'manufacture', 'expiration_date', 'status', 'mark', 'create_time','is_pay'])
             ->limit($this->limitOffset, $this->limitLength)
             ->order(['id' => 'desc'])
             ->withTrashed()