From 28db13348b7d7017a24f106198cff41fc7045159 Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Wed, 29 May 2024 14:32:33 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E4=BA=86=E4=BE=9B?= =?UTF-8?q?=E5=BA=94=E5=95=86=E6=8A=A5=E4=BB=B7=E5=85=A8=E9=83=A8=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E5=8A=9F=E8=83=BD=EF=BC=8C=E5=B9=B6=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E4=BA=86=E6=8A=A5=E4=BB=B7=E6=9B=B4=E6=96=B0=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../OpurchaseGoodsOfferController.php | 8 ++ .../operation/OpurchaseclassController.php | 9 +- .../operation/OpurchaseclassofferAllLists.php | 107 ++++++++++++++++++ .../logic/operation/OpurchaseclassLogic.php | 2 + 4 files changed, 125 insertions(+), 1 deletion(-) create mode 100644 app/admin/lists/operation/OpurchaseclassofferAllLists.php diff --git a/app/admin/controller/operation/OpurchaseGoodsOfferController.php b/app/admin/controller/operation/OpurchaseGoodsOfferController.php index e611614..098814e 100644 --- a/app/admin/controller/operation/OpurchaseGoodsOfferController.php +++ b/app/admin/controller/operation/OpurchaseGoodsOfferController.php @@ -3,6 +3,7 @@ namespace app\admin\controller\operation; use app\admin\controller\BaseAdminController; +use app\admin\lists\operation\OpurchaseclassofferAllLists; use app\admin\lists\operation\OpurchaseclassofferLists; use app\api\logic\operation\OpurchaseGoodsOfferLogic; use app\api\validate\OpurchaseGoodsOfferValidate; @@ -18,6 +19,13 @@ class OpurchaseGoodsOfferController extends BaseAdminController return $this->dataLists(new OpurchaseclassofferLists()); } + /** + * 供应商报价全部列表 + */ + public function all_lists() + { + return $this->dataLists(new OpurchaseclassofferAllLists()); + } /** * @notes 供应商报价日期列表 diff --git a/app/admin/controller/operation/OpurchaseclassController.php b/app/admin/controller/operation/OpurchaseclassController.php index 38124ba..81fce83 100644 --- a/app/admin/controller/operation/OpurchaseclassController.php +++ b/app/admin/controller/operation/OpurchaseclassController.php @@ -170,10 +170,17 @@ class OpurchaseclassController extends BaseAdminController $order_code=$this->request->post('order_code'); if($id){ Cashierclass::where('id',$id)->update(['is_stream'=>1,'stream_admin_id'=>$this->request->adminId,'stream_time'=>time()]); + OpurchaseGoodsOffer::where('order_id',$id)->update(['is_stream'=>1,'stream_admin_id'=>$this->request->adminId,'stream_time'=>time()]); return $this->success('更新成功',[],1,1); } if($order_code){ - Cashierclass::where('number',$order_code)->update(['is_stream'=>1,'stream_admin_id'=>$this->request->adminId,'stream_time'=>time()]); + $find=Cashierclass::where('number',$order_code)->find(); + if($find){ + $find->save(['is_stream'=>1,'stream_admin_id'=>$this->request->adminId,'stream_time'=>time()]); + OpurchaseGoodsOffer::where('order_id',$find['id'])->update(['is_stream'=>1,'stream_admin_id'=>$this->request->adminId,'stream_time'=>time()]); + + } + return $this->success('更新成功',[],1,1); } return $this->fail('没有任何更新'); diff --git a/app/admin/lists/operation/OpurchaseclassofferAllLists.php b/app/admin/lists/operation/OpurchaseclassofferAllLists.php new file mode 100644 index 0000000..b4d7f9d --- /dev/null +++ b/app/admin/lists/operation/OpurchaseclassofferAllLists.php @@ -0,0 +1,107 @@ + ['is_adopt', 'is_storage', 'is_retrieval'], + 'between_time' => 'create_time' + ]; + } + + /** + * @notes 设置支持排序字段 + * @return string[] + * @date 2021/12/29 10:07 + * @remark 格式: ['前端传过来的字段名' => '数据库中的字段名']; + */ + public function setSortFields(): array + { + return ['id' => 'id']; + } + + + /** + * @notes 设置默认排序 + * @return string[] + * @date 2021/12/29 10:06 + */ + public function setDefaultOrder(): array + { + return ['id' => 'desc']; + } + /** + * @notes 获取采购供应链商户报价列表 + * @return array + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\DbException + * @throws \think\db\exception\ModelNotFoundException + * @author likeadmin + * @date 2024/04/27 11:26 + */ + public function lists(): array + { + $list = OpurchaseGoodsOffer::where($this->searchWhere) + ->limit($this->limitOffset, $this->limitLength) + ->order($this->sortOrder) + ->select()->each(function ($item) { + $find = Goods::where('id', $item['goods_id'])->with('unitName')->find(); + if ($find) { + $item['goods_name'] = $find['name']; + $item['unit_name'] = $find['unit_name']; + } + if($item['stream_admin_id']){ + $item['stream_admin_name']=Admin::where('id', $item['stream_admin_id'])->value('name'); + }else{ + $item['stream_admin_name']=''; + } + if($item['storage_admin_id']){ + $item['storage_admin_name']=Admin::where('id', $item['storage_admin_id'])->value('name'); + }else{ + $item['storage_admin_name']=''; + } + + $item['supplier_name'] = Supplier::where('id', $item['supplier_id'])->value('mer_name'); + })->toArray(); + + + return $list; + } + + + /** + * @notes 获取采购供应链商户报价数量 + * @return int + * @author likeadmin + * @date 2024/04/27 11:26 + */ + public function count(): int + { + return OpurchaseGoodsOffer::where($this->searchWhere)->count(); + } +} diff --git a/app/admin/logic/operation/OpurchaseclassLogic.php b/app/admin/logic/operation/OpurchaseclassLogic.php index f07e94d..55c4a9f 100644 --- a/app/admin/logic/operation/OpurchaseclassLogic.php +++ b/app/admin/logic/operation/OpurchaseclassLogic.php @@ -17,6 +17,7 @@ use app\common\model\supplier\SupplierBindGoods; use support\Log; use think\facade\Db; use app\common\service\JgPushService; +use app\Request; /** * 采购订单逻辑 @@ -254,6 +255,7 @@ class OpurchaseclassLogic extends BaseLogic $find->notes = $notes; $find->before_nums = $find->nums; $find->nums = $nums; + $find->storage_admin_id=Request()->adminId; $price=0; if ($nums != 0) { $price = bcmul($find['price'], $nums, 2);