Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化

sf_manufacturing/models/mrp_production.py

@@ -141,12 +141,12 @@ class MrpProduction(models.Model):
     ], string='工序状态', default='待装夹')
 
     # 零件图号
-    part_number = fields.Char('零件图号', readonly=True)
+    part_number = fields.Char('零件图号', related='product_id.part_number', readonly=True)
 
     # 上传零件图纸
-    part_drawing = fields.Binary('零件图纸', readonly=True)
+    part_drawing = fields.Binary('零件图纸', related='product_id.machining_drawings', readonly=True)
 
-    quality_standard = fields.Binary('质检标准', readonly=True)
+    quality_standard = fields.Binary('质检标准', related='product_id.quality_standard', readonly=True)
 
     @api.depends('product_id.manual_quotation')
     def _compute_manual_quotation(self):

sf_manufacturing/models/mrp_workorder.py

@@ -59,7 +59,8 @@ class ResMrpWorkOrder(models.Model):
         compute='_compute_state', store=True,
         default='pending', copy=False, readonly=True, recursive=True, index=True, tracking=True)
 
-    delivery_warning = fields.Selection([('normal', '正常'), ('warning', '告警'), ('overdue', '逾期')], string='时效')
+    delivery_warning = fields.Selection([('normal', '正常'), ('warning', '告警'), ('overdue', '逾期')], string='时效',
+                                        tracking=True)
 
     @api.depends('production_id.manual_quotation')
     def _compute_manual_quotation(self):
@@ -1846,7 +1847,7 @@ class WorkPieceDelivery(models.Model):
                 return is_free
             else:
                 raise UserError("接驳站暂未反馈站点实时状态，请稍后再试")
-            
+
     def delivery_avg(self):
         is_agv_task_dispatch = self.env['ir.config_parameter'].sudo().get_param('is_agv_task_dispatch')
         if is_agv_task_dispatch:

sf_manufacturing/models/product_template.py

@@ -16,6 +16,12 @@ from OCC.Extend.DataExchange import write_stl_file
 class ResProductMo(models.Model):
     _inherit = 'product.template'
 
+    def _get_machining_precision(self):
+        machinings = self.env['sf.machining.accuracy'].sudo().search([])
+
+        list = [(m.sync_id, m.name) for m in machinings]
+        return list
+
     model_file = fields.Binary('模型文件')
     categ_type = fields.Selection(string='产品的类别', related='categ_id.type', store=True)
     model_name = fields.Char('模型名称')
@@ -23,12 +29,7 @@ class ResProductMo(models.Model):
     model_width = fields.Float('模型宽(mm)', digits=(16, 3))
     model_height = fields.Float('模型高(mm)', digits=(16, 3))
     model_volume = fields.Float('模型体积(m³)')
-    model_machining_precision = fields.Selection([
-        ('0.10', '±0.10mm'),
-        ('0.05', '±0.05mm'),
-        ('0.03', '±0.03mm'),
-        ('0.02', '±0.02mm'),
-        ('0.01', '±0.01mm')], string='加工精度')
+    model_machining_precision = fields.Selection(selection=_get_machining_precision, string='加工精度')
     model_processing_panel = fields.Char('模型加工面板')
     model_remark = fields.Char('模型备注说明')
     length = fields.Float('长(mm)', digits=(16, 3))
@@ -776,8 +777,6 @@ class ResProductMo(models.Model):
     part_number = fields.Char(string='零件图号', readonly=True)
     machining_drawings = fields.Binary('2D加工图纸', readonly=True)
     quality_standard = fields.Binary('质检标准', readonly=True)
-    machining_drawings_name = fields.Char('2D加工图纸名', readonly=True)
-    quality_standard_name = fields.Char('质检标准名', readonly=True)
 
     @api.constrains('tool_length')
     def _check_tool_length_size(self):
@@ -839,10 +838,10 @@ class ResProductMo(models.Model):
         else:
             return self.env.ref('sf_dlm.product_uom_cubic_millimeter')
 
-    def attachment_update(self, name, res_id, res_field):
+    def attachment_update(self, name, res_id, res_field, mimetype):
         attachment_info = self.env['ir.attachment'].sudo().search(
             [('res_id', '=', res_id), ('res_field', '=', res_field)], limit=1)
-        attachment_info.write({'name': name})
+        attachment_info.write({'name': name, 'mimetype': mimetype})
 
     # 业务平台分配工厂后在智能工厂先创建销售订单再创建该产品
     def product_create(self, product_id, item, order_id, order_number, i):
@@ -882,8 +881,6 @@ class ResProductMo(models.Model):
             'manual_quotation': item['manual_quotation'] or False,
             'part_number': item.get('part_number') or '',
             'active': True,
-            'machining_drawings_name': item['machining_drawings_name'],
-            'quality_standard_name': item['quality_standard_name'],
             'machining_drawings': '' if not item['machining_drawings'] else base64.b64decode(
                 item['machining_drawings']),
             'quality_standard': '' if not item['quality_standard'] else base64.b64decode(item['quality_standard']),
@@ -894,12 +891,12 @@ class ResProductMo(models.Model):
             vals.update({'taxes_id': [(6, 0, [int(tax_id)])]})
         copy_product_id.sudo().write(vals)
         product_id.product_tmpl_id.active = False
-        if item['machining_drawings'] and item['machining_drawings_name']:
+        if item['machining_drawings'] and item['machining_drawings_name'] and item['machining_drawings_mimetype']:
             self.attachment_update(item['machining_drawings_name'], copy_product_id.product_tmpl_id.id,
-                                   'machining_drawings')
-        if item['quality_standard'] and item['quality_standard_name']:
+                                   'machining_drawings', item['machining_drawings_mimetype'])
+        if item['quality_standard'] and item['quality_standard_name'] and item['quality_standard_mimetype']:
             self.attachment_update(item['quality_standard_name'], copy_product_id.product_tmpl_id.id,
-                                   'quality_standard')
+                                   'quality_standard', item['quality_standard_mimetype'])
         return copy_product_id
 
     def _get_ids(self, param):

sf_manufacturing/models/stock.py

@@ -272,21 +272,6 @@ class StockRule(models.Model):
                     workorder_duration += workorder.duration_expected
 
                 sale_order = self.env['sale.order'].sudo().search([('name', '=', production.origin)])
-                # 根据销售订单号查询快速订单
-                quick_easy_order = self.env['quick.easy.order'].sudo().search([('sale_order_id', '=', sale_order.id)])
-                if quick_easy_order:
-                    production.write({'part_number': quick_easy_order.part_drawing_number,
-                                      'part_drawing': quick_easy_order.machining_drawings})
-                else:
-                    production.write({'part_number': production.product_id.part_number,
-                                      'part_drawing': production.product_id.machining_drawings,
-                                      'quality_standard': production.product_id.quality_standard})
-                    if production.product_id.machining_drawings and production.product_id.machining_drawings_name:
-                        self.attachment_update(production.product_id.machining_drawings_name, production.id,
-                                               'part_drawing')
-                    if production.product_id.quality_standard and production.product_id.quality_standard_name:
-                        self.attachment_update(production.product_id.quality_standard_name, production.id,
-                                               'quality_standard')
                 if sale_order:
                     # sale_order.write({'schedule_status': 'to schedule'})
                     self.env['sf.production.plan'].sudo().with_company(company_id).create({