Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复采购库存销售模块问题

# Conflicts:
#	sf_base/models/tool_base_new.py

sf_manufacturing/models/mrp_production.py

@@ -6,6 +6,9 @@ import requests
 from odoo import api, fields, models, _
 from odoo.exceptions import UserError
 from odoo.addons.sf_base.commons.common import Common
+from odoo.tools import float_compare, float_round, float_is_zero, format_datetime
+
+from odoo.tools import float_compare, float_is_zero
 
 
 class MrpProduction(models.Model):
@@ -258,9 +261,6 @@ class MrpProduction(models.Model):
                     )
                     i += 1
                     for route in product_routing_workcenter:
-                        if i == 1 and route.routing_type == '获取CNC加工程序':
-                            workorders_values.append(
-                                self.env['mrp.workorder'].json_workorder_str('', production, route))
                         if route.is_repeat is True:
                             workorders_values.append(
                                 self.env['mrp.workorder'].json_workorder_str(k, production, route))
@@ -478,13 +478,100 @@ class MrpProduction(models.Model):
             for work in rec.workorder_ids:
                 work.sequence = current_sequence
                 current_sequence += 1
-                if work.name == '获取CNC加工程序':
-                    work.button_start()
-                    #work.fetchCNC()
-                    work.button_finish()
+                # if work.name == '获取CNC加工程序':
+                #     work.button_start()
+                #     #work.fetchCNC()
+                #     work.button_finish()
 
     # 创建工单并进行排序
     def _create_workorder(self):
         self._create_workorder3()
         self._reset_work_order_sequence()
         return True
+
+    #修改标记已完成方法
+    def button_mark_done1(self):
+        self._button_mark_done_sanity_checks()
+
+        if not self.env.context.get('button_mark_done_production_ids'):
+            self = self.with_context(button_mark_done_production_ids=self.ids)
+        res = self._pre_button_mark_done()
+        if res is not True:
+            return res
+
+        if self.env.context.get('mo_ids_to_backorder'):
+            productions_to_backorder = self.browse(self.env.context['mo_ids_to_backorder'])
+            productions_not_to_backorder = self - productions_to_backorder
+        else:
+            productions_not_to_backorder = self
+            productions_to_backorder = self.env['mrp.production']
+
+
+        backorders = productions_to_backorder and productions_to_backorder._split_productions()
+        backorders = backorders - productions_to_backorder
+
+        productions_not_to_backorder._post_inventory(cancel_backorder=True)
+        productions_to_backorder._post_inventory(cancel_backorder=True)
+
+        # if completed products make other confirmed/partially_available moves available, assign them
+        done_move_finished_ids = (productions_to_backorder.move_finished_ids | productions_not_to_backorder.move_finished_ids).filtered(lambda m: m.state == 'done')
+        done_move_finished_ids._trigger_assign()
+
+        # Moves without quantity done are not posted => set them as done instead of canceling. In
+        # case the user edits the MO later on and sets some consumed quantity on those, we do not
+        # want the move lines to be canceled.
+        (productions_not_to_backorder.move_raw_ids | productions_not_to_backorder.move_finished_ids).filtered(lambda x: x.state not in ('done', 'cancel')).write({
+            'state': 'done',
+            'product_uom_qty': 0.0,
+        })
+
+        for production in self:
+            production.write({
+                'date_finished': fields.Datetime.now(),
+                'product_qty': production.qty_produced,
+                'priority': '0',
+                'is_locked': True,
+                'state': 'done',
+            })
+
+        for workorder in self.workorder_ids.filtered(lambda w: w.state not in ('done', 'cancel')):
+            workorder.duration_expected = workorder._get_duration_expected()
+
+        if not backorders:
+            if self.env.context.get('from_workorder'):
+                return {
+                    'type': 'ir.actions.act_window',
+                    'res_model': 'mrp.production',
+                    'views': [[self.env.ref('mrp.mrp_production_form_view').id, 'form']],
+                    'res_id': self.id,
+                    'target': 'main',
+                }
+            if self.user_has_groups('mrp.group_mrp_reception_report') and self.picking_type_id.auto_show_reception_report:
+                lines = self.move_finished_ids.filtered(lambda m: m.product_id.type == 'product' and m.state != 'cancel' and m.quantity_done and not m.move_dest_ids)
+                if lines:
+                    if any(mo.show_allocation for mo in self):
+                        action = self.action_view_reception_report()
+                        return action
+            return True
+        context = self.env.context.copy()
+        context = {k: v for k, v in context.items() if not k.startswith('default_')}
+        for k, v in context.items():
+            if k.startswith('skip_'):
+                context[k] = False
+        action = {
+            'res_model': 'mrp.production',
+            'type': 'ir.actions.act_window',
+            'context': dict(context, mo_ids_to_backorder=None, button_mark_done_production_ids=None)
+        }
+        if len(backorders) == 1:
+            action.update({
+                'view_mode': 'form',
+                'res_id': backorders[0].id,
+            })
+        else:
+            action.update({
+                'name': _("Backorder MO"),
+                'domain': [('id', 'in', backorders.ids)],
+                'view_mode': 'tree,form',
+            })
+        return action

