mkm/erp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

逻辑修正：优化了采购订单列表的获取逻辑。

Browse Source
This commit is contained in:
mkm 2024-05-23 14:09:42 +08:00
parent f5ec7fced5
commit ee10e46bd1
1 changed files with 29 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
app/admin/controller/operation/OpurchaseclassController.php
View File

@ -45,14 +45,14 @@ class OpurchaseclassController extends BaseAdminController
*/
public function add()
{
$params=$this->request->post();
$order=OpurchaseclassLogic::createOpurchaseOrder(request()->userInfo,$params);
if($order==false){
$params = $this->request->post();
$order = OpurchaseclassLogic::createOpurchaseOrder(request()->userInfo, $params);
if ($order == false) {
return $this->fail(OpurchaseclassLogic::getError());
}else{
} else {
PayNotifyLogic::handle('operated', $order['number']);
//推送队列
Redis::send('push-supplier-products', ['order_id'=>$order['id']]);
Redis::send('push-supplier-products', ['order_id' => $order['id']]);
return $this->success('支付成功');
}
}
@ -77,9 +77,9 @@ class OpurchaseclassController extends BaseAdminController
public function sub_orders()
{
$id = $this->request->get('id');
$is_mer = $this->request->get('is_mer',1);
$is_mer = $this->request->get('is_mer', 1);
$page_no = $this->request->get('page_no', 1);
$result = OpurchaseclassLogic::sub_detail($id,$is_mer,$page_no);
$result = OpurchaseclassLogic::sub_detail($id, $is_mer, $page_no);
return $this->data($result);
}
@ -91,24 +91,25 @@ class OpurchaseclassController extends BaseAdminController
$id = $this->request->get('id');
$page_no = $this->request->get('page_no', 1);
$page_size = $this->request->get('page_size', 15);
$is_push = $this->request->get('is_push',0);
$where['pid']=$id;
$where['is_push'] = $is_push;
$is_push = $this->request->get('is_push', 'all');
if ($is_push != 'all') {
$where['is_push'] = $is_push;
}
$where['pid'] = $id;
$res = Opurchaseinfo::where($where)->page($page_no, $page_size)->select()
->each(function ($item) {
$find = Goods::where('id', $item['goods'])->with('unitName')->find();
if($find){
$item['goods_name'] = $find['name'];
$item['unit_name'] = $find['unit_name'];
}
$where = [
'goods_id' => $item['goods'],
'order_id' => $item['pid'],
'is_adopt' => 1
];
$item['nums_count'] = OpurchaseGoodsOffer::where($where)->sum('nums');
});
->each(function ($item) {
$find = Goods::where('id', $item['goods'])->with('unitName')->find();
if ($find) {
$item['goods_name'] = $find['name'];
$item['unit_name'] = $find['unit_name'];
}
$where = [
'goods_id' => $item['goods'],
'order_id' => $item['pid'],
'is_adopt' => 1
];
$item['nums_count'] = OpurchaseGoodsOffer::where($where)->sum('nums');
});
$data['count'] = Opurchaseinfo::where($where)->count();
$data['lists'] = $res?->toArray();
$data['page_no'] = $page_no;
@ -134,11 +135,11 @@ class OpurchaseclassController extends BaseAdminController
public function createSupplierGoods()
{
$id = $this->request->post('id');
Redis::send('push-supplier-products', ['order_id'=>$id]);
Redis::send('push-supplier-products', ['order_id' => $id]);
// $result = OpurchaseclassLogic::createSupplierGoods($params);
// if (true === $result) {
return $this->success('已推送，请刷新后查看', [], 1, 1);
return $this->success('已推送，请刷新后查看', [], 1, 1);
// }
// return $this->fail(OpurchaseclassLogic::getError());
}
@ -155,8 +156,8 @@ class OpurchaseclassController extends BaseAdminController
$type = $this->request->post('type');
$notes = $this->request->post('notes');
$nums = $this->request->post('nums');
$result = OpurchaseclassLogic::goodsOfferUpdate($id,$type,$notes,$nums);
if ($result==true) {
$result = OpurchaseclassLogic::goodsOfferUpdate($id, $type, $notes, $nums);
if ($result == true) {
return $this->success('已设置', [], 1, 1);
}
return $this->fail(OpurchaseclassLogic::getError());