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

update

Browse Source
This commit is contained in:
weiz 2024-01-04 18:42:25 +08:00
parent 5a452b23a4
commit 169de05e83
8 changed files with 242 additions and 274 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
app/adminapi/controller/quotation/QuotationController.php
View File

@ -58,37 +58,7 @@ class QuotationController extends BaseAdminController
}
return $this->fail(QuotationLogic::getError());
}
/**
* @notes 编辑报价单
* @return \think\response\Json
* @author likeadmin
* @date 2023/11/27 17:23
*/
public function edit()
{
$params = (new QuotationValidate())->post()->goCheck('edit');
$result = QuotationLogic::edit($params);
if (true === $result) {
return $this->success('编辑成功', [], 1, 1);
}
return $this->fail(QuotationLogic::getError());
}
/**
* @notes 删除报价单
* @return \think\response\Json
* @author likeadmin
* @date 2023/11/27 17:23
*/
public function delete()
{
$params = (new QuotationValidate())->post()->goCheck('delete');
QuotationLogic::delete($params);
return $this->success('删除成功', [], 1, 1);
}
/**

65
app/adminapi/controller/quotation/QuotationDetailController.php
View File

@ -41,68 +41,5 @@ class QuotationDetailController extends BaseAdminController
{
return $this->dataLists(new QuotationDetailLists());
}
/**
* @notes 添加报价明细
* @return \think\response\Json
* @author likeadmin
* @date 2023/11/27 17:59
*/
public function add()
{
$params = (new QuotationDetailValidate())->post()->goCheck('add');
$result = QuotationDetailLogic::add($params);
if (true === $result) {
return $this->success('添加成功', [], 1, 1);
}
return $this->fail(QuotationDetailLogic::getError());
}
/**
* @notes 编辑报价明细
* @return \think\response\Json
* @author likeadmin
* @date 2023/11/27 17:59
*/
public function edit()
{
$params = (new QuotationDetailValidate())->post()->goCheck('edit');
$result = QuotationDetailLogic::edit($params);
if (true === $result) {
return $this->success('编辑成功', [], 1, 1);
}
return $this->fail(QuotationDetailLogic::getError());
}
/**
* @notes 删除报价明细
* @return \think\response\Json
* @author likeadmin
* @date 2023/11/27 17:59
*/
public function delete()
{
$params = (new QuotationDetailValidate())->post()->goCheck('delete');
QuotationDetailLogic::delete($params);
return $this->success('删除成功', [], 1, 1);
}
/**
* @notes 获取报价明细详情
* @return \think\response\Json
* @author likeadmin
* @date 2023/11/27 17:59
*/
public function detail()
{
$params = (new QuotationDetailValidate())->goCheck('detail');
$result = QuotationDetailLogic::detail($params);
return $this->data($result);
}
}

29
app/adminapi/lists/quotation/QuotationDetailLists.php
View File

@ -16,6 +16,10 @@ namespace app\adminapi\lists\quotation;
use app\adminapi\lists\BaseAdminDataLists;
use app\common\model\custom\Custom;
use app\common\model\material\Material;
use app\common\model\material\MaterialClassify;
use app\common\model\quotation\Quotation;
use app\common\model\quotation\QuotationDetail;
use app\common\lists\ListsSearchInterface;
@ -38,7 +42,7 @@ class QuotationDetailLists extends BaseAdminDataLists implements ListsSearchInte
public function setSearch(): array
{
return [
'=' => ['quotation_id', 'product_id', 'product_num', 'tax_rate'],
'=' => ['quotation_id'],
];
}
@ -55,10 +59,29 @@ class QuotationDetailLists extends BaseAdminDataLists implements ListsSearchInte
public function lists(): array
{
return QuotationDetail::where($this->searchWhere)
->field(['id', 'quotation_id', 'product_id', 'product_num', 'tax_rate', 'remark'])
->field(['id', 'quotation_id', 'product_id', 'num', 'tax_rate', 'tax_inclusive_price', 'tax_inclusive_amount', 'tax_exclusive_amount', 'remark', 'create_time'])
->limit($this->limitOffset, $this->limitLength)
->order(['id' => 'desc'])
->select()
->select()->each(function($item){
$quotation = Quotation::field('custom_id,code,quotation_date,create_user')->where('id',$item['quotation_id'])->findOrEmpty();
$custom = Custom::field('name')->where('id',$quotation['custom_id'])->findOrEmpty();
$material = Material::field('first_level,second_level,three_level,name,code,specs,brand,parameter_description,unit')->where('id',$item['product_id'])->findOrEmpty();
$classify = MaterialClassify::where('id','in',[$material['first_level'],$material['second_level'],$material['three_level']])->column('name','id');
$item['quotation_code'] = $quotation['code'];
$item['quotation_date'] = $quotation['quotation_date'];
$item['quotation_create_user'] = $quotation['create_user'];
$item['custom_name'] = $custom['name'];
$item['product_first_level_name'] = $classify[$material['first_level']];
$item['product_second_level_name'] = !empty($classify[$material['second_level']]) ? $classify[$material['second_level']] : '';
$item['product_three_level_name'] = !empty($classify[$material['three_level']]) ? $classify[$material['three_level']] : '';
$item['product_name'] = $material['name'];
$item['product_code'] = $material['code'];
$item['product_specs'] = $material['specs'];
$item['product_brand'] = $material['brand'];
$item['product_parameter_description'] = $material['parameter_description'];
$item['product_unit'] = $material['unit'];
$item['tax_rate'] = $item->tax_rate_text.'%';
})
->toArray();
}

