From da35e7be6a533717aa011d947d8c5eeea6b35ed2 Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Fri, 21 Feb 2025 11:35:51 +0800 Subject: [PATCH] =?UTF-8?q?refactor(warehousing):=20=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E5=85=A5=E5=BA=93=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 新增分拣入库功能 - 修改门店入库记录控制器，使用新的仓库产品列表 --- .../BeforehandOrderCartInfoController.php | 3 + .../SystemStoreStorageController.php | 6 +- .../StoreWarehouseProductLists.php | 178 ++++++++++++++++++ 3 files changed, 185 insertions(+), 2 deletions(-) create mode 100644 app/store/lists/warehouse_product/StoreWarehouseProductLists.php diff --git a/app/admin/controller/beforehand_order_cart_info/BeforehandOrderCartInfoController.php b/app/admin/controller/beforehand_order_cart_info/BeforehandOrderCartInfoController.php index f39cd3aa..a7607721 100644 --- a/app/admin/controller/beforehand_order_cart_info/BeforehandOrderCartInfoController.php +++ b/app/admin/controller/beforehand_order_cart_info/BeforehandOrderCartInfoController.php @@ -187,6 +187,9 @@ class BeforehandOrderCartInfoController extends BaseAdminController return $this->success('操作成功', [], 1, 1); } + /** + * 分拣入库 + */ public function putInStorage() { $params = $this->request->post(); diff --git a/app/store/controller/system_store_storage/SystemStoreStorageController.php b/app/store/controller/system_store_storage/SystemStoreStorageController.php index 8507fb3a..a50fb55f 100644 --- a/app/store/controller/system_store_storage/SystemStoreStorageController.php +++ b/app/store/controller/system_store_storage/SystemStoreStorageController.php @@ -9,7 +9,7 @@ use app\admin\logic\system_store_storage\SystemStoreStorageLogic; use app\admin\validate\system_store_storage\SystemStoreStorageValidate; use app\common\model\store_branch_product\StoreBranchProduct; use app\common\model\system_store_storage\SystemStoreStorage; - +use app\store\lists\warehouse_product\StoreWarehouseProductLists; /** * 门店入库记录控制器 @@ -29,7 +29,9 @@ class SystemStoreStorageController extends BaseAdminController public function lists() { $this->request->__set('status',-1); - return $this->dataLists(new SystemStoreStorageLists()); + // return $this->dataLists(new SystemStoreStorageLists()); + return $this->dataLists(new StoreWarehouseProductLists()); + } public function edit() diff --git a/app/store/lists/warehouse_product/StoreWarehouseProductLists.php b/app/store/lists/warehouse_product/StoreWarehouseProductLists.php new file mode 100644 index 00000000..7e10ea0f --- /dev/null +++ b/app/store/lists/warehouse_product/StoreWarehouseProductLists.php @@ -0,0 +1,178 @@ + 'create_time' + ]; + } + + + /** + * @notes 获取商品仓储信息列表 + * @return array + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\DbException + * @throws \think\db\exception\ModelNotFoundException + * @author admin + * @date 2024/07/31 16:55 + */ + public function lists(): array + { + $this->searchWhere[] = ['store_id', '=', $this->adminInfo['store_id']]; //只显示当前门店的入库记录 + $this->searchWhere[] = ['financial_pm', '=',0]; + $this->searchWhere[] = ['order_type', 'in',[1, 2, 3, 4, 8]]; + return WarehouseProduct::where($this->searchWhere) + ->field(['id', 'admin_id','staff_id', 'store_id','product_id', 'nums', 'refund_nums', 'status', 'mark', 'create_time', 'order_type']) + ->limit($this->limitOffset, $this->limitLength) + ->order(['id'=>'desc','status' => 'aes']) + // ->withTrashed() + ->select()->each(function ($item) { + $item->store_name = ''; + $item->image = ''; + $item->unit_name = ''; + if ($item->store_id > 0) { + $item->system_store_name = SystemStore::where('id', $item->store_id)->value('name'); + } else { + $item->system_store_name = ''; + } + if ($item->status == 0) { + $item->status_name = '未确认'; + } elseif ($item->status == 1) { + $item->status_name = '已确认'; + } + if ($item->admin_id) { + $item->admin_name = Admin::where('id', $item->admin_id)->value('name'); + } else { + $item->admin_name = ''; + } + if ($item->staff_id) { + $item->staff_name = SystemStoreStaff::where('id', $item->staff_id)->value('staff_name'); + } else { + $item->staff_name = ''; + } + if ($item->product_id) { + $find = StoreProduct::where('id', $item->product_id)->field('image,store_name,unit')->withTrashed()->find(); + if($find){ + $item->store_name = $find->store_name; + $item->image = $find->image; + } + } + }) + ->toArray(); + } + + + /** + * @notes 获取商品仓储信息数量 + * @return int + * @author admin + * @date 2024/07/31 16:55 + */ + public function count(): int + { + if ($this->ids) { + return WarehouseProduct::whereIn('id', $this->ids)->where($this->searchWhere)->count(); + } else { + return WarehouseProduct::where($this->searchWhere)->count(); + } + } + /** + * @notes 导出文件名 + * @return string + * @author 乔峰 + * @date 2022/11/24 16:17 + */ + public function setFileName(): string + { + $financial_pm = $this->request->get('financial_pm'); + if ($financial_pm == 1) { + return '入库列表'; + } + return '出库列表'; + } + + + /** + * @notes 导出字段 + * @return string[] + * @author 乔峰 + * @date 2022/11/24 16:17 + */ + public function setExcelFields(): array + { + $financial_pm = $this->request->get('financial_pm'); + if ($financial_pm == 1) { + $data = [ + 'admin_name' => '操作人员', + 'warehouse_name' => '仓库', + 'supplier_name' => '供应商', + 'store_name' => '商品名称', + 'financial_pm_name' => '出入库', + 'code' => '入库单', + 'batch' => '批次', + 'nums' => '数量', + 'manufacture' => '生产日期', + 'expiration_date' => '保质期', + 'purchase' => '采购价', + 'price' => '零售', + 'total_price' => '总价', + 'create_time' => '操作时间', + ]; + } else { + $data = [ + 'id' => 'id', + 'admin_name' => '操作人员', + 'warehouse_name' => '仓库', + 'store_name' => '商品名称', + 'top_cate_name' => '分类', + 'store_info' => '规格', + 'unit_name' => '单位', + 'financial_pm_name' => '出入库', + 'code' => '出库单', + 'system_store_name' => '门店', + 'nums' => '数量', + 'purchase' => '供货价', + 'price' => '零售价', + 'total_price' => '供货总价', + 'create_time' => '操作时间', + ]; + } + + return $data; + } +}