diff --git a/app/adminapi/controller/contract/ContractNegotiationController.php b/app/adminapi/controller/contract/ContractNegotiationController.php new file mode 100644 index 000000000..b24475c61 --- /dev/null +++ b/app/adminapi/controller/contract/ContractNegotiationController.php @@ -0,0 +1,108 @@ +dataLists(new ContractNegotiationLists()); + } + + + /** + * @notes 添加合同洽商 + * @return \think\response\Json + * @author likeadmin + * @date 2023/12/04 21:26 + */ + public function add() + { + $params = (new ContractNegotiationValidate())->post()->goCheck('add'); + $result = ContractNegotiationLogic::add($params); + if (true === $result) { + return $this->success('添加成功', [], 1, 1); + } + return $this->fail(ContractNegotiationLogic::getError()); + } + + + /** + * @notes 编辑合同洽商 + * @return \think\response\Json + * @author likeadmin + * @date 2023/12/04 21:26 + */ + public function edit() + { + $params = (new ContractNegotiationValidate())->post()->goCheck('edit'); + $result = ContractNegotiationLogic::edit($params); + if (true === $result) { + return $this->success('编辑成功', [], 1, 1); + } + return $this->fail(ContractNegotiationLogic::getError()); + } + + + /** + * @notes 删除合同洽商 + * @return \think\response\Json + * @author likeadmin + * @date 2023/12/04 21:26 + */ + public function delete() + { + $params = (new ContractNegotiationValidate())->post()->goCheck('delete'); + ContractNegotiationLogic::delete($params); + return $this->success('删除成功', [], 1, 1); + } + + + /** + * @notes 获取合同洽商详情 + * @return \think\response\Json + * @author likeadmin + * @date 2023/12/04 21:26 + */ + public function detail() + { + $params = (new ContractNegotiationValidate())->goCheck('detail'); + $result = ContractNegotiationLogic::detail($params); + return $this->data($result); + } + + +} \ No newline at end of file diff --git a/app/adminapi/controller/contract/ProcurementContractController.php b/app/adminapi/controller/contract/ProcurementContractController.php new file mode 100644 index 000000000..92ef97973 --- /dev/null +++ b/app/adminapi/controller/contract/ProcurementContractController.php @@ -0,0 +1,108 @@ +dataLists(new ProcurementContractLists()); + } + + + /** + * @notes 添加采购合同 + * @return \think\response\Json + * @author likeadmin + * @date 2023/12/04 22:08 + */ + public function add() + { + $params = (new ProcurementContractValidate())->post()->goCheck('add'); + $result = ProcurementContractLogic::add($params); + if (true === $result) { + return $this->success('添加成功', [], 1, 1); + } + return $this->fail(ProcurementContractLogic::getError()); + } + + + /** + * @notes 编辑采购合同 + * @return \think\response\Json + * @author likeadmin + * @date 2023/12/04 22:08 + */ + public function edit() + { + $params = (new ProcurementContractValidate())->post()->goCheck('edit'); + $result = ProcurementContractLogic::edit($params); + if (true === $result) { + return $this->success('编辑成功', [], 1, 1); + } + return $this->fail(ProcurementContractLogic::getError()); + } + + + /** + * @notes 删除采购合同 + * @return \think\response\Json + * @author likeadmin + * @date 2023/12/04 22:08 + */ + public function delete() + { + $params = (new ProcurementContractValidate())->post()->goCheck('delete'); + ProcurementContractLogic::delete($params); + return $this->success('删除成功', [], 1, 1); + } + + + /** + * @notes 获取采购合同详情 + * @return \think\response\Json + * @author likeadmin + * @date 2023/12/04 22:08 + */ + public function detail() + { + $params = (new ProcurementContractValidate())->goCheck('detail'); + $result = ProcurementContractLogic::detail($params); + return $this->data($result); + } + + +} \ No newline at end of file diff --git a/app/adminapi/controller/contract/ProcurementContractDetailController.php b/app/adminapi/controller/contract/ProcurementContractDetailController.php new file mode 100644 index 000000000..449a7ad17 --- /dev/null +++ b/app/adminapi/controller/contract/ProcurementContractDetailController.php @@ -0,0 +1,108 @@ +dataLists(new ProcurementContractDetailLists()); + } + + + /** + * @notes 添加采购明细 + * @return \think\response\Json + * @author likeadmin + * @date 2023/12/04 22:30 + */ + public function add() + { + $params = (new ProcurementContractDetailValidate())->post()->goCheck('add'); + $result = ProcurementContractDetailLogic::add($params); + if (true === $result) { + return $this->success('添加成功', [], 1, 1); + } + return $this->fail(ProcurementContractDetailLogic::getError()); + } + + + /** + * @notes 编辑采购明细 + * @return \think\response\Json + * @author likeadmin + * @date 2023/12/04 22:30 + */ + public function edit() + { + $params = (new ProcurementContractDetailValidate())->post()->goCheck('edit'); + $result = ProcurementContractDetailLogic::edit($params); + if (true === $result) { + return $this->success('编辑成功', [], 1, 1); + } + return $this->fail(ProcurementContractDetailLogic::getError()); + } + + + /** + * @notes 删除采购明细 + * @return \think\response\Json + * @author likeadmin + * @date 2023/12/04 22:30 + */ + public function delete() + { + $params = (new ProcurementContractDetailValidate())->post()->goCheck('delete'); + ProcurementContractDetailLogic::delete($params); + return $this->success('删除成功', [], 1, 1); + } + + + /** + * @notes 获取采购明细详情 + * @return \think\response\Json + * @author likeadmin + * @date 2023/12/04 22:30 + */ + public function detail() + { + $params = (new ProcurementContractDetailValidate())->goCheck('detail'); + $result = ProcurementContractDetailLogic::detail($params); + return $this->data($result); + } + + +} \ No newline at end of file diff --git a/app/adminapi/lists/contract/ContractNegotiationLists.php b/app/adminapi/lists/contract/ContractNegotiationLists.php new file mode 100644 index 000000000..aa0b1895f --- /dev/null +++ b/app/adminapi/lists/contract/ContractNegotiationLists.php @@ -0,0 +1,77 @@ + ['contract_id', 'negotiation_name'], + ]; + } + + + /** + * @notes 获取合同洽商列表 + * @return array + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\DbException + * @throws \think\db\exception\ModelNotFoundException + * @author likeadmin + * @date 2023/12/04 21:26 + */ + public function lists(): array + { + return ContractNegotiation::where($this->searchWhere) + ->field(['id', 'contract_id', 'approve_id', 'negotiation_name', 'negotiation_no', 'negotiation_amount', 'negotiation_type', 'labor_costs', 'material_costs', 'warranty_amount', 'Warranty_expire_date', 'profit', 'profit_rate']) + ->limit($this->limitOffset, $this->limitLength) + ->order(['id' => 'desc']) + ->select() + ->toArray(); + } + + + /** + * @notes 获取合同洽商数量 + * @return int + * @author likeadmin + * @date 2023/12/04 21:26 + */ + public function count(): int + { + return ContractNegotiation::where($this->searchWhere)->count(); + } + +} \ No newline at end of file diff --git a/app/adminapi/lists/contract/ProcurementContractDetailLists.php b/app/adminapi/lists/contract/ProcurementContractDetailLists.php new file mode 100644 index 000000000..50d3d307a --- /dev/null +++ b/app/adminapi/lists/contract/ProcurementContractDetailLists.php @@ -0,0 +1,77 @@ + ['procurement_contract_id', 'material_procurement_application_id'], + ]; + } + + + /** + * @notes 获取采购明细列表 + * @return array + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\DbException + * @throws \think\db\exception\ModelNotFoundException + * @author likeadmin + * @date 2023/12/04 22:30 + */ + public function lists(): array + { + return ProcurementContractDetail::where($this->searchWhere) + ->field(['id', 'procurement_contract_id', 'material_procurement_application_id', 'num', 'unit_price_including_tax', 'tax_rate', 'amount_excluding_tax', 'amount_including_tax']) + ->limit($this->limitOffset, $this->limitLength) + ->order(['id' => 'desc']) + ->select() + ->toArray(); + } + + + /** + * @notes 获取采购明细数量 + * @return int + * @author likeadmin + * @date 2023/12/04 22:30 + */ + public function count(): int + { + return ProcurementContractDetail::where($this->searchWhere)->count(); + } + +} \ No newline at end of file diff --git a/app/adminapi/lists/contract/ProcurementContractLists.php b/app/adminapi/lists/contract/ProcurementContractLists.php new file mode 100644 index 000000000..2a0f0357b --- /dev/null +++ b/app/adminapi/lists/contract/ProcurementContractLists.php @@ -0,0 +1,77 @@ + ['supplier_id', 'project_id'], + ]; + } + + + /** + * @notes 获取采购合同列表 + * @return array + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\DbException + * @throws \think\db\exception\ModelNotFoundException + * @author likeadmin + * @date 2023/12/04 22:08 + */ + public function lists(): array + { + return ProcurementContract::where($this->searchWhere) + ->field(['id', 'supplier_id', 'approve_id', 'project_id', 'contract_no', 'supplier_contract_no', 'contract_type', 'signing_date', 'pay_type', 'account_period', 'amount', 'amount_excluding_tax', 'amount_daxie', 'retention_money_rate', 'retention_money']) + ->limit($this->limitOffset, $this->limitLength) + ->order(['id' => 'desc']) + ->select() + ->toArray(); + } + + + /** + * @notes 获取采购合同数量 + * @return int + * @author likeadmin + * @date 2023/12/04 22:08 + */ + public function count(): int + { + return ProcurementContract::where($this->searchWhere)->count(); + } + +} \ No newline at end of file diff --git a/app/adminapi/logic/custom/ContractNegotiationLogic.php b/app/adminapi/logic/custom/ContractNegotiationLogic.php new file mode 100644 index 000000000..fa61c9db3 --- /dev/null +++ b/app/adminapi/logic/custom/ContractNegotiationLogic.php @@ -0,0 +1,136 @@ + $params['contract_id'], + 'approve_id' => $params['approve_id'], + 'negotiation_name' => $params['negotiation_name'], + 'negotiation_no' => $params['negotiation_no'], + 'negotiation_amount' => $params['negotiation_amount'], + 'negotiation_type' => $params['negotiation_type'], + 'labor_costs' => $params['labor_costs'], + 'material_costs' => $params['material_costs'], + 'warranty_amount' => $params['warranty_amount'], + 'Warranty_expire_date' => strtotime($params['Warranty_expire_date']), + 'profit' => $params['profit'], + 'profit_rate' => $params['profit_rate'], + 'negotiation_content' => $params['negotiation_content'], + 'negotiation_detail' => $params['negotiation_detail'], + 'negotiation_quotation' => $params['negotiation_quotation'], + 'negotiation_basis' => $params['negotiation_basis'] + ]); + + 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/12/04 21:26 + */ + public static function edit(array $params): bool + { + Db::startTrans(); + try { + ContractNegotiation::where('id', $params['id'])->update([ + 'contract_id' => $params['contract_id'], + 'approve_id' => $params['approve_id'], + 'negotiation_name' => $params['negotiation_name'], + 'negotiation_no' => $params['negotiation_no'], + 'negotiation_amount' => $params['negotiation_amount'], + 'negotiation_type' => $params['negotiation_type'], + 'labor_costs' => $params['labor_costs'], + 'material_costs' => $params['material_costs'], + 'warranty_amount' => $params['warranty_amount'], + 'Warranty_expire_date' => strtotime($params['Warranty_expire_date']), + 'profit' => $params['profit'], + 'profit_rate' => $params['profit_rate'], + 'negotiation_content' => $params['negotiation_content'], + 'negotiation_detail' => $params['negotiation_detail'], + 'negotiation_quotation' => $params['negotiation_quotation'], + 'negotiation_basis' => $params['negotiation_basis'] + ]); + + 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/12/04 21:26 + */ + public static function delete(array $params): bool + { + return ContractNegotiation::destroy($params['id']); + } + + + /** + * @notes 获取合同洽商详情 + * @param $params + * @return array + * @author likeadmin + * @date 2023/12/04 21:26 + */ + public static function detail($params): array + { + return ContractNegotiation::findOrEmpty($params['id'])->toArray(); + } +} \ No newline at end of file diff --git a/app/adminapi/logic/custom/ProcurementContractDetailLogic.php b/app/adminapi/logic/custom/ProcurementContractDetailLogic.php new file mode 100644 index 000000000..f5b6ec0cd --- /dev/null +++ b/app/adminapi/logic/custom/ProcurementContractDetailLogic.php @@ -0,0 +1,118 @@ + $params['procurement_contract_id'], + 'material_procurement_application_id' => $params['material_procurement_application_id'], + 'num' => $params['num'], + 'unit_price_including_tax' => $params['unit_price_including_tax'], + 'tax_rate' => $params['tax_rate'], + 'amount_excluding_tax' => $params['amount_excluding_tax'], + 'amount_including_tax' => $params['amount_including_tax'] + ]); + + 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/12/04 22:30 + */ + public static function edit(array $params): bool + { + Db::startTrans(); + try { + ProcurementContractDetail::where('id', $params['id'])->update([ + 'procurement_contract_id' => $params['procurement_contract_id'], + 'material_procurement_application_id' => $params['material_procurement_application_id'], + 'num' => $params['num'], + 'unit_price_including_tax' => $params['unit_price_including_tax'], + 'tax_rate' => $params['tax_rate'], + 'amount_excluding_tax' => $params['amount_excluding_tax'], + 'amount_including_tax' => $params['amount_including_tax'] + ]); + + 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/12/04 22:30 + */ + public static function delete(array $params): bool + { + return ProcurementContractDetail::destroy($params['id']); + } + + + /** + * @notes 获取采购明细详情 + * @param $params + * @return array + * @author likeadmin + * @date 2023/12/04 22:30 + */ + public static function detail($params): array + { + return ProcurementContractDetail::findOrEmpty($params['id'])->toArray(); + } +} \ No newline at end of file diff --git a/app/adminapi/logic/custom/ProcurementContractLogic.php b/app/adminapi/logic/custom/ProcurementContractLogic.php new file mode 100644 index 000000000..3177df520 --- /dev/null +++ b/app/adminapi/logic/custom/ProcurementContractLogic.php @@ -0,0 +1,136 @@ + $params['supplier_id'], + 'approve_id' => $params['approve_id'], + 'project_id' => $params['project_id'], + 'contract_no' => $params['contract_no'], + 'supplier_contract_no' => $params['supplier_contract_no'], + 'contract_type' => $params['contract_type'], + 'signing_date' => strtotime($params['signing_date']), + 'pay_type' => $params['pay_type'], + 'account_period' => $params['account_period'], + 'amount' => $params['amount'], + 'amount_excluding_tax' => $params['amount_excluding_tax'], + 'amount_daxie' => $params['amount_daxie'], + 'retention_money_rate' => $params['retention_money_rate'], + 'retention_money' => $params['retention_money'], + 'remark' => $params['remark'], + 'annex' => $params['annex'] + ]); + + 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/12/04 22:08 + */ + public static function edit(array $params): bool + { + Db::startTrans(); + try { + ProcurementContract::where('id', $params['id'])->update([ + 'supplier_id' => $params['supplier_id'], + 'approve_id' => $params['approve_id'], + 'project_id' => $params['project_id'], + 'contract_no' => $params['contract_no'], + 'supplier_contract_no' => $params['supplier_contract_no'], + 'contract_type' => $params['contract_type'], + 'signing_date' => strtotime($params['signing_date']), + 'pay_type' => $params['pay_type'], + 'account_period' => $params['account_period'], + 'amount' => $params['amount'], + 'amount_excluding_tax' => $params['amount_excluding_tax'], + 'amount_daxie' => $params['amount_daxie'], + 'retention_money_rate' => $params['retention_money_rate'], + 'retention_money' => $params['retention_money'], + 'remark' => $params['remark'], + 'annex' => $params['annex'] + ]); + + 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/12/04 22:08 + */ + public static function delete(array $params): bool + { + return ProcurementContract::destroy($params['id']); + } + + + /** + * @notes 获取采购合同详情 + * @param $params + * @return array + * @author likeadmin + * @date 2023/12/04 22:08 + */ + public static function detail($params): array + { + return ProcurementContract::findOrEmpty($params['id'])->toArray(); + } +} \ No newline at end of file diff --git a/app/adminapi/validate/contract/ContractNegotiationValidate.php b/app/adminapi/validate/contract/ContractNegotiationValidate.php new file mode 100644 index 000000000..980b95584 --- /dev/null +++ b/app/adminapi/validate/contract/ContractNegotiationValidate.php @@ -0,0 +1,94 @@ + 'require', + ]; + + + /** + * 参数描述 + * @var string[] + */ + protected $field = [ + 'id' => 'id', + ]; + + + /** + * @notes 添加场景 + * @return ContractNegotiationValidate + * @author likeadmin + * @date 2023/12/04 21:26 + */ + public function sceneAdd() + { + return $this->remove('id', true); + } + + + /** + * @notes 编辑场景 + * @return ContractNegotiationValidate + * @author likeadmin + * @date 2023/12/04 21:26 + */ + public function sceneEdit() + { + return $this->only(['id']); + } + + + /** + * @notes 删除场景 + * @return ContractNegotiationValidate + * @author likeadmin + * @date 2023/12/04 21:26 + */ + public function sceneDelete() + { + return $this->only(['id']); + } + + + /** + * @notes 详情场景 + * @return ContractNegotiationValidate + * @author likeadmin + * @date 2023/12/04 21:26 + */ + public function sceneDetail() + { + return $this->only(['id']); + } + +} \ No newline at end of file diff --git a/app/adminapi/validate/contract/ProcurementContractDetailValidate.php b/app/adminapi/validate/contract/ProcurementContractDetailValidate.php new file mode 100644 index 000000000..ee8f01527 --- /dev/null +++ b/app/adminapi/validate/contract/ProcurementContractDetailValidate.php @@ -0,0 +1,94 @@ + 'require', + ]; + + + /** + * 参数描述 + * @var string[] + */ + protected $field = [ + 'id' => 'id', + ]; + + + /** + * @notes 添加场景 + * @return ProcurementContractDetailValidate + * @author likeadmin + * @date 2023/12/04 22:30 + */ + public function sceneAdd() + { + return $this->remove('id', true); + } + + + /** + * @notes 编辑场景 + * @return ProcurementContractDetailValidate + * @author likeadmin + * @date 2023/12/04 22:30 + */ + public function sceneEdit() + { + return $this->only(['id']); + } + + + /** + * @notes 删除场景 + * @return ProcurementContractDetailValidate + * @author likeadmin + * @date 2023/12/04 22:30 + */ + public function sceneDelete() + { + return $this->only(['id']); + } + + + /** + * @notes 详情场景 + * @return ProcurementContractDetailValidate + * @author likeadmin + * @date 2023/12/04 22:30 + */ + public function sceneDetail() + { + return $this->only(['id']); + } + +} \ No newline at end of file diff --git a/app/adminapi/validate/contract/ProcurementContractValidate.php b/app/adminapi/validate/contract/ProcurementContractValidate.php new file mode 100644 index 000000000..88a430992 --- /dev/null +++ b/app/adminapi/validate/contract/ProcurementContractValidate.php @@ -0,0 +1,94 @@ + 'require', + ]; + + + /** + * 参数描述 + * @var string[] + */ + protected $field = [ + 'id' => 'id', + ]; + + + /** + * @notes 添加场景 + * @return ProcurementContractValidate + * @author likeadmin + * @date 2023/12/04 22:08 + */ + public function sceneAdd() + { + return $this->remove('id', true); + } + + + /** + * @notes 编辑场景 + * @return ProcurementContractValidate + * @author likeadmin + * @date 2023/12/04 22:08 + */ + public function sceneEdit() + { + return $this->only(['id']); + } + + + /** + * @notes 删除场景 + * @return ProcurementContractValidate + * @author likeadmin + * @date 2023/12/04 22:08 + */ + public function sceneDelete() + { + return $this->only(['id']); + } + + + /** + * @notes 详情场景 + * @return ProcurementContractValidate + * @author likeadmin + * @date 2023/12/04 22:08 + */ + public function sceneDetail() + { + return $this->only(['id']); + } + +} \ No newline at end of file diff --git a/app/common/model/contract/ContractNegotiation.php b/app/common/model/contract/ContractNegotiation.php new file mode 100644 index 000000000..41317ceae --- /dev/null +++ b/app/common/model/contract/ContractNegotiation.php @@ -0,0 +1,34 @@ +