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):
@@ -806,6 +806,8 @@ class MrpProduction(models.Model):
                     'date_to': date_planned_end,
                 })
                 # work.write({'date_planned_start': date_planned_start, 'date_planned_finished': date_planned_end})
+                # 设置一个较大的结束时间，防止在设置开始时间时，结束时间小于开始时间
+                work.date_planned_finished = datetime.datetime.today() + datetime.timedelta(days=100)
                 work.date_planned_start = date_planned_start
                 work.date_planned_finished = date_planned_end
                 routing_workcenter = self.env['mrp.routing.workcenter'].sudo().search(

sf_manufacturing/models/mrp_workorder.py

@@ -306,6 +306,7 @@ class ResMrpWorkOrder(models.Model):
     is_delivery = fields.Boolean('是否配送完成', default=False)
     rfid_code = fields.Char('RFID码')
     rfid_code_old = fields.Char('RFID码(已解除)')
+    is_test_env = fields.Boolean('测试环境', default=False)
 
     production_line_id = fields.Many2one('sf.production.line', related='production_id.production_line_id',
                                          string='生产线', store=True, tracking=True)
@@ -321,6 +322,9 @@ class ResMrpWorkOrder(models.Model):
     detailed_reason = fields.Text('详细原因')
     is_rework = fields.Boolean(string='是否返工', default=False)
 
+    def button_change_env(self):
+        self.is_test_env = not self.is_test_env
+
     @api.constrains('blocked_by_workorder_ids')
     def _check_no_cyclic_dependencies(self):
         if self.production_id.state not in ['rework'] and self.state not in ['rework']:

sf_manufacturing/models/product_template.py

@@ -777,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):
@@ -840,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):
@@ -883,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']),
@@ -895,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({