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

更新供应商模块

Browse Source
This commit is contained in:
yaooo 2023-12-26 11:16:47 +08:00
parent c5ce1eb731
commit e57077ebe8
3 changed files with 100 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
app/adminapi/lists/supplier/SupplierLists.php
View File

@ -18,7 +18,7 @@ namespace app\adminapi\lists\supplier;
use app\adminapi\lists\BaseAdminDataLists; use app\adminapi\lists\BaseAdminDataLists;
use app\common\model\supplier\Supplier; use app\common\model\supplier\Supplier;
use app\common\lists\ListsSearchInterface; use app\common\lists\ListsSearchInterface;
use think\facade\Db;
/** /**
* Supplier列表 * Supplier列表
@ -38,7 +38,7 @@ class SupplierLists extends BaseAdminDataLists implements ListsSearchInterface
public function setSearch(): array public function setSearch(): array
{ {
return [ return [
'=' => ['org_id', 'dept_id', 'supplier_code', 'supplier_name', 'group_id', 'category_id', 'grade'], '=' => ['s.org_id', 's.dept_id', 's.supplier_code', 's.supplier_name', 's.group_id', 's.category_id', 's.grade'],
]; ];
} }
@ -54,11 +54,18 @@ class SupplierLists extends BaseAdminDataLists implements ListsSearchInterface
*/ */
public function lists(): array public function lists(): array
{ {
return Supplier::where($this->searchWhere) return Db::name('Supplier')->alias('s')
->field(['id', 'create_user_id', 'org_id', 'dept_id', 'supplier_code', 'supplier_name', 'supplier_introduction', 'brand_category', 'photos', 'group_id', 'category_id', 'grade', 'contacts', 'contacts_sex', 'birthday', 'phone', 'email', 'address', 'remark', 'annex', 'invoice_company_name', 'taxpayer identification_number', 'bank_name', 'bank_accnout_name', 'bank_account', 'bank_address', 'init_invoice_amount', 'credit_limit', 'account_period']) ->where($this->searchWhere)
->whereNull('s.delete_time')
->leftJoin('orgs o','o.id = s.org_id')
->leftJoin('dept d','d.id = s.dept_id')
->field('s.*, d.name as dept_name, o.name as org_name')
->limit($this->limitOffset, $this->limitLength) ->limit($this->limitOffset, $this->limitLength)
->order(['id' => 'desc']) ->order(['s.id' => 'desc'])
->select() ->select()->each(function($item, $key){
//关联数据后续添加
return $item;
})
->toArray(); ->toArray();
} }
@ -71,7 +78,11 @@ class SupplierLists extends BaseAdminDataLists implements ListsSearchInterface
*/ */
public function count(): int public function count(): int
{ {
return Supplier::where($this->searchWhere)->count(); return Db::name('Supplier')->alias('s')
->where($this->searchWhere)
->whereNull('s.delete_time')
->leftJoin('orgs o','o.id = s.org_id')
->leftJoin('dept d','d.id = s.dept_id')->count();
} }
} }

117
app/adminapi/logic/supplier/SupplierLogic.php
View File

