Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/新增工件装夹
This commit is contained in:
@@ -5,50 +5,40 @@ class Assemble(models.Model):
|
||||
_name = 'sf.assemble'
|
||||
_description = "组合装夹"
|
||||
|
||||
functional_fixture_code = fields.Char(string="功能夹具编码", size=25, required=True)
|
||||
functional_fixture_name = fields.Char(string="功能夹具名称", size=25, required=True)
|
||||
functional_fixture_type = fields.Char(string="功能夹具类型", required=True)
|
||||
chuck_name = fields.Char(string="卡盘名称", required=True)
|
||||
chuck_brand_id = fields.Many2one('sf.machine.brand', string="卡盘品牌", required=True)
|
||||
chuck_type_id = fields.Char(string="卡盘类型", required=True)
|
||||
chuck_model_id = fields.Char(string="卡盘型号", required=True)
|
||||
tray_name = fields.Char(string="托盘名称", required=True)
|
||||
tray_brand_id = fields.Many2one('sf.machine.brand', string="托盘品牌", required=True)
|
||||
tray_type_id = fields.Char(string="托盘类型", required=True)
|
||||
tray_model_id = fields.Char(string="托盘型号", required=True)
|
||||
real_code = fields.Char(string="真实坯料编码", size=25, required=True)
|
||||
real_name = fields.Char(string="真实坯料名称", size=25, required=True)
|
||||
total_wight = fields.Float(string="总重量", required=True)
|
||||
functional_fixture_code = fields.Char(string="功能夹具编码", readonly=True)
|
||||
name = fields.Char(string="功能夹具名称", readonly=True)
|
||||
functional_fixture_type_id = fields.Many2one('sf.functional.fixture.type', string="功能夹具类型", readonly=True)
|
||||
chuck_name = fields.Char(string="卡盘名称")
|
||||
chuck_brand_id = fields.Many2one('sf.machine.brand', string="卡盘品牌")
|
||||
chuck_type_id = fields.Char(string="卡盘类型")
|
||||
chuck_model_id = fields.Char(string="卡盘型号")
|
||||
tray_name = fields.Char(string="托盘名称")
|
||||
tray_brand_id = fields.Many2one('sf.machine.brand', string="托盘品牌")
|
||||
tray_type_id = fields.Char(string="托盘类型")
|
||||
tray_model_id = fields.Char(string="托盘型号")
|
||||
real_code = fields.Char(string="真实坯料编码")
|
||||
real_name = fields.Char(string="真实坯料名称")
|
||||
real_width = fields.Float(string="真实宽度")
|
||||
real_length = fields.Float(string="真实长度")
|
||||
real_height = fields.Float(string="真实高度")
|
||||
real_diameter = fields.Float(string="真实直径")
|
||||
total_wight = fields.Float(string="总重量")
|
||||
maximum_carrying_weight = fields.Char(string="最大承载重量[kg]")
|
||||
maximum_clamping_force = fields.Char(string="最大夹持力[n]")
|
||||
production_line = fields.Char(string="生产线", required=True)
|
||||
production_line = fields.Char(string="生产线")
|
||||
# 以下为智能工厂工单带过来的机床信息
|
||||
machine_tool = fields.Many2one('sf.machine_tool', string="机床名称", required=True)
|
||||
machine_tool_startime = fields.Date(string="机床开始加工时间", required=True)
|
||||
machine_tool = fields.Many2one('sf.machine_tool', string="机床名称")
|
||||
machine_tool_startime = fields.Date(string="机床开始加工时间")
|
||||
# 以下为智能工厂工单带过来的信息
|
||||
apply_staff = fields.Char(string="申请人", required=True)
|
||||
machine_tool_code = fields.Char(string="机床编码", required=True)
|
||||
apply_time = fields.Date(string="申请时间", required=True)
|
||||
apply_reason = fields.Char(string="申请原因", required=True)
|
||||
apply_staff = fields.Char(string="申请人")
|
||||
machine_tool_code = fields.Char(string="机床编码")
|
||||
apply_time = fields.Date(string="申请时间")
|
||||
apply_reason = fields.Char(string="申请原因")
|
||||
# 以下为装夹的信息
|
||||
preset_staff = fields.Char(string="预调名称", required=True)
|
||||
preset_time = fields.Date(string="预调时间", required=True)
|
||||
material_taker = fields.Char(string="领料人", required=True)
|
||||
material_removal_time = fields.Date(string="领料出库时间", required=True)
|
||||
remark = fields.Char(string="备注", required=True)
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
preset_staff = fields.Char(string="预调名称")
|
||||
preset_time = fields.Date(string="预调时间")
|
||||
material_taker = fields.Char(string="领料人")
|
||||
material_removal_time = fields.Date(string="领料出库时间")
|
||||
remark = fields.Char(string="备注")
|
||||
# 以下为出库的信息
|
||||
stock_removal_code = fields.Char(string="出库人")
|
||||
|
||||
Reference in New Issue
Block a user