1 and self.cutting_tool_type == '整体式刀具':
+ raise ValidationError("刀尖特征只能单选!")
+
+ @api.constrains('handle_type_ids')
+ def _check_handle_type_ids(self):
+ for record in self:
+ if len(record.handle_type_ids) == 0 and self.cutting_tool_type == '整体式刀具':
+ raise ValidationError("柄部类型不能为空!")
+ if len(record.handle_type_ids) > 1 and self.cutting_tool_type == '整体式刀具':
+ raise ValidationError("柄部类型只能单选!")
+
+ @api.constrains('cutting_direction_ids')
+ def _check_cutting_direction_ids(self):
+ for record in self:
+ if len(record.cutting_direction_ids) == 0 and self.cutting_tool_type == '整体式刀具':
+ raise ValidationError("走刀方向不能为空!")
+
+ @api.constrains('suitable_coolant_ids')
+ def _check_suitable_coolant_ids(self):
+ for record in self:
+ if not record.suitable_coolant_ids and self.cutting_tool_type == '整体式刀具':
+ raise ValidationError("适合冷却液不能为空!")
+
+ @api.constrains('cutting_tool_total_length')
+ def _check_cutting_tool_total_length(self):
+ if self.cutting_tool_total_length <= 0 and self.cutting_tool_type == '整体式刀具':
+ raise ValidationError("总长度不能为0")
+
+ @api.constrains('cutting_tool_shank_length')
+ def _check_cutting_tool_shank_length(self):
+ if self.cutting_tool_shank_length <= 0 and self.cutting_tool_type == '整体式刀具':
+ raise ValidationError("柄部长度不能为0")
+
+ @api.constrains('cutting_tool_blade_length')
+ def _check_cutting_tool_blade_length(self):
+ if self.cutting_tool_blade_length <= 0 and self.cutting_tool_type == '整体式刀具':
+ raise ValidationError("刃部长度不能为0")
+
+ @api.constrains('cutting_tool_blade_number')
+ def _check_cutting_tool_blade_number(self):
+ if self.cutting_tool_blade_number <= 0 and self.cutting_tool_type == '整体式刀具':
+ raise ValidationError("刃数不能为0")
+
+ @api.constrains('integral_shank_diameter')
+ def _check_integral_shank_diameter(self):
+ if self.integral_shank_diameter <= 0 and self.cutting_tool_type == '整体式刀具':
+ raise ValidationError("柄部直径不能为0")
+
+ @api.constrains('integral_blade_diameter')
+ def _check_integral_blade_diameter(self):
+ if self.integral_blade_diameter <= 0 and self.cutting_tool_type == '整体式刀具':
+ raise ValidationError("刃部直径不能为0")
+
+ @api.constrains('integral_run_out_accuracy_min')
+ def _check_integral_blade_diameter(self):
+ if self.integral_run_out_accuracy_min <= 0 and self.cutting_tool_type == '整体式刀具':
+ raise ValidationError("端跳精度最小(min)不能为0")
+
+ @api.constrains('integral_run_out_accuracy_max')
+ def _check_integral_run_out_accuracy_max(self):
+ if self.integral_run_out_accuracy_max <= 0 and self.cutting_tool_type == '整体式刀具':
+ raise ValidationError("端跳精度最大(max)不能为0")
+
cutting_tool_diameter = fields.Float('直径(mm)')
- cutting_tool_blade_number = fields.Integer('刃数')
cutting_tool_front_angle = fields.Float('前角(°)')
cutting_tool_rear_angle = fields.Float('后角(°)')
cutting_tool_main_included_angle = fields.Float('主偏角(°)')
@@ -138,22 +247,75 @@ class ResProductMo(models.Model):
fixture_clamping_way = fields.Char(string="装夹方式")
fixture_port_type = fields.Char(string="接口类型")
fixture_model_file = fields.Binary(string="3D模型图")
- fixture_clamp_workpiece_length_max = fields.Integer(string="夹持工件长度MAX(mm)", size=6)
- fixture_clamp_workpiece_width_max = fields.Integer(string="夹持工件宽度MAX(mm)", size=6)
- fixture_clamp_workpiece_height_max = fields.Integer(string="夹持工件高度MAX(mm)", size=6)
- fixture_clamp_workpiece_diameter_max = fields.Float(string="夹持工件直径MAX(mm)", digits=(16, 6))
+
+ fixture_clamp_workpiece_length_max = fields.Integer(string="夹持工件长度max(mm)")
+ fixture_clamp_workpiece_width_max = fields.Integer(string="夹持工件宽度max(mm)")
+ fixture_clamp_workpiece_height_max = fields.Integer(string="夹持工件高度max(mm)")
+ fixture_clamp_workpiece_diameter_max = fields.Float(string="夹持工件直径max(mm)", digits=(16, 6))
+
fixture_maximum_carrying_weight = fields.Float(string="最大承载重量(kg)", digits=(16, 4))
- fixture_maximum_clamping_force = fields.Integer(string="最大夹持力(n)", size=8)
+ fixture_maximum_clamping_force = fields.Integer(string="最大夹持力(n)")
fixture_driving_way = fields.Char(string="驱动方式")
fixture_apply_machine_tool_type_ids = fields.Many2many('sf.machine_tool.type', 'rel_product_machine_tool_type',
string="适用机床型号")
- fixture_through_hole_size = fields.Integer(string="过孔大小(mm)", size=6)
- fixture_screw_size = fields.Integer(string="螺牙大小(mm)", size=6)
+ fixture_through_hole_size = fields.Integer(string="过孔大小(mm)")
+ fixture_screw_size = fields.Integer(string="螺牙大小(mm)")
+
# 注册状态
register_state = fields.Selection([('未注册', '未注册'), ('已注册', '已注册'), ('注册失败', '注册失败')],
string='注册状态', default='未注册')
industry_code = fields.Char('行业编码', readonly=True)
+ @api.constrains('tool_length')
+ def _check_tool_length_size(self):
+ if self.tool_length > 1000000:
+ raise ValidationError("长度不能超过1000000")
+
+ @api.constrains('tool_width')
+ def _check_tool_width_size(self):
+ if self.tool_width > 1000000:
+ raise ValidationError("宽度不能超过1000000")
+
+ @api.constrains('tool_height')
+ def _check_tool_height_size(self):
+ if self.tool_height > 1000000:
+ raise ValidationError("高度不能超过1000000")
+
+ @api.constrains('tool_thickness')
+ def _check_tool_thickness_size(self):
+ if self.tool_thickness > 1000000:
+ raise ValidationError("厚度不能超过1000000")
+
+ @api.constrains('fixture_clamp_workpiece_length_max')
+ def _check_fixture_clamp_workpiece_length_max_size(self):
+ if self.fixture_clamp_workpiece_length_max > 1000000:
+ raise ValidationError("夹持工件长度MAX不能超过1000000")
+
+ @api.constrains('fixture_clamp_workpiece_width_max')
+ def _check_fixture_clamp_workpiece_width_max_size(self):
+ if self.fixture_clamp_workpiece_width_max > 1000000:
+ raise ValidationError("夹持工件宽度MAX不能超过1000000")
+
+ @api.constrains('fixture_clamp_workpiece_height_max')
+ def _check_fixture_clamp_workpiece_height_max_size(self):
+ if self.fixture_clamp_workpiece_height_max > 1000000:
+ raise ValidationError("夹持工件高度MAX不能超过1000000")
+
+ @api.constrains('fixture_maximum_clamping_force')
+ def _check_fixture_maximum_clamping_force_size(self):
+ if self.fixture_maximum_clamping_force > 100000000:
+ raise ValidationError("最大夹持力不能超过100000000")
+
+ @api.constrains('fixture_through_hole_size')
+ def _check_fixture_through_hole_size_size(self):
+ if self.fixture_through_hole_size > 1000000:
+ raise ValidationError("过孔大小不能超过1000000")
+
+ @api.constrains('fixture_screw_size')
+ def _check_fixture_through_hole_size_size(self):
+ if self.fixture_screw_size > 1000000:
+ raise ValidationError("螺牙大小不能超过1000000")
+
def _json_apply_machine_tool_type_item_code(self, item):
code_arr = []
for i in item.product_id.fixture_apply_machine_tool_type_ids:
@@ -261,7 +423,6 @@ class ResProductMo(models.Model):
item.coating_material = item.cutting_tool_model_id.coating_material
item.cutting_tool_total_length = item.cutting_tool_model_id.total_length
item.cutting_tool_shank_length = item.cutting_tool_model_id.shank_length
- item.cutting_tool_blade_length = item.cutting_tool_model_id.blade_length
item.cutting_tool_diameter = item.cutting_tool_model_id.diameter
item.cutting_tool_blade_number = item.cutting_tool_model_id.blade_number
item.cutting_tool_front_angle = item.cutting_tool_model_id.front_angle
@@ -368,7 +529,8 @@ class ResProductMo(models.Model):
'materials_type_id': self.env['sf.materials.model'].search(
[('materials_no', '=', item['texture_type_code'])]).id,
# 'model_surface_process_ids': self.get_production_process_id(item['surface_process_code']),
- 'model_process_parameters_ids': [(6, 0, [])] if not item.get('process_parameters_code') else self.get_process_parameters_id(item['process_parameters_code']),
+ 'model_process_parameters_ids': [(6, 0, [])] if not item.get(
+ 'process_parameters_code') else self.get_process_parameters_id(item['process_parameters_code']),
'model_remark': item['remark'],
'default_code': '%s-%s' % (order_number, i),
# 'barcode': item['barcode'],
diff --git a/sf_manufacturing/models/stock.py b/sf_manufacturing/models/stock.py
index 783e1ea7..68e45759 100644
--- a/sf_manufacturing/models/stock.py
+++ b/sf_manufacturing/models/stock.py
@@ -497,3 +497,22 @@ class ReStockMove(models.Model):
item.product_id.write({'register_state': '注册失败'})
except Exception as e:
raise UserError("注册刀具到云端失败，请联系管理员！")
+
+
+class ReStockQuant(models.Model):
+ _inherit = 'stock.quant'
+
+ def action_apply_inventory(self):
+ inventory_diff_quantity = self.inventory_diff_quantity
+ super(ReStockQuant, self).action_apply_inventory()
+ if inventory_diff_quantity >= 1:
+ stock = self.env['stock.move'].search([('product_id', '=', self.product_id.id), ('is_inventory', '=', True),
+ ('reference', '=', '更新的产品数量'), ('state', '=', 'done')],
+ limit=1, order='id desc')
+ if self.product_id.categ_type == '夹具':
+ stock._register_fixture()
+ elif self.product_id.categ_type == '刀具':
+ stock._register_cutting_tool()
+ return True
+
+
diff --git a/sf_manufacturing/views/mrp_workcenter_views.xml b/sf_manufacturing/views/mrp_workcenter_views.xml
index cda445ec..48487bfd 100644
--- a/sf_manufacturing/views/mrp_workcenter_views.xml
+++ b/sf_manufacturing/views/mrp_workcenter_views.xml
@@ -43,6 +43,12 @@
+
+
+
+ 绿色：正常，红色：故障，黄色：下线/暂停
+
+
diff --git a/sf_plan_management/models/calendar_base.py b/sf_plan_management/models/calendar_base.py
index b783f8b7..6ac7772c 100644
--- a/sf_plan_management/models/calendar_base.py
+++ b/sf_plan_management/models/calendar_base.py
@@ -24,7 +24,7 @@ class WorkLogSetting(models.Model):
return num
code = fields.Char(string='序号', default=_get_code)
- name = fields.Char(string='工作日历名称', required=True, size=15, length=30)
+ name = fields.Char(string='工作日历名称', required=True, size=15)
working_shift_ids = fields.Many2many('sf.working.shift', string='班次', required=True)
start_time = fields.Datetime(string='日开始时间', readonly=True, compute='_compute_working_shift_ids')
@@ -106,12 +106,12 @@ class WorkLogSetting(models.Model):
# 'calendar_code': self.code,
# 'date_time': target_date})
- @api.model
- def create(self, vals):
+ @api.model_create_multi
+ def create(self, vals_list):
"""
创建记录时，生成工作日历
"""
- record = super(WorkLogSetting, self).create(vals)
+ record = super(WorkLogSetting, self).create(vals_list)
record.generate_work_calendar()
return record
diff --git a/sf_sale/models/__init__.py b/sf_sale/models/__init__.py
index 577497ab..d1850ec0 100644
--- a/sf_sale/models/__init__.py
+++ b/sf_sale/models/__init__.py
@@ -1,4 +1,5 @@
-from. import sale_order
-from. import quick_easy_order
+from . import sale_order
+from . import quick_easy_order
+from . import auto_quatotion_common
diff --git a/sf_sale/models/quick_easy_order.py b/sf_sale/models/quick_easy_order.py
index 369851b3..eed2be57 100644
--- a/sf_sale/models/quick_easy_order.py
+++ b/sf_sale/models/quick_easy_order.py
@@ -32,16 +32,16 @@ class QuickEasyOrder(models.Model):
('0.01', '±0.01mm')], string='加工精度', default='0.10')
material_id = fields.Many2one('sf.production.materials', '材料', compute='_compute_material_model', store=True)
material_model_id = fields.Many2one('sf.materials.model', '型号', compute='_compute_material_model', store=True)
- process_id = fields.Many2one('sf.production.process', string='表面工艺')
- parameter_ids = fields.One2many('sf.production.process.parameter', 'process_id', string='可选参数')
+ # process_id = fields.Many2one('sf.production.process', string='表面工艺')
+ parameter_ids = fields.Many2many('sf.production.process.parameter', 'process_item_order_rel', string='可选参数')
quantity = fields.Integer('数量', default=1)
unit_price = fields.Float('单价')
price = fields.Float('总价')
- model_file = fields.Binary('模型文件')
- upload_model_file = fields.Many2many('ir.attachment', 'upload_qf_model_file_attachment_ref', string='模型文件')
+ model_file = fields.Binary('glb模型文件')
+ upload_model_file = fields.Many2many('ir.attachment', 'upload_qf_model_file_attachment_ref', string='上传模型文件')
delivery_time = fields.Date('交货日期')
customer_id = fields.Many2one('res.partner', string='客户', default=lambda self: self.env.user.partner_id.id)
- state = fields.Selection([('草稿', '草稿'), ('待付款', '待付款'), ('待派单', '待派单'),
+ state = fields.Selection([('草稿', '草稿'), ('待派单', '待派单'),
('待接单', '待接单'), ('加工中', '加工中'),
('物流中', '物流中'), ('已交付', '已交付')], string='订单状态', default='草稿',
readonly=True)
@@ -49,6 +49,11 @@ class QuickEasyOrder(models.Model):
('success', '成功'),
('fail', '失败')], string='模型上色状态')
+ @api.depends('unit_price', 'quantity')
+ def _compute_total_amount(self):
+ for item in self:
+ item.price = item.unit_price * item.quantity
+
@api.depends('material_id', 'material_model_id')
def _compute_material_model(self):
for item in self:
@@ -75,20 +80,21 @@ class QuickEasyOrder(models.Model):
logging.info('create-model_file:%s' % len(vals['model_file']))
obj = super(QuickEasyOrder, self).create(vals)
- self.model_coloring()
+ self.model_coloring(obj)
self.distribute_to_factory(obj)
+ obj.state = '待接单'
return obj
# 将attach的datas内容转为glb文件
def transition_glb_file(self, report_path, model_code):
shapes = read_step_file(report_path)
- output_file = os.path.join('C:/Users/43484/Desktop/机企猫工作文档', str(model_code) + '.stl')
- # output_file = os.path.join('/tmp', str(model_code) + '.stl')
+ # output_file = os.path.join('C:/Users/43484/Desktop/机企猫工作文档', str(model_code) + '.stl')
+ output_file = os.path.join('/tmp', str(model_code) + '.stl')
write_stl_file(shapes, output_file, 'binary', 0.03, 0.5)
# 转化为glb
- output_glb_file = os.path.join('C:/Users/43484/Desktop/机企猫工作文档', str(model_code) + '.glb')
- # output_glb_file = os.path.join('/tmp', str(model_code) + '.glb')
- util_path = get_resource_path('mrs_base', 'static/util')
+ # output_glb_file = os.path.join('C:/Users/43484/Desktop/机企猫工作文档', str(model_code) + '.glb')
+ output_glb_file = os.path.join('/tmp', str(model_code) + '.glb')
+ util_path = get_resource_path('sf_dlm', 'static/util')
cmd = 'python3 %s/stl2gltf.py %s %s -b' % (util_path, output_file, output_glb_file)
os.system(cmd)
# 转base64
@@ -96,6 +102,7 @@ class QuickEasyOrder(models.Model):
image_data = fileObj.read()
base64_data = base64.b64encode(image_data)
return base64_data
+
# return False
@api.onchange('upload_model_file')
@@ -137,62 +144,106 @@ class QuickEasyOrder(models.Model):
派单到工厂
:return:
"""
- web_base_url = self.env['ir.config_parameter'].sudo().get_param('web.base.url', default='')
- logging.info("自动报价返回值: %s" % ret)
- url = '/api/bfm_process_order/list'
- res = {'order_number': obj.name, 'delivery_end_date': str(datetime.now()),
- 'delivery_name': 'XXXXX', 'delivery_telephone': 'XXXXX',
- 'delivery_address': 'XXXXX',
- 'bfm_process_order_list': []}
- factory = self.env['res.partner'].sudo().search([], limit=1, order='id desc')
- config_header = Common.get_headers(self, factory.sf_token, factory.sf_secret_key)
- for item in obj:
- attachment = item.upload_model_file[0]
- base64_data = base64.b64encode(attachment.datas)
- base64_datas = base64_data.decode('utf-8')
- barcode = hashlib.sha1(base64_datas.encode('utf-8')).hexdigest()
- logging.info('model_file-size: %s' % len(item.model_file))
- val = {
- 'model_long': 100,
- 'model_width': 100,
- 'model_height': 100,
- 'model_volume': 300,
- 'model_machining_precision': item.machining_precision,
- 'model_name': attachment.name,
- 'model_data': base64_datas,
- 'model_file': base64.b64encode(item.model_file).decode('utf-8'),
- 'texture_code': item.material_id.materials_no,
- 'texture_type_code': item.material_model_id.materials_no,
- # 'surface_process_code': self.env['jikimo.surface.process']._json_surface_process_code(item),
- # 'process_parameters_code': self.env['jikimo.surface.process.item']._json_surface_process_item_code(
- # item),
- 'price': item.price,
- 'number': item.quantity,
- 'total_amount': item.price,
- 'remark': '',
- 'barcode': barcode
- }
- res['bfm_process_order_list'].append(val)
- res['bfm_process_order_list'] = json.dumps(res['bfm_process_order_list'])
try:
- ret = requests.post((web_base_url[0] + url), json={}, data=res,
- headers=config_header)
- ret = ret.json()
- if ret['status'] == 1:
- self.write(
- {'state': '待接单'})
- else:
- raise UserError(ret['message'])
+ res = {'bfm_process_order_list': []}
+ for item in obj:
+ attachment = item.upload_model_file[0]
+ base64_data = base64.b64encode(attachment.datas)
+ base64_datas = base64_data.decode('utf-8')
+ barcode = hashlib.sha1(base64_datas.encode('utf-8')).hexdigest()
+ logging.info('model_file-size: %s' % len(item.model_file))
+ res['bfm_process_order_list'].append({
+ 'model_long': item.model_length,
+ 'model_width': item.model_width,
+ 'model_height': item.model_height,
+ 'model_volume': item.model_volume,
+ 'model_machining_precision': item.machining_precision,
+ 'model_name': attachment.name,
+ 'model_data': base64_datas,
+ 'model_file': base64.b64encode(item.model_file).decode('utf-8'),
+ 'texture_code': item.material_id.materials_no,
+ 'texture_type_code': item.material_model_id.materials_no,
+ # 'surface_process_code': self.env['jikimo.surface.process']._json_surface_process_code(item),
+ 'process_parameters_code': self.env[
+ 'sf.production.process.parameter']._json_production_process_item_code(
+ item),
+ 'price': item.price,
+ 'number': item.quantity,
+ 'total_amount': item.price,
+ 'remark': '',
+ 'barcode': barcode
+ })
+ # res['bfm_process_order_list'] = json.dumps(res['bfm_process_order_list'])
+ product_id = self.env.ref('sf_dlm.product_template_sf').sudo()
+ self_machining_id = self.env.ref('sf_dlm.product_embryo_sf_self_machining').sudo()
+ outsource_id = self.env.ref('sf_dlm.product_embryo_sf_outsource').sudo()
+ purchase_id = self.env.ref('sf_dlm.product_embryo_sf_purchase').sudo()
+ company_id = self.env.ref('base.main_company').sudo()
+ # user_id = request.env.ref('base.user_admin').sudo()
+ order_id = self.env['sale.order'].sale_order_create(company_id, 'XXXXX', 'XXXXX', 'XXXXX',
+ str(datetime.now()))
+ i = 1
+ # 给sale_order的default_code字段赋值
+ aa = self.env['sale.order'].sudo().search([('name', '=', order_id.name)])
+ aa.default_code = obj.name
+ for item in res['bfm_process_order_list']:
+ product = self.env['product.template'].sudo().product_create(product_id, item, order_id,
+ obj.name, i)
+ bom_data = self.env['mrp.bom'].get_bom(product)
+ logging.info('bom_data:%s' % bom_data)
+ if bom_data:
+ bom = self.env['mrp.bom'].bom_create(product, 'normal', False)
+ bom.bom_create_line_has(bom_data)
+ else:
+ if product.materials_type_id.gain_way == '自加工':
+ # 创建坯料
+ self_machining_embryo = self.env['product.template'].sudo().no_bom_product_create(
+ self_machining_id,
+ item, order_id,
+ 'self_machining',
+ i)
+ # 创建坯料的bom
+ self_machining_bom = self.env['mrp.bom'].bom_create(self_machining_embryo, 'normal', False)
+ # 创建坯料里bom的组件
+ self_machining_bom_line = self_machining_bom.bom_create_line(self_machining_embryo)
+ if self_machining_bom_line == False:
+ self.cr.rollback()
+ return UserError('该订单模型的材料型号在您分配的工厂里暂未有原材料,请先配置再进行分配')
+ # 产品配置bom
+ product_bom_self_machining = self.env['mrp.bom'].bom_create(product, 'normal', False)
+ product_bom_self_machining.bom_create_line_has(self_machining_embryo)
+ elif product.materials_type_id.gain_way == '外协':
+ # 创建坯料
+ outsource_embryo = self.env['product.template'].sudo().no_bom_product_create(outsource_id, item,
+ order_id,
+ 'subcontract', i)
+ # 创建坯料的bom
+ outsource_bom = self.env['mrp.bom'].bom_create(outsource_embryo, 'subcontract', True)
+ # 创建坯料的bom的组件
+ outsource_bom_line = outsource_bom.with_user(
+ self.env.ref("base.user_admin")).bom_create_line(outsource_embryo)
+ if outsource_bom_line == False:
+ self.cr.rollback()
+ return UserError('该订单模型的材料型号在您分配的工厂里暂未有原材料,请先配置再进行分配')
+ # 产品配置bom
+ product_bom_outsource = self.env['mrp.bom'].bom_create(product, 'normal', False)
+ product_bom_outsource.bom_create_line_has(outsource_embryo)
+ elif product.materials_type_id.gain_way == '采购':
+ purchase_embryo = self.env['product.template'].sudo().no_bom_product_create(purchase_id, item,
+ order_id,
+ 'purchase', i)
+ # 产品配置bom
+ product_bom_purchase = self.env['mrp.bom'].bom_create(product, 'normal', False)
+ product_bom_purchase.bom_create_line_has(purchase_embryo)
+ order_id.with_user(self.env.ref("base.user_admin")).sale_order_create_line(product, item)
except Exception as e:
- if ret['status'] != 1:
- raise UserError(e)
- else:
- raise UserError("分配工厂失败，请联系管理员")
+ self.cr.rollback()
+ return UserError('工厂创建销售订单和产品失败，请联系管理员')
- # 特征识别
+
+# 特征识别
def feature_recognition(self, report_path, model_code):
feature_path = self.env['sf.auto_quatotion.common'].sudo().get_feature_full_path()
- # price_path = self.env['jikimo.auto_quatotion.common'].get_price_full_path()
process_time_db_path = self.env['sf.auto_quatotion.common'].sudo().get_process_time_db_path()
ret = self.env['sf.auto_quatotion.common'].sudo().get_auto_quatotion(report_path, feature_path,
process_time_db_path,
@@ -200,11 +251,10 @@ class QuickEasyOrder(models.Model):
return ret
# 模型上色
- def model_coloring(self):
+ def model_coloring(self, order):
url = '/api/library_of_models/create'
config = self.env['res.config.settings'].get_values()
- config_header = Common.get_headers(self, config['sf_token'], config['sf_key_secret'])
- order = self.search([('id', '=', self.id)])
+ config_header = Common.get_headers(self, config['token'], config['sf_secret_key'])
logging.info('order: %s' % order.name)
if order:
attachment = order.upload_model_file[0]
@@ -240,24 +290,25 @@ class QuickEasyOrder(models.Model):
# 自动报价
def _get_price(self, order):
-
url = '/api/automatic_quotes'
config = self.env['res.config.settings'].sudo().get_values()
- config_header = Common.get_headers(self, config['sf_token'], config['sf_key_secret'])
+ config_header = Common.get_headers(self, config['token'], config['sf_secret_key'])
logging.info("报价接口..........% s" % order.name)
try:
if order:
vals = {}
# mrs合作伙伴token
- vals['token'] = config['sf_token']
+ vals['token'] = config['token']
vals['accuracy'] = order.machining_precision
vals['number'] = order.quantity
vals['process_code'] = 0
- vals['texture_code'] = order.material_model_id.code
+ vals['texture_code'] = order.material_model_id.materials_no
vals['delivery_days'] = 15
if order.model_file:
- attachment = self.env['ir.attachment'].sudo().search(
- [('id', '=', order.upload_model_file[0])])
+ for item in order.upload_model_file:
+ if item.ids[0]:
+ logging.info('create-attachment:%s' % int(item.ids[0]))
+ attachment = self.env['ir.attachment'].sudo().search([('id', '=', int(item.ids[0]))])
vals['attachment_id'] = attachment.id
else:
vals['attachment_id'] = ''
diff --git a/sf_sale/security/ir.model.access.csv b/sf_sale/security/ir.model.access.csv
index 9bc8bba0..5a3a2ee8 100644
--- a/sf_sale/security/ir.model.access.csv
+++ b/sf_sale/security/ir.model.access.csv
@@ -1,5 +1,6 @@
id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
access_quick_easy_order,quick_easy_order,model_quick_easy_order,base.group_user,1,1,1,1
+access_sf_auto_quatotion_common,sf_auto_quatotion_common,model_sf_auto_quatotion_common,base.group_user,1,1,1,1
diff --git a/sf_sale/views/quick_easy_order_view.xml b/sf_sale/views/quick_easy_order_view.xml
index 6c5f263c..a5ce9da2 100644
--- a/sf_sale/views/quick_easy_order_view.xml
+++ b/sf_sale/views/quick_easy_order_view.xml
@@ -6,6 +6,7 @@
quick.easy.order
FP-%(year)s-%(month)s%(day)s-
4
+
# ---------- 快速订单 ------------
@@ -15,13 +16,16 @@
quick.easy.order
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
@@ -32,6 +36,9 @@
quick.easy.order