Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/表面工艺外协修复

sf_manufacturing/models/mrp_workorder.py

@@ -109,8 +109,29 @@ class ResMrpWorkOrder(models.Model):
     glb_file = fields.Binary("glb模型文件", related='production_id.model_file')
     is_subcontract = fields.Boolean(string='是否外协')
     surface_technics_parameters_id = fields.Many2one('sf.production.process.parameter', string="表面工艺可选参数")
-    picking_in_id = fields.Many2one('stock.picking', string='外协入库单')
-    picking_out_id = fields.Many2one('stock.picking', string='外协出库单')
+    picking_ids = fields.Many2many('stock.picking', string='外协出入库单')
+    surface_technics_picking_count = fields.Integer("外协出入库", compute='_compute_surface_technics_picking_ids')
+
+    @api.depends('name', 'production_id.name')
+    def _compute_surface_technics_picking_ids(self):
+        for order in self:
+            picking_ids = self.env['stock.picking'].search([('id', 'in', order.picking_ids.ids)])
+            order.surface_technics_picking_count = len(picking_ids)
+
+    def action_view_surface_technics_picking(self):
+        self.ensure_one()
+        action = self.env["ir.actions.actions"]._for_xml_id("stock.action_picking_tree_all")
+        if len(self.picking_ids) > 1:
+            action['domain'] = [('id', 'in', self.picking_ids.ids)]
+        elif self.picking_ids:
+            # action['name'] = '工艺外协'
+            action['res_id'] = self.picking_ids.id
+            action['views'] = [(self.env.ref('stock.view_picking_form').id, 'form')]
+            if 'views' in action:
+                action['views'] += [(state, view) for state, view in action['views'] if view != 'form']
+        action['context'] = dict(self._context, default_origin=self.name)
+        return action
+
     supplier_id = fields.Many2one('res.partner', string='外协供应商')
     equipment_id = fields.Many2one('maintenance.equipment', string='加工设备')
     is_ok = fields.Boolean(string='是否合格')
@@ -769,11 +790,21 @@ class ResMrpWorkOrder(models.Model):
             记录开始时间
             '''
             self.date_start = datetime.now()
-        # 外协出库单，从“正在等待”变为“就绪”状态
-        if self.is_subcontract is True:
-            picking_out = self.env['stock.picking'].search([('id', '=', self.picking_out_id.id)])
-            if picking_out.state == 'confirmed':
-                picking_out.write({'state': 'assigned'})
+        # 表面工艺外协出库单
+        if self.routing_type == '表面工艺':
+            if self.is_subcontract is True:
+                move_out = self.env['stock.move'].search(
+                    [('location_id', '=', self.env['stock.location'].search(
+                        [('barcode', 'ilike', 'WH-PREPRODUCTION')]).id),
+                     ('location_dest_id', '=', self.env.ref(
+                         'sf_manufacturing.stock_location_locations_virtual_outcontract').id),
+                     ('origin', '=', self.production_id.name)])
+                purchase = self.env['purchase.order'].search([('origin', '=', self.production_id.name)])
+                if purchase and move_out:
+                    move_out.write({'state': 'assigned'})
+                    self.env['stock.move.line'].create(move_out.get_move_line(purchase, self))
+
+                # move_out._action_assign()
         if self.state == 'waiting' or self.state == 'ready' or self.state == 'progress':
             self.move_raw_ids = self.production_id.move_raw_ids
             self.move_raw_ids[0].write({
@@ -852,29 +883,32 @@ class ResMrpWorkOrder(models.Model):
                 记录结束时间
                 '''
                 record.date_finished = datetime.now()
-
-            if record.picking_out_id:
-                picking_out = record.env['stock.picking'].search([('id', '=', record.picking_out_id.id)])
-                if picking_out.workorder_out_id:
-                    order_line_ids = []
-                    for item in picking_out.workorder_out_id:
-                        server_product = record.env['product.template'].search(
-                            [('server_product_process_parameters_id', '=', item.surface_technics_parameters_id.id),
-                             ('detailed_type', '=', 'service')])
-                        if server_product:
-                            order_line_ids.append((0, 0, {
-                                'product_id': server_product.product_variant_id.id,
-                                'product_qty': 1,
-                                'product_uom': server_product.uom_id.id
-                            }))
-                        else:
-                            raise UserError(
-                                '请先在产品中配置表面工艺为%s相关的外协服务产品' % item.surface_technics_parameters_id.name)
-                    record.env['purchase.order'].create({
-                        'partner_id': server_product.seller_ids.partner_id.id,
-                        'state': 'draft',
-                        'order_line': order_line_ids,
-                    })
+            if record.routing_type == '表面工艺':
+                if record.picking_ids[0]:
+                    picking_out = record.env['stock.move.line'].search(
+                        [('picking_id', '=', record.picking_ids[0].id), ('workorder_id', '=', record.id)])
+                    if picking_out:
+                        order_line_ids = []
+                        for item in picking_out.workorder_id:
+                            server_product = self.env['product.template'].search(
+                                [('server_product_process_parameters_id', '=', item.surface_technics_parameters_id.id),
+                                 ('detailed_type', '=', 'service')])
+                            if server_product:
+                                order_line_ids.append((0, 0, {
+                                    'product_id': server_product.product_variant_id.id,
+                                    'product_qty': 1,
+                                    'origin': record.production_id.name,
+                                    'product_uom': server_product.uom_id.id
+                                }))
+                            else:
+                                raise UserError(
+                                    '请先在产品中配置表面工艺为%s相关的外协服务产品' % item.surface_technics_parameters_id.name)
+                        if order_line_ids:
+                            self.env['purchase.order'].create({
+                                'partner_id': server_product.seller_ids.partner_id.id,
+                                'state': 'draft',
+                                'order_line': order_line_ids,
+                            })
             tem_date_planned_finished = record.date_planned_finished
             super().button_finish()
             record.write({