51
app/adminapi/lists/quotation/QuotationLists.php
View File

@ -16,9 +16,9 @@ namespace app\adminapi\lists\quotation;
use app\adminapi\lists\BaseAdminDataLists;
use app\common\model\custom\Custom;
use app\common\model\quotation\Quotation;
use app\common\lists\ListsSearchInterface;
use think\facade\Db;
/**
* 报价单列表
@ -38,7 +38,8 @@ class QuotationLists extends BaseAdminDataLists implements ListsSearchInterface
public function setSearch(): array
{
return [
'=' => ['q.customer_id', 'q.contacts', 'q.create_user'],
'=' => ['custom_id','invoice_type'],
'%like%' => ['code','create_user']
];
}
@ -54,22 +55,24 @@ class QuotationLists extends BaseAdminDataLists implements ListsSearchInterface
*/
public function lists(): array
{
return Db::name('Quotation')->alias('q')
->where($this->searchWhere)
->whereNull('q.delete_time')
->leftJoin('orgs o','o.id = q.org_id')
->leftJoin('dept d','d.id = q.dept_id')
->field('q.*, d.name as dept_name, o.name as org_name')
->limit($this->limitOffset, $this->limitLength)
->order(['q.id' => 'desc'])
->select()->each(function($item, $key){
//关联数据后续添加
$item['approve_no'] = '付款单号';
$item['approve_step'] = '流程步骤';
$item['approve_settle_status'] = 1;
return $item;
})
->toArray();
$params = $this->request->get(['custom_name']);
$where = [];
if(isset($params['custom_name']) && $params['custom_name'] != ''){
$custom_ids = Custom::where('name','like','%'.$params['custom_name'].'%')->column('id');
$where[] = ['custom_id','in',$custom_ids];
}
return Quotation::field('id,custom_id,code,quotation_date,create_user,invoice_type,amount_including_tax,freight,other_fee,total_amount,customer_require,remark')
->where($this->searchWhere)->where($where)->limit($this->limitOffset, $this->limitLength)
->order(['id' => 'desc'])
->select()->each(function($item){
$custom = Custom::field('name,master_name,master_phone')->where('id',$item['custom_id'])->findOrEmpty();
$item['custom_name'] = $custom['name'];
$item['custom_master_name'] = $custom['master_name'];
$item['custom_master_phone'] = $custom['master_phone'];
$item['invoice_type_text'] = $item->invoice_type_text;
return $item;
})
->toArray();
}
@ -81,11 +84,13 @@ class QuotationLists extends BaseAdminDataLists implements ListsSearchInterface
*/
public function count(): int
{
return Db::name('Quotation')->alias('q')
->where($this->searchWhere)
->whereNull('q.delete_time')
->leftJoin('orgs o','o.id = q.org_id')
->leftJoin('dept d','d.id = q.dept_id')->count();
$params = $this->request->get(['custom_name']);
$where = [];
if(isset($params['custom_name']) && $params['custom_name'] != ''){
$custom_ids = Custom::where('name','like','%'.$params['custom_name'].'%')->column('id');
$where[] = ['custom_id','in',$custom_ids];
}
return Quotation::where($this->searchWhere)->where($where)->count();
}
}

128
app/adminapi/logic/quotation/QuotationLogic.php
View File

