diff --git a/sf_base/models/fixture.py b/sf_base/models/fixture.py index 033ac181..fa0972bf 100644 --- a/sf_base/models/fixture.py +++ b/sf_base/models/fixture.py @@ -32,21 +32,18 @@ class FixtureModel(models.Model): clamping_way = fields.Char(string="装夹方式") port_type = fields.Char(string="接口类型") model_file = fields.Binary(string="3D模型图") - length = fields.Char(string="长度[mm]") - width = fields.Char(string="宽度[mm]") - height = fields.Char(string="高度[mm]") - weight = fields.Char(string="重量[kg]") - clamp_workpiece_length_max = fields.Char(string="夹持工件长度MAX[mm]") - clamp_workpiece_width_max = fields.Char(string="夹持工件宽度MAX[mm]") - clamp_workpiece_height_max = fields.Char(string="夹持工件高度MAX[mm]") - clamp_workpiece_diameter_max = fields.Char(string="夹持工件直径MAX[mm]") - maximum_carrying_weight = fields.Char(string="最大承载重量[kg]") - maximum_clamping_force = fields.Char(string="最大夹持力[n]") + length = fields.Char(string="长度[mm]", size=6) + width = fields.Char(string="宽度[mm]", size=6) + height = fields.Char(string="高度[mm]", size=6) + weight = fields.Char(string="重量[kg]", size=4) + clamp_workpiece_length_max = fields.Char(string="夹持工件长度MAX[mm]", size=6) + clamp_workpiece_width_max = fields.Char(string="夹持工件宽度MAX[mm]", size=6) + clamp_workpiece_height_max = fields.Char(string="夹持工件高度MAX[mm]", size=6) + clamp_workpiece_diameter_max = fields.Char(string="夹持工件直径MAX[mm]", size=6) + maximum_carrying_weight = fields.Char(string="最大承载重量[kg]", size=4) + maximum_clamping_force = fields.Char(string="最大夹持力[n]", size=8) materials_model_id = fields.Many2one('sf.materials.model', string="材料型号") driving_way = fields.Char(string="驱动方式") - apply_machine_tool_type = fields.Char(string="适用机床型号") + apply_machine_tool_type_id = fields.Many2one('sf.machine_tool.type', string="适用机床型号") through_hole_size = fields.Integer(string="过孔大小[mm]", size=6) screw_size = fields.Integer(string="螺牙大小[mm]", size=6) - - - diff --git a/sf_base/views/fixture_view.xml b/sf_base/views/fixture_view.xml index de9134aa..e064e102 100644 --- a/sf_base/views/fixture_view.xml +++ b/sf_base/views/fixture_view.xml @@ -239,7 +239,7 @@ attrs='{"invisible": [("fixture_material_type","!=",("转接板(锁板)托盘"))]}'/> - diff --git a/sf_bf_connect/controllers/controllers.py b/sf_bf_connect/controllers/controllers.py index 3a48d16f..4442567e 100644 --- a/sf_bf_connect/controllers/controllers.py +++ b/sf_bf_connect/controllers/controllers.py @@ -34,12 +34,6 @@ class Sf_Bf_Connect(http.Controller): logging.info('get_bfm_process_or===================================:%s' % order_id.name) aa.default_code = kw['order_number'] logging.info('get_bfm_process_order_listaaaaaaaaaaaaaaaaaaaaaaaaaaaa================:%s' % aa.default_code) - # # 给stock.picking的default_code字段赋值 - # bb = request.env['stock.picking'].sudo().search([('origin', '=', order_id.name)]) - # logging.info('get_bfm_process_or===================================:%s' % order_id.name) - # bb.default_code = kw['order_number'] - # logging.info('get_bfm_process_order_listbbbbbbbbbbbbbbbbbbbbbbbbbbbb================:%s' % bb.default_code) - for item in bfm_process_order_list: product = request.env['product.template'].sudo().product_create(product_id, item, order_id, kw['order_number'], i) diff --git a/sf_dlm/__manifest__.py b/sf_dlm/__manifest__.py index 9a2b3150..20211cde 100644 --- a/sf_dlm/__manifest__.py +++ b/sf_dlm/__manifest__.py @@ -15,7 +15,6 @@ 'data': [ 'data/product_data.xml', 'data/uom_data.xml', - # 'data/cutting_tool_data.xml', 'views/product_template_view.xml', 'views/product_workorder.xml' ], diff --git a/sf_dlm/data/cutting_tool_data.xml b/sf_dlm/data/cutting_tool_data.xml deleted file mode 100644 index 9153306e..00000000 --- a/sf_dlm/data/cutting_tool_data.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - 刀具 - 刀具 - - - - 夹具 - 夹具 - - - - - diff --git a/sf_dlm/views/product_template_view.xml b/sf_dlm/views/product_template_view.xml index c475f529..a4a9d998 100644 --- a/sf_dlm/views/product_template_view.xml +++ b/sf_dlm/views/product_template_view.xml @@ -79,7 +79,7 @@ - + @@ -91,10 +91,9 @@ - + - /> - + @@ -123,7 +122,7 @@ - + - + @@ -160,7 +157,7 @@ attrs="{'invisible': [('cutting_tool_type', 'not in', ['刀杆','刀盘'])]}"/> - + @@ -170,7 +167,7 @@ - + @@ -185,7 +182,7 @@ - + @@ -193,7 +190,7 @@ - + @@ -206,7 +203,7 @@ - + - + - + attrs='{"invisible": ["|",("fixture_model_id", "=", False),("fixture_material_type","not in",("气动托盘","转接板(锁板)托盘","磁吸托盘","虎钳托盘","零点卡盘"))]}'>