1、表面工艺及同步接口添加‘加工天数’、‘路途天数’字段;2、表面工艺可选参数及同步接口添加‘工艺描述’、‘加工天数’、‘路途天数’字段
This commit is contained in:
@@ -92,8 +92,10 @@ class MrsProductionProcess(models.Model):
|
|||||||
partner_process_ids = fields.Many2many('res.partner', 'process_ids', '加工工厂')
|
partner_process_ids = fields.Many2many('res.partner', 'process_ids', '加工工厂')
|
||||||
active = fields.Boolean('有效', default=True)
|
active = fields.Boolean('有效', default=True)
|
||||||
parameter_ids = fields.One2many('sf.production.process.parameter', 'process_id', string='可选参数')
|
parameter_ids = fields.One2many('sf.production.process.parameter', 'process_id', string='可选参数')
|
||||||
category_id = fields.Many2one('sf.production.process.category')
|
category_id = fields.Many2one('sf.production.process.category', string='表面工艺类别')
|
||||||
# workcenter_ids = fields.Many2many('mrp.workcenter', 'rel_workcenter_process', required=True)
|
# workcenter_ids = fields.Many2many('mrp.workcenter', 'rel_workcenter_process', required=True)
|
||||||
|
processing_day = fields.Float('加工天数/d')
|
||||||
|
travel_day = fields.Float('路途天数/d')
|
||||||
|
|
||||||
|
|
||||||
# class MrsProcessingTechnology(models.Model):
|
# class MrsProcessingTechnology(models.Model):
|
||||||
@@ -141,7 +143,10 @@ class MrsProductionProcessParameter(models.Model):
|
|||||||
is_check = fields.Boolean(default=False)
|
is_check = fields.Boolean(default=False)
|
||||||
# price = fields.Float('单价')
|
# price = fields.Float('单价')
|
||||||
process_id = fields.Many2one('sf.production.process', string='表面工艺')
|
process_id = fields.Many2one('sf.production.process', string='表面工艺')
|
||||||
|
process_description = fields.Char(string='工艺描述')
|
||||||
materials_model_ids = fields.Many2many('sf.materials.model', 'applicable_material', string='适用材料')
|
materials_model_ids = fields.Many2many('sf.materials.model', 'applicable_material', string='适用材料')
|
||||||
|
processing_day = fields.Float('加工天数/d')
|
||||||
|
travel_day = fields.Float('路途天数/d')
|
||||||
active = fields.Boolean('有效', default=True)
|
active = fields.Boolean('有效', default=True)
|
||||||
|
|
||||||
def name_get(self):
|
def name_get(self):
|
||||||
|
|||||||
@@ -27,9 +27,13 @@
|
|||||||
<group>
|
<group>
|
||||||
<field name="code" readonly="1"/>
|
<field name="code" readonly="1"/>
|
||||||
<field name="process_id" readonly="1"/>
|
<field name="process_id" readonly="1"/>
|
||||||
|
<field name="process_description" readonly="1"/>
|
||||||
<field name="gain_way"/>
|
<field name="gain_way"/>
|
||||||
</group>
|
</group>
|
||||||
|
<group>
|
||||||
|
<field name="processing_day" readonly="1"/>
|
||||||
|
<field name="travel_day" readonly="1"/>
|
||||||
|
</group>
|
||||||
</group>
|
</group>
|
||||||
<notebook>
|
<notebook>
|
||||||
<page string="适用材料">
|
<page string="适用材料">
|
||||||
@@ -179,7 +183,13 @@
|
|||||||
</div>
|
</div>
|
||||||
<group>
|
<group>
|
||||||
<group>
|
<group>
|
||||||
<field name="code"/>
|
<field name="code" readonly="1"/>
|
||||||
|
<field name="category_id" readonly="1"/>
|
||||||
|
</group>
|
||||||
|
<group>
|
||||||
|
<field name="processing_day" readonly="1"/>
|
||||||
|
<field name="travel_day" readonly="1"/>
|
||||||
|
</group>
|
||||||
</group>
|
</group>
|
||||||
<notebook>
|
<notebook>
|
||||||
<page string="可选参数">
|
<page string="可选参数">
|
||||||
@@ -213,7 +223,6 @@
|
|||||||
</page>
|
</page>
|
||||||
|
|
||||||
</notebook>
|
</notebook>
|
||||||
</group>
|
|
||||||
<group>
|
<group>
|
||||||
<group>
|
<group>
|
||||||
<field name="remark"/>
|
<field name="remark"/>
|
||||||
|
|||||||
@@ -326,6 +326,8 @@ class sfProductionProcess(models.Model):
|
|||||||
production_process.name = item['name']
|
production_process.name = item['name']
|
||||||
production_process.category_id = category.id
|
production_process.category_id = category.id
|
||||||
production_process.remark = item['remark']
|
production_process.remark = item['remark']
|
||||||
|
production_process.processing_day = item['processing_day']
|
||||||
|
production_process.travel_day = item['travel_day']
|
||||||
production_process.active = item['active']
|
production_process.active = item['active']
|
||||||
else:
|
else:
|
||||||
self.create({
|
self.create({
|
||||||
@@ -333,6 +335,8 @@ class sfProductionProcess(models.Model):
|
|||||||
"category_id": category.id,
|
"category_id": category.id,
|
||||||
"code": item['code'],
|
"code": item['code'],
|
||||||
"remark": item['remark'],
|
"remark": item['remark'],
|
||||||
|
"processing_day": item['processing_day'],
|
||||||
|
"travel_day": item['travel_day'],
|
||||||
"active": item['active'],
|
"active": item['active'],
|
||||||
})
|
})
|
||||||
else:
|
else:
|
||||||
@@ -358,12 +362,16 @@ class sfProductionProcess(models.Model):
|
|||||||
"category_id": category.id,
|
"category_id": category.id,
|
||||||
"code": item['code'],
|
"code": item['code'],
|
||||||
"remark": item['remark'],
|
"remark": item['remark'],
|
||||||
|
"processing_day": item['processing_day'],
|
||||||
|
"travel_day": item['travel_day'],
|
||||||
"active": item['active'],
|
"active": item['active'],
|
||||||
})
|
})
|
||||||
else:
|
else:
|
||||||
production_process.name = item['name']
|
production_process.name = item['name']
|
||||||
production_process.category_id = category.id
|
production_process.category_id = category.id
|
||||||
production_process.remark = item['remark']
|
production_process.remark = item['remark']
|
||||||
|
production_process.processing_day = item['processing_day']
|
||||||
|
production_process.travel_day = item['travel_day']
|
||||||
production_process.active = item['active']
|
production_process.active = item['active']
|
||||||
else:
|
else:
|
||||||
raise ValidationError("表面工艺认证未通过")
|
raise ValidationError("表面工艺认证未通过")
|
||||||
@@ -1073,6 +1081,9 @@ class sfProductionProcessParameter(models.Model):
|
|||||||
[('code', '=', item['process_id_code'])])
|
[('code', '=', item['process_id_code'])])
|
||||||
if production_process_parameter:
|
if production_process_parameter:
|
||||||
production_process_parameter.name = item['name']
|
production_process_parameter.name = item['name']
|
||||||
|
production_process_parameter.process_description = item['process_description']
|
||||||
|
production_process_parameter.processing_day = item['processing_day']
|
||||||
|
production_process_parameter.travel_day = item['travel_day']
|
||||||
production_process_parameter.active = item['active']
|
production_process_parameter.active = item['active']
|
||||||
production_process_parameter.process_id = process.id
|
production_process_parameter.process_id = process.id
|
||||||
production_process_parameter.materials_model_ids = self.env['sf.materials.model'].search(
|
production_process_parameter.materials_model_ids = self.env['sf.materials.model'].search(
|
||||||
@@ -1080,6 +1091,9 @@ class sfProductionProcessParameter(models.Model):
|
|||||||
else:
|
else:
|
||||||
self.create({
|
self.create({
|
||||||
"name": item['name'],
|
"name": item['name'],
|
||||||
|
"process_description": item['process_description'],
|
||||||
|
"processing_day": item['processing_day'],
|
||||||
|
"travel_day": item['travel_day'],
|
||||||
"code": item['code'],
|
"code": item['code'],
|
||||||
"active": item['active'],
|
"active": item['active'],
|
||||||
"process_id": process.id,
|
"process_id": process.id,
|
||||||
@@ -1107,6 +1121,9 @@ class sfProductionProcessParameter(models.Model):
|
|||||||
if not production_process_parameter:
|
if not production_process_parameter:
|
||||||
self.create({
|
self.create({
|
||||||
"name": item['name'],
|
"name": item['name'],
|
||||||
|
"process_description": item['process_description'],
|
||||||
|
"processing_day": item['processing_day'],
|
||||||
|
"travel_day": item['travel_day'],
|
||||||
"code": item['code'],
|
"code": item['code'],
|
||||||
"active": item['active'],
|
"active": item['active'],
|
||||||
"process_id": process.id,
|
"process_id": process.id,
|
||||||
@@ -1115,6 +1132,9 @@ class sfProductionProcessParameter(models.Model):
|
|||||||
})
|
})
|
||||||
else:
|
else:
|
||||||
production_process_parameter.name = item['name']
|
production_process_parameter.name = item['name']
|
||||||
|
production_process_parameter.process_description = item['process_description']
|
||||||
|
production_process_parameter.processing_day = item['processing_day']
|
||||||
|
production_process_parameter.travel_day = item['travel_day']
|
||||||
production_process_parameter.process_id = process.id
|
production_process_parameter.process_id = process.id
|
||||||
production_process_parameter.materials_model_ids = self.env['sf.materials.model'].search(
|
production_process_parameter.materials_model_ids = self.env['sf.materials.model'].search(
|
||||||
[('materials_no', 'in', item['materials_model_ids_codes'])])
|
[('materials_no', 'in', item['materials_model_ids_codes'])])
|
||||||
|
|||||||
Reference in New Issue
Block a user