@ -15,6 +15,10 @@
namespace app\adminapi\logic\quotation;
use app\common\model\custom\Custom;
use app\common\model\dept\Dept;
use app\common\model\dept\Orgs;
use app\common\model\dict\DictData;
use app\common\model\quotation\Quotation;
use app\common\model\quotation\QuotationDetail;
use app\common\logic\BaseLogic;
@ -39,33 +43,42 @@ class QuotationLogic extends BaseLogic
*/
public static function add(array $params): bool
{
$amount_including_tax = 0;
$quotation_detail = json_decode($params['quotation_detail'],true);
foreach($quotation_detail as &$v){
$tax_rate_dict = DictData::where('type_value','tax_rate')->column('name','value');
$amount_including_tax += $v['num'] * $v['tax_inclusive_price'];
$v['tax_inclusive_amount'] = $v['num'] * $v['tax_inclusive_price'];
$v['tax_exclusive_amount'] = $v['num'] * $v['tax_inclusive_price'] * (1- $tax_rate_dict[$v['tax_rate']] / 100);
}
Db::startTrans();
try {
$quotation = Quotation::create([
'org_id' => $params['org_id'] ?? 0,
'dept_id' => $params['dept_id'] ?? 0,
'customer_id' => $params['customer_id'] ?? 0,
'approve_id' => $params['approve_id'] ?? 0,
'quotation_date' => $params['quotation_date'] ?? '',
'contacts' => $params['contacts'] ?? '',
'contacts_phone' => $params['contacts_phone'] ?? '',
'org_id' => $params['org_id'],
'dept_id' => $params['dept_id'],
'custom_id' => $params['custom_id'],
'code' => data_unique_code('报价单'),
'quotation_date' => !empty($params['quotation_date']) ? strtotime($params['quotation_date']) : 0,
'create_user' => $params['create_user'] ?? '',
'invoice_type' => $params['invoice_type'] ?? 0,
'amount_including_tax' => $params['amount_including_tax'] ?? 0,
'freight' => $params['freight'] ?? 0,
'other_fee' => $params['other_fee'] ?? 0,
'total_amount' => $params['total_amount'] ?? 0,
'amount_including_tax' => $amount_including_tax,
'freight' => $params['freight'],
'other_fee' => $params['other_fee'],
'total_amount' => $amount_including_tax + $params['freight'] + $params['other_fee'],
'customer_require' => $params['customer_require'] ?? '',
'remark' => $params['remark'] ?? '',
'annex' => $params['annex'] ?? '',
'annex' => !empty($params['annex']) ? $params['annex'] : null,
]);
foreach ($params['product'] ?? [] as $item)
{
foreach ($quotation_detail as $item)
{
QuotationDetail::create([
'quotation_id' => $quotation->id,
'product_id' => $item['product_id'],
'product_num' => $item['product_num'],
'num' => $item['num'],
'tax_rate' => $item['tax_rate'],
'tax_inclusive_price' => $item['tax_inclusive_price'],
'tax_inclusive_amount' => $item['tax_inclusive_amount'],
'tax_exclusive_amount' => $item['tax_exclusive_amount'],
'remark' => $item['remark'] ?? ''
]);
}
@ -77,72 +90,7 @@ class QuotationLogic extends BaseLogic
return false;
}
}
/**
* @notes 编辑报价单
* @param array $params
* @return bool
* @author likeadmin
* @date 2023/11/27 17:23
*/
public static function edit(array $params): bool
{
Db::startTrans();
try {
Quotation::where('id', $params['id'])->update([
'org_id' => $params['org_id'] ?? 0,
'dept_id' => $params['dept_id'] ?? 0,
'customer_id' => $params['customer_id'] ?? 0,
'approve_id' => $params['approve_id'] ?? 0,
'quotation_date' => $params['quotation_date'] ?? '',
'contacts' => $params['contacts'] ?? '',
'contacts_phone' => $params['contacts_phone'] ?? '',
'create_user' => $params['create_user'] ?? '',
'invoice_type' => $params['invoice_type'] ?? 0,
'amount_including_tax' => $params['amount_including_tax'] ?? 0,
'freight' => $params['freight'] ?? 0,
'other_fee' => $params['other_fee'] ?? 0,
'total_amount' => $params['total_amount'] ?? 0,
'customer_require' => $params['customer_require'] ?? '',
'remark' => $params['remark'] ?? '',
'annex' => $params['annex'] ?? '',
]);
QuotationDetail::where('quotation_id', $params['id'])->update(['delete_time' =>time()]);
foreach ($params['product'] ?? [] as $item)
{
QuotationDetail::create([
'quotation_id' => $params['id'],
'product_id' => $item['product_id'],
'product_num' => $item['product_num'],
'tax_rate' => $item['tax_rate'],
'remark' => $item['remark'] ?? ''
]);
}
Db::commit();
return true;
} catch (\Exception $e) {
Db::rollback();
self::setError($e->getMessage());
return false;
}
}
/**
* @notes 删除报价单
* @param array $params
* @return bool
* @author likeadmin
* @date 2023/11/27 17:23
*/
public static function delete(array $params): bool
{
QuotationDetail::where('quotation_id', $params['id'])->update(['delete_time'=>time()]);
return Quotation::destroy($params['id']);
}
/**
* @notes 获取报价单详情
* @param $params
@ -152,12 +100,16 @@ class QuotationLogic extends BaseLogic
*/
public static function detail($params): array
{
$quotation = Quotation::findOrEmpty($params['id']);
$quotation->product;
$quotation->custom;
$quotation->org;
$quotation->dept;
$quotation->annex = json_decode($quotation->annex, true);
return $quotation->toArray();
$data = Quotation::field('id,org_id,dept_id,custom_id,quotation_date,create_user,invoice_type,amount_including_tax,freight,other_fee,total_amount,customer_require,remark,annex')->findOrEmpty($params['id']);
$org = Orgs::field('name')->where('id',$data['org_id'])->findOrEmpty();
$dept = Dept::field('name')->where('id',$data['dept_id'])->findOrEmpty();
$custom = Custom::field('name,master_name,master_phone')->where('id',$data['custom_id'])->findOrEmpty();
$data['org_name'] = $org['name'];
$data['dept_name'] = $dept['name'];
$data['custom_name'] = $custom['name'];
$data['custom_master_name'] = $custom['master_name'];
$data['custom_master_phone'] = $custom['master_phone'];
$data['invoice_type_text'] = $data->invoice_type_text;
return $data->toArray();
}
}