sf_manufacturing/models/mrp_routing_workcenter.py

@@ -6,9 +6,9 @@ class ResMrpRoutingWorkcenter(models.Model):
     _inherit = 'mrp.routing.workcenter'
 
     routing_type = fields.Selection([
-        ('获取CNC加工程序', '获取CNC加工程序'),
-        ('装夹', '装夹'),
-        ('前置三元定位检测', '前置三元定位检测'),
+        # ('获取CNC加工程序', '获取CNC加工程序'),
+        ('装夹预调', '装夹预调'),
+        # ('前置三元定位检测', '前置三元定位检测'),
         ('CNC加工', 'CNC加工'),
         ('后置三元质量检测', '后置三元质量检测'),
         ('解除装夹', '解除装夹'),

sf_manufacturing/models/mrp_workorder.py

@@ -31,9 +31,9 @@ class ResMrpWorkOrder(models.Model):
     processing_panel = fields.Char('加工面')
     sequence = fields.Integer(string='工序')
     routing_type = fields.Selection([
-        ('获取CNC加工程序', '获取CNC加工程序'),
-        ('装夹', '装夹'),
-        ('前置三元定位检测', '前置三元定位检测'),
+        # ('获取CNC加工程序', '获取CNC加工程序'),
+        ('装夹预调', '装夹预调'),
+        # ('前置三元定位检测', '前置三元定位检测'),
         ('CNC加工', 'CNC加工'),
         ('后置三元质量检测', '后置三元质量检测'),
         ('解除装夹', '解除装夹'),
@@ -204,15 +204,15 @@ class ResMrpWorkOrder(models.Model):
         if route.routing_type == '切割':
             duration_expected = self.env['mrp.routing.workcenter'].sudo().search(
                 [('name', '=', '切割')]).time_cycle
-        elif route.routing_type == '获取CNC加工程序':
+        # elif route.routing_type == '获取CNC加工程序':
+        #     duration_expected = self.env['mrp.routing.workcenter'].sudo().search(
+        #         [('name', '=', '获取CNC加工程序')]).time_cycle
+        elif route.routing_type == '装夹预调':
             duration_expected = self.env['mrp.routing.workcenter'].sudo().search(
-                [('name', '=', '获取CNC加工程序')]).time_cycle
-        elif route.routing_type == '工件装夹':
-            duration_expected = self.env['mrp.routing.workcenter'].sudo().search(
-                [('name', '=', '工件装夹')]).time_cycle
-        elif route.routing_type == '前置三元定位检测':
-            duration_expected = self.env['mrp.routing.workcenter'].sudo().search(
-                [('name', '=', '前置三元定位检测')]).time_cycle
+                [('name', '=', '装夹预调')]).time_cycle
+        # elif route.routing_type == '前置三元定位检测':
+        #     duration_expected = self.env['mrp.routing.workcenter'].sudo().search(
+        #         [('name', '=', '前置三元定位检测')]).time_cycle
         elif route.routing_type == 'CNC加工':
             duration_expected = self.env['mrp.routing.workcenter'].sudo().search(
                 [('name', '=', 'CNC加工')]).time_cycle
@@ -495,7 +495,7 @@ class ResMrpWorkOrder(models.Model):
 
     # 重写工单开始按钮方法
     def button_start(self):
-        if self.routing_type == '装夹' and self.production_id.move_raw_ids[0].move_line_ids[0].lot_id.name:
+        if self.routing_type == '装夹预调' and self.production_id.move_raw_ids[0].move_line_ids[0].lot_id.name:
             self.pro_code = self.production_id.move_raw_ids[0].move_line_ids[0].lot_id.name
         # 外协出库单，从“正在等待”变为“就绪”状态
         if self.is_subcontract is True:
@@ -581,7 +581,8 @@ class ResMrpWorkOrder(models.Model):
         if is_production_id == True and self.name == '解除装夹':
             for move_raw_id in self.production_id.move_raw_ids:
                 move_raw_id.quantity_done = move_raw_id.product_uom_qty
-                self.production_id.state = 'done'
+            self.production_id.button_mark_done1()
+                # self.production_id.state = 'done'