diff --git a/soong_workflow/models/soong_workflow_mixin.py b/soong_workflow/models/soong_workflow_mixin.py index 8e2051507..ef3606076 100644 --- a/soong_workflow/models/soong_workflow_mixin.py +++ b/soong_workflow/models/soong_workflow_mixin.py @@ -280,6 +280,7 @@ class SoongWorkflowMixin(models.AbstractModel): return btn_rec.with_context(cx).run() def _add_comment(self, logs, btn_rec): + trans_link_ids = [] wizard = self.env.ref("soong_workflow.view_soong_workflow_comment_wizard") # 状态列表 state_list = [i.node_name for i in btn_rec.workflow_id.node_ids.sorted('sequence')] @@ -288,7 +289,6 @@ class SoongWorkflowMixin(models.AbstractModel): self.env['trans.link'].search([]).unlink() # 退回节点根据日志进行判断 if btn_rec.name == '退回': - trans_link_ids = [] for ret in self.log_ids.search([('approval_state', '=', '2'), ('res_id', '=', self.id), ('node_btn_name', '=', '0')]): if not self.env['trans.link'].search([('name', '=', ret.name)]): self.env['trans.link'].create({ diff --git a/yuthon_property/models/property_bank_statements.py b/yuthon_property/models/property_bank_statements.py index 8c8a3d4ad..97680a0be 100644 --- a/yuthon_property/models/property_bank_statements.py +++ b/yuthon_property/models/property_bank_statements.py @@ -9,6 +9,7 @@ class PropertyBankStatements(models.Model): name = fields.Char('对方账号') company_id = fields.Many2one('yuthon.property.company', string="收款账户") + sequence_number = fields.Char('顺序号') name_account = fields.Char('对方户名') bank_branch = fields.Char('对方开户机构') bank_number = fields.Char('对方行号') diff --git a/yuthon_property/views/property_bank_statements_views.xml b/yuthon_property/views/property_bank_statements_views.xml index 44f8736b6..9ca5c5200 100644 --- a/yuthon_property/views/property_bank_statements_views.xml +++ b/yuthon_property/views/property_bank_statements_views.xml @@ -50,11 +50,9 @@ - - diff --git a/yuthon_property/wizard/property_statements_wizard.py b/yuthon_property/wizard/property_statements_wizard.py index 8d8b6a949..227fa346c 100644 --- a/yuthon_property/wizard/property_statements_wizard.py +++ b/yuthon_property/wizard/property_statements_wizard.py @@ -30,63 +30,29 @@ class PropertyStatementsWizard(models.Model): elif self.selection_bank == 'gs': self.property_bank_statements_gc_data(row) - def property_bank_statements_jh_data(self, row): - contract_ids = self.env['property.lease.contract'] - if row[2].value: - formatted_date = self.convert_date_format(row[2].value) - start_time = pd.to_datetime(formatted_date) + def property_bank_statements_gc_data(self, row): + if row[0].value: + start_time = datetime.strptime(row[0].value, '%Y-%m-%d %H:%M:%S') else: start_time = None - - if row[10].value: - formatted_date = self.convert_date_format1(row[10].value) - journal_date = pd.to_datetime(formatted_date) - else: - journal_date = None - - name = row[8].value - company_id = self.env['yuthon.property.company'].search([('name', '=', row[1].value)]) - name_account = row[7].value - voucher_type = row[15].value - voucher_type_dict = {'电子转账凭证': 'electronic_transfer', '电汇凭证': 'telegraphic_transfer'} - voucher_type = voucher_type_dict.get(voucher_type) - remake = row[12].value - original_amount = row[4].value - bank_branch = row[9].value - account_code = row[13].value - number = row[16].value - extract = row[11].value - property_ids = [] + name = row[4].value + name_account = row[1].value + remake = row[2].value + original_amount = row[3].value + cleaned_amount = original_amount.replace(',', '') # 移除逗号 + float_amount = float(cleaned_amount) + sequence_number = row[5].value bank_data = { 'name': name, - 'contract_ids':[(6, 0, contract_ids.ids)] if contract_ids else [], - 'property_ids':[(6, 0, property_ids)], - 'company_id': company_id.id, + 'original_amount': float_amount, + 'sequence_number': sequence_number, 'start_time': start_time, 'name_account': name_account, - 'voucher_type': voucher_type, - 'original_amount':original_amount, - 'journal_date':journal_date, - 'bank_branch':bank_branch, - 'extract':extract, - 'account_code':account_code, - 'number':number, 'remake':remake, } - if float(row[4].value) != 0: - self.env['property.bank.statements'].create(bank_data) - else: - pass + self.env['property.bank.statements'].create(bank_data) - def convert_date_format(self,date_str): - pattern = r'(\d{4})(\d{2})(\d{2}) (\d{2}:\d{2}:\d{2})' - return re.sub(pattern, r'\1/\2/\3 \4', date_str) - - def convert_date_format1(self,date_str): - pattern = r'(\d{4})(\d{2})(\d{2})' - return re.sub(pattern, r'\1/\2/\3', date_str) - - def property_bank_statements_gc_data(self, row): + def property_bank_statements_jh_data(self, row): message = row[18].value if row[2].value: start_time = pd.to_datetime(row[2].value) diff --git a/yuthon_property_approval/views/inherit_yuthon_property_views.xml b/yuthon_property_approval/views/inherit_yuthon_property_views.xml index 092109e42..8a430ff38 100644 --- a/yuthon_property_approval/views/inherit_yuthon_property_views.xml +++ b/yuthon_property_approval/views/inherit_yuthon_property_views.xml @@ -402,16 +402,6 @@