156
app/adminapi/validate/quotation/QuotationValidate.php
View File

@ -15,6 +15,11 @@
namespace app\adminapi\validate\quotation;
use app\common\model\custom\Custom;
use app\common\model\dept\Dept;
use app\common\model\dept\Orgs;
use app\common\model\dict\DictData;
use app\common\model\material\Material;
use app\common\validate\BaseValidate;
@ -32,18 +37,30 @@ class QuotationValidate extends BaseValidate
*/
protected $rule = [
'id' => 'require',
'customer_id' => 'require',
'approve_id' => 'require',
'product' => 'require|array|checkProduct',
'org_id' => 'require|checkOrg',
'dept_id' => 'require|checkDept',
'custom_id' => 'require|checkCustom',
'quotation_date' => 'dateFormat:Y-m-d',
'invoice_type' => 'checkInvoiceType',
'freight' => 'require|float|egt:0',
'other_fee' => 'require|float|egt:0',
'annex' => 'checkAnnex',
'quotation_detail' => 'require|checkQuotationDetail',
];
/**
* 参数描述
* @var string[]
*/
protected $field = [
'id' => 'id',
protected $message = [
'id.require' => '缺少必要参数',
'org_id.require' => '请选择组织',
'dept_id.require' => '请选择部门',
'custom_id.require' => '请选择客户',
'quotation_date.dateFormat' => '报价日期格式错误',
'freight.require' => '运费不能为空',
'freight.float' => '运费值必须是数字',
'freight.egt' => '运费值必须大于等于0',
'other_fee.require' => '其它费用不能为空',
'other_fee.float' => '其它费用值必须是数字',
'other_fee.egt' => '其它费用值必须大于等于0',
'quotation_detail.require' => '报价明细不能为空',
];
@ -65,9 +82,7 @@ class QuotationValidate extends BaseValidate
* @date 2023/11/27 17:23
*/
public function sceneEdit()
{
return $this->only(['id', 'customer_id', 'approve_id', 'product']);
}
{}
/**
@ -92,20 +107,105 @@ class QuotationValidate extends BaseValidate
{
return $this->only(['id']);
}
public function checkProduct($value, $rule, $data)
{
$firstData = $value[0] ?? [];
if (empty($firstData['product_id'])) {
return '产品ID不能为空！';
}
if (empty($firstData['product_num'])) {
return '产品数量不能为空！';
}
if (empty($firstData['tax_rate'])) {
return '产品税率不能为空！';
}
return true;
}
public function checkOrg($value): bool|string
{
$org = Orgs::where('id',$value)->findOrEmpty();
if($org->isEmpty()){
return '组织不存在';
}
return true;
}
public function checkDept($value,$rule,$data): bool|string
{
$dept = Dept::where('id',$value)->findOrEmpty();
if($dept->isEmpty()){
return '部门不存在';
}
if($dept['org_id'] != $data['org_id']){
return '部门无效';
}
return true;
}
public function checkCustom($value): bool|string
{
$custom = Custom::where('id',$value)->findOrEmpty();
if($custom->isEmpty()){
return '客户不存在';
}
return true;
}
public function checkInvoiceType($value): bool|string
{
$dictData = DictData::where('type_value','invoice_type')->column('value');
if(!in_array($value,$dictData)){
return '发票类型无效';
}
return true;
}
public function checkQuotationDetail($value,$rule,$data): bool|string
{
$quotation_detail = json_decode($value,true);
if(empty($quotation_detail) || !is_array($quotation_detail)){
return '报价明细数据格式错误';
}
foreach($quotation_detail as $v) {
if(empty($v['product_id'])){
return '请选择产品';
}else{
$product = Material::where('id',$v['product_id'])->findOrEmpty();
if($product->isEmpty()){
return '产品信息不存在';
}
}
if(empty($v['num'])){
return '数量不能为空';
}else{
if(!is_numeric($v['num']) || $v['num'] < 0){
return '数量必须是大于0的数字';
}
}
if(empty($v['tax_rate'])){
return '税率不能为空';
}else{
$tax_rate_dict_data = DictData::where('type_value','tax_rate')->column('value');
if(!in_array($v['tax_rate'],$tax_rate_dict_data)){
return '税率无效';
}
}
if(empty($v['tax_inclusive_price'])){
return '含税单价不能为空';
}else{
if(!is_numeric($v['tax_inclusive_price']) || $v['tax_inclusive_price'] < 0){
return '含税单价必须是大于0的数字';
}
}
}
return true;
}
public function checkTotalAmount($value,$rule,$data): bool|string
{
$total = $data['amount_including_tax'] + $data['freight'] + $data['other_fee'];
if($value != $total){
return '合计金额不正确';
}
return true;
}
public function checkAnnex($value): bool|string
{
if(!empty($value) && $value != ''){
$annex = json_decode($value,true);
if(empty($annex) || !is_array($annex)){
return '附件格式错误';
}
}
return true;
}
}

47
app/common/model/quotation/Quotation.php
View File

@ -16,6 +16,7 @@ namespace app\common\model\quotation;
use app\common\model\BaseModel;
use app\common\model\dict\DictData;
use think\model\concern\SoftDelete;
@ -30,41 +31,17 @@ class Quotation extends BaseModel
protected $name = 'quotation';
protected $deleteTime = 'delete_time';
/**
* @notes 关联device
* @return \think\model\relation\HasOne
* @author likeadmin
* @date 2023/11/24 16:34
*/
public function product()
public function getQuotationDateAttr($value): string
{
return $this->hasMany(\app\common\model\quotation\QuotationDetail::class, 'quotation_id', 'id');
}
public function custom()
{
return $this->belongsTo(\app\common\model\custom\Custom::class, 'customer_id');
}
/**
* @notes 关联org
* @return \think\model\relation\HasOne
* @author likeadmin
* @date 2023/12/20 11:01
*/
public function org()
{
return $this->hasOne(\app\common\model\dept\Orgs::class, 'id', 'org_id');
}
/**
* @notes 关联dept
* @return \think\model\relation\HasOne
* @author likeadmin
* @date 2023/12/20 11:01
*/
public function dept()
{
return $this->hasOne(\app\common\model\dept\Dept::class, 'id', 'dept_id');
return !empty($value) ? date('Y-m-d',$value) : '';
}
public function getInvoiceTypeTextAttr($value,$data){
$dictData = DictData::where('type_value','invoice_type')->column('name','value');
return $dictData[$data['invoice_type']];
}
public function getAnnexAttr($value){
return !empty($value) ? json_decode($value,true) : '';
}
}

8
app/common/model/quotation/QuotationDetail.php
View File

@ -16,6 +16,7 @@ namespace app\common\model\quotation;
use app\common\model\BaseModel;
use app\common\model\dict\DictData;
use think\model\concern\SoftDelete;
@ -29,6 +30,9 @@ class QuotationDetail extends BaseModel
use SoftDelete;
protected $name = 'quotation_detail';
protected $deleteTime = 'delete_time';
public function getTaxRateTextAttr($value,$data){
$dictData = DictData::where('type_value','tax_rate')->column('name','value');
return $dictData[$data['tax_rate']];
}
}