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

Accept Merge Request #2212: (feature/处理sf.t更新报错 -> develop)

Browse Source 
Merge Request: bfm内部下单新增坯料长宽高同步到sf产品-加工参数-坯料尺寸的长宽高

Created By: @禹翔辉
Reviewed By: @胡尧
Approved By: @胡尧 
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2212
This commit is contained in:
禹翔辉
2025-06-18 17:02:57 +08:00
committed by Coding
parent f45a46255b 790dd3dd05
commit e55625e4b6
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sf_dlm/models/product_template.py
View File

@@ -76,9 +76,9 @@ class ResProductTemplate(models.Model):
vals = { vals = {
'name': '%s-%s-%s' % ('P', order_id.name, i), 'name': '%s-%s-%s' % ('P', order_id.name, i),
'blank_type': item.get('blank_type'), 'blank_type': item.get('blank_type'),
'model_long': item['model_long'] + model_type.embryo_tolerance, 'model_long': item.get('blank_length') if item.get('blank_length') else item['model_long'] + model_type.embryo_tolerance,
'model_width': item['model_width'] + model_type.embryo_tolerance, 'model_width': item.get('blank_width') if item.get('blank_width') else item['model_width'] + model_type.embryo_tolerance,
'model_height': item['model_height'] + model_type.embryo_tolerance, 'model_height': item.get('blank_height') if item.get('blank_height') else item['model_height'] + model_type.embryo_tolerance,
'model_volume': (item['model_long'] + model_type.embryo_tolerance) * ( 'model_volume': (item['model_long'] + model_type.embryo_tolerance) * (
item['model_width'] + model_type.embryo_tolerance) * ( item['model_width'] + model_type.embryo_tolerance) * (
item['model_height'] + model_type.embryo_tolerance), item['model_height'] + model_type.embryo_tolerance),

6
sf_manufacturing/models/product_template.py
View File

@@ -897,9 +897,9 @@ class ResProductMo(models.Model):
vals = { vals = {
'name': product_name, 'name': product_name,
'blank_type': item.get('blank_type'), 'blank_type': item.get('blank_type'),
'model_long': self.format_float(item['model_long'] + embryo_redundancy_id.long), 'model_long': item.get('blank_length') if item.get('blank_length') else self.format_float(item['model_long'] + embryo_redundancy_id.long),
'model_width': self.format_float(item['model_width'] + embryo_redundancy_id.width), 'model_width': item.get('blank_width') if item.get('blank_width') else self.format_float(item['model_width'] + embryo_redundancy_id.width),
'model_height': self.format_float(item['model_height'] + embryo_redundancy_id.height), 'model_height': item.get('blank_height') if item.get('blank_height') else self.format_float(item['model_height'] + embryo_redundancy_id.height),
'model_volume': self.format_float((item['model_long'] + embryo_redundancy_id.long) * ( 'model_volume': self.format_float((item['model_long'] + embryo_redundancy_id.long) * (
item['model_width'] + embryo_redundancy_id.width) * ( item['model_width'] + embryo_redundancy_id.width) * (
item['model_height'] + embryo_redundancy_id.height)), item['model_height'] + embryo_redundancy_id.height)),

2
sf_sale/models/sale_order.py
View File

@@ -292,7 +292,7 @@ class ResaleOrderLine(models.Model):
manual_quotation = fields.Boolean('人工编程', default=False) manual_quotation = fields.Boolean('人工编程', default=False)
model_url = fields.Char('模型文件地址') model_url = fields.Char('模型文件地址')
model_id = fields.Char('模型ID') model_id = fields.Char('模型ID')
delivery_end_date = fields.Date('交货截止日期') delivery_end_date = fields.Date('客户交期')
@api.depends('embryo_redundancy_id') @api.depends('embryo_redundancy_id')
def _compute_is_incoming_material(self): def _compute_is_incoming_material(self):

2
sf_sale/views/sale_order_view.xml
View File

@@ -141,7 +141,7 @@
<attribute name="optional">hide</attribute> <attribute name="optional">hide</attribute>
</xpath> </xpath>
<xpath expr="//field[@name='order_line']/tree/field[@name='remark']" position="before"> <xpath expr="//field[@name='order_line']/tree/field[@name='remark']" position="before">
<field name="delivery_end_date" optional="hide"/> <field name="delivery_end_date" optional="show"/>
</xpath> </xpath>
<field name="user_id" position="attributes"> <field name="user_id" position="attributes">