jikimo/test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature/根据项目组区分sf代码

Browse Source
This commit is contained in:
胡尧
2025-06-23 10:49:47 +08:00
parent 92f591c3e7 149d8e287b
commit c1bafef1aa
32 changed files with 1096 additions and 346 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sf_manufacturing/controllers/main.py
View File

@@ -45,9 +45,8 @@ class JikimoSaleRoutePicking(Sf_Bf_Connect):
product.product_tmpl_id.is_customer_provided = True if item['embryo_redundancy_id'] else False
order_id.with_user(request.env.ref("base.user_admin")).sale_order_create_line(product, item)
i += 1
if kw.get('contract_file_name') and kw.get('contract_file') and kw.get('contract_code'):
order_id.create_sale_documents(kw.get('contract_file_name'), kw.get('contract_file'))
order_id.write({'contract_code': kw.get('contract_code'), 'contract_date': kw.get('contract_date')})
# BFM 内部下单 新增合同等内容补充
order_id.write_sale_documents(kw)
res['factory_order_no'] = order_id.name
order_id.confirm_to_supply_method()
except Exception as e:

19
sf_manufacturing/models/product_template.py
View File

@@ -26,6 +26,7 @@ class ResProductMo(models.Model):
model_file = fields.Binary('模型文件')
categ_type = fields.Selection(string='产品的类别', related='categ_id.type', store=True)
model_name = fields.Char('模型名称')
blank_type = fields.Selection([('圆料', '圆料'), ('方料', '方料')], string='坯料分类')
model_long = fields.Float('模型长(mm)', digits=(16, 3))
model_width = fields.Float('模型宽(mm)', digits=(16, 3))
model_height = fields.Float('模型高(mm)', digits=(16, 3))
@@ -893,14 +894,20 @@ class ResProductMo(models.Model):
if not embryo_redundancy_id:
raise UserError('请先配置模型类型内的坯料冗余')
product_name = self.generate_product_name(order_id, item, i)
# 判断参数中是否包含 坯料尺寸(长、宽、高)
blank_bool = any(value is not None and value != 0 for value in (
item.get('blank_length'), item.get('blank_width'), item.get('blank_height'))) if all(
key in item for key in ('blank_length', 'blank_width', 'blank_height')) else False
vals = {
'name': product_name,
'model_long': self.format_float(item['model_long'] + embryo_redundancy_id.long),
'model_width': self.format_float(item['model_width'] + embryo_redundancy_id.width),
'model_height': self.format_float(item['model_height'] + embryo_redundancy_id.height),
'model_volume': self.format_float((item['model_long'] + embryo_redundancy_id.long) * (
item['model_width'] + embryo_redundancy_id.width) * (
item['model_height'] + embryo_redundancy_id.height)),
'blank_type': item.get('blank_type'),
'model_long': item.get('blank_length') if blank_bool else self.format_float(item['model_long'] + embryo_redundancy_id.long),
'model_width': item.get('blank_width') if blank_bool else self.format_float(item['model_width'] + embryo_redundancy_id.width),
'model_height': item.get('blank_height') if blank_bool else self.format_float(item['model_height'] + embryo_redundancy_id.height),
'model_volume': self.format_float(((item['model_long'] + embryo_redundancy_id.long) *
(item['model_width'] + embryo_redundancy_id.width) *
(item['model_height'] + embryo_redundancy_id.height))) if not blank_bool else (
item.get('blank_length') * item.get('blank_width') * item.get('blank_height')),
'product_model_type_id': model_type.id,
'model_processing_panel': item['processing_panel_detail'],
'model_machining_precision': item['model_machining_precision'],

17
sf_manufacturing/models/sale_order.py
View File

@@ -193,6 +193,19 @@ class SaleOrder(models.Model):
'target': 'new',
'res_id': wizard.id,
}
def write_sale_documents(self, kw):
"""BFM 内部下单 内容补充 """
val = {}
if kw.get('contract_file_name') and kw.get('contract_file'):
document_id = self.create_sale_documents(kw.get('contract_file_name'), kw.get('contract_file'))
val.update({'contract_document_id': document_id.id})
if kw.get('contract_code') or kw.get('contract_date'):
val.update({'contract_code': kw.get('contract_code'), 'contract_date': kw.get('contract_date')})
if kw.get('customer_name'):
val.update({'customer_name': kw.get('customer_name')})
self.write(val)
def create_sale_documents(self, contract_file_name, contract_file):
# 创建ir.attachment记录
attachment = self.env['ir.attachment'].sudo().create({
@@ -214,9 +227,7 @@ class SaleOrder(models.Model):
'res_id': self.id,
})
self.write({
'contract_document_id': document.id
})
return document
class SaleOrderLine(models.Model):
_inherit = 'sale.order.line'