@ -41,34 +41,34 @@ class SupplierLogic extends BaseLogic
Db::startTrans(); Db::startTrans();
try { try {
Supplier::create([ Supplier::create([
'create_user_id' => $params['create_user_id'], 'create_user_id' => $params['create_user_id'] ?? 0,
'org_id' => $params['org_id'], 'org_id' => $params['org_id'] ?? 0,
'dept_id' => $params['dept_id'], 'dept_id' => $params['dept_id'] ?? 0,
'supplier_code' => $params['supplier_code'], 'supplier_code' => $params['supplier_code'] ?? '',
'supplier_name' => $params['supplier_name'], 'supplier_name' => $params['supplier_name'] ?? '',
'supplier_introduction' => $params['supplier_introduction'], 'supplier_introduction' => $params['supplier_introduction'] ?? '',
'brand_category' => $params['brand_category'], 'brand_category' => $params['brand_category'] ?? 0,
'photos' => $params['photos'], 'photos' => $params['photos'] ?? '',
'group_id' => $params['group_id'], 'group_id' => $params['group_id'] ?? 0,
'category_id' => $params['category_id'], 'category_id' => $params['category_id'] ?? 0,
'grade' => $params['grade'], 'grade' => $params['grade'] ?? 0,
'contacts' => $params['contacts'], 'contacts' => $params['contacts'] ?? '',
'contacts_sex' => $params['contacts_sex'], 'contacts_sex' => $params['contacts_sex'] ?? 0,
'birthday' => $params['birthday'], 'birthday' => $params['birthday'] ?? '',
'phone' => $params['phone'], 'phone' => $params['phone'] ?? '',
'email' => $params['email'], 'email' => $params['email'] ?? '',
'address' => $params['address'], 'address' => $params['address'] ?? '',
'remark' => $params['remark'], 'remark' => $params['remark'] ?? '',
'annex' => $params['annex'], 'annex' => $params['annex'] ?? '',
'invoice_company_name' => $params['invoice_company_name'], 'invoice_company_name' => $params['invoice_company_name'] ?? '',
'taxpayer identification_number' => $params['taxpayer identification_number'], 'taxpayer identification_number' => $params['taxpayer identification_number'] ?? '',
'bank_name' => $params['bank_name'], 'bank_name' => $params['bank_name'] ?? '',
'bank_accnout_name' => $params['bank_accnout_name'], 'bank_accnout_name' => $params['bank_accnout_name'] ?? '',
'bank_account' => $params['bank_account'], 'bank_account' => $params['bank_account'] ?? '',
'bank_address' => $params['bank_address'], 'bank_address' => $params['bank_address'] ?? '',
'init_invoice_amount' => $params['init_invoice_amount'], 'init_invoice_amount' => $params['init_invoice_amount'] ?? 0,
'credit_limit' => $params['credit_limit'], 'credit_limit' => $params['credit_limit'] ?? 0,
'account_period' => $params['account_period'], 'account_period' => $params['account_period'] ?? 0,
]); ]);
Db::commit(); Db::commit();
@ -93,34 +93,34 @@ class SupplierLogic extends BaseLogic
Db::startTrans(); Db::startTrans();
try { try {
Supplier::where('id', $params['id'])->update([ Supplier::where('id', $params['id'])->update([
'create_user_id' => $params['create_user_id'], 'create_user_id' => $params['create_user_id'] ?? 0,
'org_id' => $params['org_id'], 'org_id' => $params['org_id'] ?? 0,
'dept_id' => $params['dept_id'], 'dept_id' => $params['dept_id'] ?? 0,
'supplier_code' => $params['supplier_code'], 'supplier_code' => $params['supplier_code'] ?? '',
'supplier_name' => $params['supplier_name'], 'supplier_name' => $params['supplier_name'] ?? '',
'supplier_introduction' => $params['supplier_introduction'], 'supplier_introduction' => $params['supplier_introduction'] ?? '',
'brand_category' => $params['brand_category'], 'brand_category' => $params['brand_category'] ?? 0,
'photos' => $params['photos'], 'photos' => $params['photos'] ?? '',
'group_id' => $params['group_id'], 'group_id' => $params['group_id'] ?? 0,
'category_id' => $params['category_id'], 'category_id' => $params['category_id'] ?? 0,
'grade' => $params['grade'], 'grade' => $params['grade'] ?? 0,
'contacts' => $params['contacts'], 'contacts' => $params['contacts'] ?? '',
'contacts_sex' => $params['contacts_sex'], 'contacts_sex' => $params['contacts_sex'] ?? 0,
'birthday' => $params['birthday'], 'birthday' => $params['birthday'] ?? '',
'phone' => $params['phone'], 'phone' => $params['phone'] ?? '',
'email' => $params['email'], 'email' => $params['email'] ?? '',
'address' => $params['address'], 'address' => $params['address'] ?? '',
'remark' => $params['remark'], 'remark' => $params['remark'] ?? '',
'annex' => $params['annex'], 'annex' => $params['annex'] ?? '',
'invoice_company_name' => $params['invoice_company_name'], 'invoice_company_name' => $params['invoice_company_name'] ?? '',
'taxpayer identification_number' => $params['taxpayer identification_number'], 'taxpayer identification_number' => $params['taxpayer identification_number'] ?? '',
'bank_name' => $params['bank_name'], 'bank_name' => $params['bank_name'] ?? '',
'bank_accnout_name' => $params['bank_accnout_name'], 'bank_accnout_name' => $params['bank_accnout_name'] ?? '',
'bank_account' => $params['bank_account'], 'bank_account' => $params['bank_account'] ?? '',
'bank_address' => $params['bank_address'], 'bank_address' => $params['bank_address'] ?? '',
'init_invoice_amount' => $params['init_invoice_amount'], 'init_invoice_amount' => $params['init_invoice_amount'] ?? 0,
'credit_limit' => $params['credit_limit'], 'credit_limit' => $params['credit_limit'] ?? 0,
'account_period' => $params['account_period'], 'account_period' => $params['account_period'] ?? 0,
]); ]);
Db::commit(); Db::commit();
@ -155,6 +155,9 @@ class SupplierLogic extends BaseLogic
*/ */
public static function detail($params): array public static function detail($params): array
{ {
return Supplier::findOrEmpty($params['id'])->toArray(); $supplier = Supplier::findOrEmpty($params['id']);
$supplier->org;
$supplier->dept;
return $supplier->toArray();
} }
} }

21
app/common/model/supplier/Supplier.php
View File

@ -30,5 +30,26 @@ class Supplier extends BaseModel
protected $name = 'supplier'; protected $name = 'supplier';
protected $deleteTime = 'delete_time'; protected $deleteTime = 'delete_time';
/**
* @notes 关联org
* @return \think\model\relation\HasOne
* @author likeadmin
* @date 2023/12/19 15:18
*/
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/19 15:18
*/
public function dept()
{
return $this->hasOne(\app\common\model\dept\Dept::class, 'id', 'dept_id');
}
} }