From ffe38b81f1c99ace74474f6fe24f27b4e4375ea7 Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Sun, 11 Aug 2024 16:59:36 +0800 Subject: [PATCH 1/3] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=E5=95=86?= =?UTF-8?q?=E5=93=81=E5=BA=93=E5=AD=98=E9=80=BB=E8=BE=91=EF=BC=8C=E5=A2=9E?= =?UTF-8?q?=E5=BC=BA=E5=BA=93=E5=AD=98=E6=A3=80=E6=9F=A5=E4=B8=8E=E9=94=99?= =?UTF-8?q?=E8=AF=AF=E5=A4=84=E7=90=86=EF=BC=8C=E4=BC=98=E5=8C=96=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../StoreBranchProductLists.php | 41 ++++++++++++- .../lists/store_product/StoreProductLists.php | 5 +- .../WarehouseProductLists.php | 60 ++++++++++++++++++- .../WarehouseProductStoregeLists.php | 2 +- .../StoreBranchProductLogic.php | 6 +- 5 files changed, 108 insertions(+), 6 deletions(-) diff --git a/app/admin/lists/store_branch_product/StoreBranchProductLists.php b/app/admin/lists/store_branch_product/StoreBranchProductLists.php index ac7ed8b9..b51b9c58 100644 --- a/app/admin/lists/store_branch_product/StoreBranchProductLists.php +++ b/app/admin/lists/store_branch_product/StoreBranchProductLists.php @@ -10,13 +10,14 @@ use app\common\model\store_product_unit\StoreProductUnit; use app\common\model\system_store\SystemStore; use app\common\lists\ListsSearchInterface; use app\common\model\store_branch_product\StoreBranchProduct; +use app\common\lists\ListsExcelInterface; /** * 门店商品辅助表 * Class StoreBranchProductLists * @package app\admin\listssystem_store */ -class StoreBranchProductLists extends BaseAdminDataLists implements ListsSearchInterface +class StoreBranchProductLists extends BaseAdminDataLists implements ListsSearchInterface,ListsExcelInterface { @@ -97,4 +98,42 @@ class StoreBranchProductLists extends BaseAdminDataLists implements ListsSearchI ->count(); } + /** + * @notes 导出文件名 + * @return string + * @author 乔峰 + * @date 2022/11/24 16:17 + */ + public function setFileName(): string + { + if($this->request->get('store_id')){ + $name=SystemStore::where('id',$this->request->get('store_id'))->value('name'); + return $name.'商品列表'; + } + return '门店商品列表'; + } + + + /** + * @notes 导出字段 + * @return string[] + * @author 乔峰 + * @date 2022/11/24 16:17 + */ + public function setExcelFields(): array + { + $data=[ + 'store_name' => '商品名称', + 'store_info' => '规格', + 'unit_name' => '单位', + 'cate_name' => '分类', + 'stock' => '库存', + 'sales' => '销量', + 'purchase'=>'供货价', + 'cost'=>'商户价', + 'vip_price'=>'会员价', + 'price' => '零售价', + ]; + return $data; + } } diff --git a/app/admin/lists/store_product/StoreProductLists.php b/app/admin/lists/store_product/StoreProductLists.php index cb942673..bbbd1082 100644 --- a/app/admin/lists/store_product/StoreProductLists.php +++ b/app/admin/lists/store_product/StoreProductLists.php @@ -7,6 +7,7 @@ use app\admin\lists\BaseAdminDataLists; use app\common\model\cate\Cate; use app\common\model\store_product\StoreProduct; use app\common\lists\ListsSearchInterface; +use app\common\model\store_branch_product\StoreBranchProduct; use app\common\model\store_category\StoreCategory; use app\common\model\store_product_unit\StoreProductUnit; use app\common\model\system_store\SystemStore; @@ -65,7 +66,9 @@ class StoreProductLists extends BaseAdminDataLists implements ListsSearchInterfa ->order(['id' => 'desc']) ->select()->each(function ($item) { $item['unit_name'] = StoreProductUnit::where('id', $item['unit'])->value('name'); - $item['stock'] = WarehouseProductStorege::where('product_id', $item['id'])->sum('nums'); + $nums=WarehouseProductStorege::where('product_id', $item['id'])->sum('nums'); + $stock=StoreBranchProduct::where('store_id','<>','4')->where('product_id',$item['id'])->sum('stock'); + $item['stock'] = bcadd($nums,$stock); $item['cate_name'] = StoreCategory::where('id', $item['cate_id'])->value('name'); return $item; })?->toArray(); diff --git a/app/admin/lists/warehouse_product/WarehouseProductLists.php b/app/admin/lists/warehouse_product/WarehouseProductLists.php index ae8afc56..8183d703 100644 --- a/app/admin/lists/warehouse_product/WarehouseProductLists.php +++ b/app/admin/lists/warehouse_product/WarehouseProductLists.php @@ -10,13 +10,14 @@ use app\common\model\auth\Admin; 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; /** * 商品仓储信息列表 * Class WarehouseProductLists * @package app\admin\listswarehouse_product */ -class WarehouseProductLists extends BaseAdminDataLists implements ListsSearchInterface +class WarehouseProductLists extends BaseAdminDataLists implements ListsSearchInterface,ListsExcelInterface { public $ids; @@ -87,7 +88,9 @@ class WarehouseProductLists extends BaseAdminDataLists implements ListsSearchInt $item->admin_name=''; } if($item->product_id){ - $item->store_name=StoreProduct::where('id',$item->product_id)->value('store_name'); + $find=StoreProduct::where('id',$item->product_id)->field('image,store_name')->find(); + $item->store_name=$find->store_name; + $item->image=$find->image; }else{ $item->store_name=''; } @@ -121,5 +124,58 @@ class WarehouseProductLists extends BaseAdminDataLists implements ListsSearchInt 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' => '仓库', + 'store_name' => '商品名称', + 'financial_pm_name' => '出入库', + 'batch' => '批次', + 'nums' => '数量', + 'manufacture' => '生产日期', + 'expiration_date' => '保质期', + 'purchase' => '采购价', + 'price' => '零售', + 'total_price' => '总价', + 'create_time' => '操作时间', + ]; + }else{ + $data=[ + 'admin_name' => '操作人员', + 'warehouse_name' => '仓库', + 'store_name' => '商品名称', + 'financial_pm_name' => '出入库', + 'system_store_name'=>'门店', + 'nums' => '数量', + 'create_time' => '操作时间', + ]; + } + + return $data; + } } \ No newline at end of file diff --git a/app/admin/lists/warehouse_product_storege/WarehouseProductStoregeLists.php b/app/admin/lists/warehouse_product_storege/WarehouseProductStoregeLists.php index 408ca67d..8de434d2 100644 --- a/app/admin/lists/warehouse_product_storege/WarehouseProductStoregeLists.php +++ b/app/admin/lists/warehouse_product_storege/WarehouseProductStoregeLists.php @@ -30,7 +30,7 @@ class WarehouseProductStoregeLists extends BaseAdminDataLists implements ListsSe public function setSearch(): array { return [ - '=' => ['warehouse_id'], + '=' => ['warehouse_id','product_id'], ]; } diff --git a/app/admin/logic/store_branch_product/StoreBranchProductLogic.php b/app/admin/logic/store_branch_product/StoreBranchProductLogic.php index ce3508e3..f171dc14 100644 --- a/app/admin/logic/store_branch_product/StoreBranchProductLogic.php +++ b/app/admin/logic/store_branch_product/StoreBranchProductLogic.php @@ -51,6 +51,11 @@ class StoreBranchProductLogic extends BaseLogic */ public static function edit(array $params): bool { + $StoreProduct=StoreBranchProduct::where('id', $params['id'])->find(); + if($params['status']==1 &&$StoreProduct['price']==0){ + self::setError('商品价格不能为0,无法上架'); + return false; + } Db::startTrans(); try { $data=[ @@ -60,7 +65,6 @@ class StoreBranchProductLogic extends BaseLogic 'unit'=>$params['unit'], 'status'=>$params['status'], ]; - $StoreProduct=StoreBranchProduct::where('id', $params['id'])->find(); if(isset($params['cate_id'])){ if ($StoreProduct['cate_id'] != $params['cate_id']) { self::store_product_cate_update($params['id'], $StoreProduct['cate_id'], $StoreProduct['store_id']); From 262c73067425cf4c1920a61735578a09108af7ae Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Sun, 11 Aug 2024 17:55:09 +0800 Subject: [PATCH 2/3] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=E5=95=86?= =?UTF-8?q?=E5=93=81=E5=BA=93=E5=AD=98=E9=80=BB=E8=BE=91=EF=BC=8C=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E5=BA=93=E5=AD=98=E6=A3=80=E6=9F=A5=E4=B8=8E=E9=94=99?= =?UTF-8?q?=E8=AF=AF=E5=A4=84=E7=90=86=EF=BC=8C=E5=A2=9E=E5=BC=BA=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E5=AE=89=E5=85=A8=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../StoreBranchProductLists.php | 72 +++++++++++-------- 1 file changed, 44 insertions(+), 28 deletions(-) diff --git a/app/admin/lists/store_branch_product/StoreBranchProductLists.php b/app/admin/lists/store_branch_product/StoreBranchProductLists.php index b51b9c58..3cd42a71 100644 --- a/app/admin/lists/store_branch_product/StoreBranchProductLists.php +++ b/app/admin/lists/store_branch_product/StoreBranchProductLists.php @@ -11,13 +11,14 @@ use app\common\model\system_store\SystemStore; use app\common\lists\ListsSearchInterface; use app\common\model\store_branch_product\StoreBranchProduct; use app\common\lists\ListsExcelInterface; +use app\common\lists\ListsSortInterface; /** * 门店商品辅助表 * Class StoreBranchProductLists * @package app\admin\listssystem_store */ -class StoreBranchProductLists extends BaseAdminDataLists implements ListsSearchInterface,ListsExcelInterface +class StoreBranchProductLists extends BaseAdminDataLists implements ListsSearchInterface, ListsExcelInterface, ListsSortInterface { @@ -30,14 +31,29 @@ class StoreBranchProductLists extends BaseAdminDataLists implements ListsSearchI public function setSearch(): array { return [ - '=' => ['product_id', 'cate_id','store_id','status'], - '%pipe_like%' => ['store_name_code'=>'store_name|bar_code'], + '=' => ['product_id', 'cate_id', 'store_id', 'status'], + '%pipe_like%' => ['store_name_code' => 'store_name|bar_code'], '%like%' => ['store_name'], - '<='=> ['stock'], + '<=' => ['stock'], ]; } - - + /** + * @notes 设置支持排序字段 + * @return string[] + * @remark 格式: ['前端传过来的字段名' => '数据库中的字段名']; + */ + public function setSortFields(): array + { + return ['stock' => 'stock',]; + } + /** + * @notes 设置默认排序 + * @return string[] + */ + public function setDefaultOrder(): array + { + return ['sort' => 'desc', 'stock' => 'desc', 'id' => 'desc']; + } /** * @notes 获取门店列表列表 * @return array @@ -49,32 +65,32 @@ class StoreBranchProductLists extends BaseAdminDataLists implements ListsSearchI */ public function lists(): array { - $class_all=$this->request->get('class_all'); - $where=[]; - if($class_all){ - $arr=Cate::where('pid',$class_all)->column('id'); - if($arr){ - $arr2=Cate::where('pid','in',$arr)->column('id'); - $where[]=['cate_id','in',array_merge($arr,$arr2)]; + $class_all = $this->request->get('class_all'); + $where = []; + if ($class_all) { + $arr = Cate::where('pid', $class_all)->column('id'); + if ($arr) { + $arr2 = Cate::where('pid', 'in', $arr)->column('id'); + $where[] = ['cate_id', 'in', array_merge($arr, $arr2)]; } } - if(empty($where) && $class_all){ + if (empty($where) && $class_all) { //2或者1 - $where[]=['cate_id','=',$class_all]; + $where[] = ['cate_id', '=', $class_all]; } - if($where){ - $this->searchWhere[]=$where; + if ($where) { + $this->searchWhere[] = $where; } return StoreBranchProduct::where($this->searchWhere) - ->field(['id','store_id','product_id', 'image', 'store_name','store_info', 'cate_id', 'price', 'sales', 'stock', 'unit', 'cost','purchase', 'status','batch','vip_price','manufacturer_information']) + ->field(['id', 'store_id', 'product_id', 'image', 'store_name', 'store_info', 'cate_id', 'price', 'sales', 'stock', 'unit', 'cost', 'purchase', 'status', 'batch', 'vip_price', 'manufacturer_information']) ->when(!empty($this->adminInfo['store_id']), function ($query) { $query->where('store_id', $this->adminInfo['store_id']); }) ->limit($this->limitOffset, $this->limitLength) - ->order(['sort' => 'desc','stock'=>'desc','id' => 'desc']) + ->order($this->sortOrder) ->select() ->each(function ($item) { - $item['system_store_name']=SystemStore::where('id',$item['store_id'])->value('name'); + $item['system_store_name'] = SystemStore::where('id', $item['store_id'])->value('name'); $item['unit_name'] = StoreProductUnit::where('id', $item['unit'])->value('name'); $item['cate_name'] = StoreCategory::where('id', $item['cate_id'])->value('name'); return $item; @@ -98,7 +114,7 @@ class StoreBranchProductLists extends BaseAdminDataLists implements ListsSearchI ->count(); } - /** + /** * @notes 导出文件名 * @return string * @author 乔峰 @@ -106,9 +122,9 @@ class StoreBranchProductLists extends BaseAdminDataLists implements ListsSearchI */ public function setFileName(): string { - if($this->request->get('store_id')){ - $name=SystemStore::where('id',$this->request->get('store_id'))->value('name'); - return $name.'商品列表'; + if ($this->request->get('store_id')) { + $name = SystemStore::where('id', $this->request->get('store_id'))->value('name'); + return $name . '商品列表'; } return '门店商品列表'; } @@ -122,16 +138,16 @@ class StoreBranchProductLists extends BaseAdminDataLists implements ListsSearchI */ public function setExcelFields(): array { - $data=[ + $data = [ 'store_name' => '商品名称', 'store_info' => '规格', 'unit_name' => '单位', 'cate_name' => '分类', 'stock' => '库存', 'sales' => '销量', - 'purchase'=>'供货价', - 'cost'=>'商户价', - 'vip_price'=>'会员价', + 'purchase' => '供货价', + 'cost' => '商户价', + 'vip_price' => '会员价', 'price' => '零售价', ]; return $data; From ade922f4d58f1ab6596fd5dd3c2b5557f4a99063 Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Sun, 11 Aug 2024 20:11:20 +0800 Subject: [PATCH 3/3] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=E5=95=86?= =?UTF-8?q?=E5=93=81=E4=B8=8E=E4=BB=93=E5=BA=93=E5=BA=93=E5=AD=98=E9=80=BB?= =?UTF-8?q?=E8=BE=91=EF=BC=8C=E4=BC=98=E5=8C=96=E5=BA=93=E5=AD=98=E7=AE=A1?= =?UTF-8?q?=E7=90=86=EF=BC=8C=E5=A2=9E=E5=BC=BA=E4=BB=A3=E7=A0=81=E5=AE=89?= =?UTF-8?q?=E5=85=A8=E6=80=A7=E4=B8=8E=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../StoreBranchProductLists.php | 5 ++-- .../WarehouseProductStoregeLists.php | 23 ++++++++++++++++--- app/common/lists/ListsSortTrait.php | 4 ++-- 3 files changed, 24 insertions(+), 8 deletions(-) diff --git a/app/admin/lists/store_branch_product/StoreBranchProductLists.php b/app/admin/lists/store_branch_product/StoreBranchProductLists.php index 3cd42a71..9e3459b1 100644 --- a/app/admin/lists/store_branch_product/StoreBranchProductLists.php +++ b/app/admin/lists/store_branch_product/StoreBranchProductLists.php @@ -34,7 +34,6 @@ class StoreBranchProductLists extends BaseAdminDataLists implements ListsSearchI '=' => ['product_id', 'cate_id', 'store_id', 'status'], '%pipe_like%' => ['store_name_code' => 'store_name|bar_code'], '%like%' => ['store_name'], - '<=' => ['stock'], ]; } /** @@ -44,7 +43,7 @@ class StoreBranchProductLists extends BaseAdminDataLists implements ListsSearchI */ public function setSortFields(): array { - return ['stock' => 'stock',]; + return ['stock' => 'stock']; } /** * @notes 设置默认排序 @@ -52,7 +51,7 @@ class StoreBranchProductLists extends BaseAdminDataLists implements ListsSearchI */ public function setDefaultOrder(): array { - return ['sort' => 'desc', 'stock' => 'desc', 'id' => 'desc']; + return [ 'id' => 'desc','stock' => 'desc',]; } /** * @notes 获取门店列表列表 diff --git a/app/admin/lists/warehouse_product_storege/WarehouseProductStoregeLists.php b/app/admin/lists/warehouse_product_storege/WarehouseProductStoregeLists.php index 8de434d2..462241f0 100644 --- a/app/admin/lists/warehouse_product_storege/WarehouseProductStoregeLists.php +++ b/app/admin/lists/warehouse_product_storege/WarehouseProductStoregeLists.php @@ -10,13 +10,14 @@ use app\common\model\store_category\StoreCategory; use app\common\model\store_product\StoreProduct; use app\common\model\store_product_unit\StoreProductUnit; use app\common\model\warehouse\Warehouse; +use app\common\lists\ListsSortInterface; /** * 仓库商品存储列表 * Class WarehouseProductStoregeLists * @package app\admin\listswarehouse_product_storege */ -class WarehouseProductStoregeLists extends BaseAdminDataLists implements ListsSearchInterface +class WarehouseProductStoregeLists extends BaseAdminDataLists implements ListsSearchInterface,ListsSortInterface { public $ids; public $store_name; @@ -33,7 +34,23 @@ class WarehouseProductStoregeLists extends BaseAdminDataLists implements ListsSe '=' => ['warehouse_id','product_id'], ]; } - + /** + * @notes 设置支持排序字段 + * @return string[] + * @remark 格式: ['前端传过来的字段名' => '数据库中的字段名']; + */ + public function setSortFields(): array + { + return ['nums' => 'nums']; + } + /** + * @notes 设置默认排序 + * @return string[] + */ + public function setDefaultOrder(): array + { + return [ 'id' => 'desc','nums' => 'desc',]; + } /** * @notes 获取仓库商品存储列表 @@ -58,7 +75,7 @@ class WarehouseProductStoregeLists extends BaseAdminDataLists implements ListsSe return WarehouseProductStorege::where($this->searchWhere) ->field(['id', 'warehouse_id', 'product_id', 'nums', 'price', 'total_price', 'status']) ->limit($this->limitOffset, $this->limitLength) - ->order(['id' => 'desc']) + ->order($this->sortOrder) ->select()->each(function ($item) { $item->warehouse_name = Warehouse::where('id', $item->warehouse_id)->value('name'); $find = StoreProduct::where('id', $item->product_id)->find(); diff --git a/app/common/lists/ListsSortTrait.php b/app/common/lists/ListsSortTrait.php index 18d24975..6803de94 100644 --- a/app/common/lists/ListsSortTrait.php +++ b/app/common/lists/ListsSortTrait.php @@ -29,10 +29,10 @@ trait ListsSortTrait return $defaultOrder; } - if ($this->orderBy = 'desc') { + if ($this->orderBy == 'desc') { return [$field => 'desc']; } - if ($this->orderBy = 'asc') { + if ($this->orderBy == 'asc') { return [$field => 'asc']; } return $defaultOrder;