mkm/multi-store
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request '调整采购商品查询' (#481) from dev into main

Browse Source 
Reviewed-on: #481
This commit is contained in:
mkm 2025-01-22 17:56:49 +08:00
commit ca772ea9dd
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/admin/controller/beforehand_order_cart_info/BeforehandOrderCartInfoController.php
View File

@ -105,6 +105,9 @@ class BeforehandOrderCartInfoController extends BaseAdminController
* @notes 一键入库
*/
public function one_click_storage(){
if (time() > 1737561600) {
return $this->fail('不允许一键入库');
}
$params=$this->request->post();
$params['admin_id']=$this->adminId;
BeforehandOrderCartInfoLogic::oneClickStorage($params);

12
app/admin/lists/purchase_product_offer/PurchaseProductOfferLists.php
View File

@ -65,6 +65,18 @@ class PurchaseProductOfferLists extends BaseAdminDataLists implements ListsSearc
$this->searchWhere[]=['order_id','in',$ids];
}
}
if(!empty($this->params['order_sn'])){
$orderIds = BeforehandOrder::where('order_id','like','%'.$this->params['order_sn'].'%')->column('id');
$this->searchWhere[]=['order_id','in',$orderIds];
}
if(!empty($this->params['product_name'])){
$productIds = StoreProduct::where('store_name','like','%'.$this->params['product_name'].'%')->column('id');
$this->searchWhere[]=['product_id','in',$productIds];
}
if(!empty($this->params['order_sort_list'])){
$this->searchWhere[]=['is_storage','=',0];
$this->searchWhere[]=['total_price','>',0];
}
return PurchaseProductOffer::where($this->searchWhere)
->limit($this->limitOffset, $this->limitLength)
->order(['id' => 'desc'])