解决冲突

2024-11-15 15:30:35 +08:00
parent 73c986cd50 f8a9a38778
commit 9410ca82db
10 changed files with 150 additions and 33 deletions
--- a/sf_manufacturing/models/mrp_production.py
+++ b/sf_manufacturing/models/mrp_production.py
@@ -35,23 +35,18 @@ class MrpProduction(models.Model):
    tool_state_remark2 = fields.Text(string='功能刀具状态备注(无效刀)', readonly=True)

    def _compute_default_delivery_status(self):
-        need_list = [
-            'pending_cam',
-            'progress',
-            'rework',
-            'scrap',
-            'to_close',
-        ]
        try:
-            if self.state not in need_list:
+            if self.state == 'cancel':
                return False
            if not self.deadline_of_delivery:
-                return '已逾期'
+                return False
            hours = self.get_hours_diff()
            if hours >= 48:
                return '正常'
-            elif hours > 0 and hours < 48:
+            elif hours > 0 and hours < 48 and self.state != 'done':
                return '预警'
+            elif hours > 0 and hours < 48 and self.state == 'done':
+                return '正常'
            else:
                return '已逾期'
        except Exception as e:
@@ -60,20 +55,55 @@ class MrpProduction(models.Model):

    @api.depends('state', 'deadline_of_delivery')
    def _compute_delivery_status(self):
+        for production in self:
+            delivery_status = production._compute_default_delivery_status()
+            if delivery_status and production.delivery_status != delivery_status:
+                production.delivery_status = delivery_status
+
+    delivery_status = fields.Selection([('正常', '正常'), ('预警', '预警'), ('已逾期', '已逾期')], string='交期状态',
+                                       store=True,
+                                       compute='_compute_delivery_status',
+                                       default=lambda self: self._compute_default_delivery_status())
+
+    def get_page_all_records(self, model_name, func, domain, page_size=100):
+        # 获取模型对象
+        model = self.env[model_name].sudo()
+
+        # 初始化分页参数
+        page_number = 1
+        while True:
+            # 计算偏移量
+            offset = (page_number - 1) * page_size
+
+            # 获取当前页的数据
+            records = model.search(domain, limit=page_size, offset=offset)
+
+            # 如果没有更多记录，退出循环
+            if not records:
+                break
+
+            # 将当前页的数据添加到结果列表
+            func(records)
+            # 增加页码
+            page_number += 1
+
+    def run_compute_delivery_status(self, records):
+        records._compute_delivery_status()
+
+    def _corn_update_delivery_status(self):
        need_list = [
+            'draft',
+            'technology_to_confirmed',
+            'confirmed',
            'pending_cam',
            'progress',
            'rework',
            'scrap',
            'to_close',
        ]
-        for production in self:
-            production.delivery_status = production._compute_default_delivery_status()
-
-    delivery_status = fields.Selection([('正常', '正常'), ('预警', '预警'), ('已逾期', '已逾期')], string='交期状态',
-                                       store=True,
-                                       compute='_compute_delivery_status',
-                                       default=lambda self: self._compute_default_delivery_status())
+        # previous_workorder = self.env['mrp.production'].search([('state', 'in', need_list)])
+        self.get_page_all_records('mrp.production', self.run_compute_delivery_status,
+                                  [('state', 'in', need_list)], 100)

    def get_hours_diff(self):
        # 获取当前日期和时间
@@ -779,6 +809,7 @@ class MrpProduction(models.Model):
                    if td_ids:
                        work.sequence = td_ids[0].sequence

+
    def _reset_work_order_sequence_1(self):
        """
        工单工序排序方法（旧）
--- a/sf_manufacturing/models/mrp_workorder.py
+++ b/sf_manufacturing/models/mrp_workorder.py
@@ -148,19 +148,19 @@ class ResMrpWorkOrder(models.Model):
    tag_type = fields.Selection([("重新加工", "重新加工")], string="标签", tracking=True)

    def _compute_default_construction_period_status(self):
-        need_list = [
-        'progress',
-        'to be detected']
+        need_list=['pending', 'waiting', 'ready', 'progress', 'to be detected','done']
        try:
            if self.state not in need_list:
                return False
            if not self.date_planned_finished:
-                return '已逾期'
+                return False
            hours = self.get_hours_diff()
            if hours >= 12:
                return '正常'
-            elif hours > 0 and hours < 12:
+            elif hours > 0 and hours < 12 and self.state!='done':
                return '预警'
+            elif hours > 0 and hours < 12 and self.state=='done':
+                return '正常'
            else:
                return '已逾期'
        except Exception as e:
@@ -170,12 +170,46 @@ class ResMrpWorkOrder(models.Model):
    @api.depends('state', 'date_planned_finished')
    def _compute_construction_period_status(self):
        for worker in self:
-            worker.construction_period_status = worker._compute_default_construction_period_status()
+            construction_period_status = worker._compute_default_construction_period_status()
+            if construction_period_status and worker.construction_period_status!=construction_period_status:
+                worker.construction_period_status = construction_period_status

-    construction_period_status = fields.Selection([('正常', '正常'), ('预警', '预警'), ('已逾期', '已逾期')], string='工期状态',
-                                       store=True,
-                                       compute='_compute_construction_period_status',
-                                       default=lambda self: self._compute_default_construction_period_status())
+    construction_period_status = fields.Selection([('正常', '正常'), ('预警', '预警'), ('已逾期', '已逾期')],
+                                                  string='工期状态',
+                                                  store=True,
+                                                  compute='_compute_construction_period_status',
+                                                  default=lambda
+                                                      self: self._compute_default_construction_period_status())
+
+    def get_page_all_records(self, model_name, func, domain, page_size=100):
+        # 获取模型对象
+        model = self.env[model_name].sudo()
+
+        # 初始化分页参数
+        page_number = 1
+        while True:
+            # 计算偏移量
+            offset = (page_number - 1) * page_size
+
+            # 获取当前页的数据
+            records = model.search(domain, limit=page_size, offset=offset)
+
+            # 如果没有更多记录，退出循环
+            if not records:
+                break
+
+            # 将当前页的数据添加到结果列表
+            func(records)
+            # 增加页码
+            page_number += 1
+    def run_compute_construction_period_status(self,records):
+        records._compute_construction_period_status()
+    def _corn_update_construction_period_status(self):
+        need_list=['pending', 'waiting', 'ready', 'progress', 'to be detected']
+        # need_list = [
+        #     'progress',
+        #     'to be detected']
+        self.get_page_all_records('mrp.workorder',self.run_compute_construction_period_status,[('state', 'in', need_list)],100)

    def get_hours_diff(self):
        # 获取当前日期和时间
--- a/sf_manufacturing/models/stock.py
+++ b/sf_manufacturing/models/stock.py
@@ -505,6 +505,12 @@ class ProductionLot(models.Model):
                if product.categ_id.name == '刀具':
                    return self.env['stock.lot'].get_tool_generate_lot_names1(company, product)
                else:
+                    # 对last_serial的name进行检测，如果不是以产品名称+数字的形式的就重新搜索
+                    if product.name.split('[')[0] not in last_serial.name:
+                        last_serial = self.env['stock.lot'].search(
+                            [('company_id', '=', company.id), ('product_id', '=', product.id),
+                             ('name', 'ilike', product.name.split('[')[0])],
+                            limit=1, order='name desc')
                    return self.env['stock.lot'].generate_lot_names1(product.name, last_serial.name, 2)[1]
        now = datetime.now().strftime("%Y%m%d")
        if product.cutting_tool_model_id:
@@ -831,10 +837,11 @@ class ReStockMove(models.Model):
                    self.next_serial = self._get_tool_next_serial(self.company_id, self.product_id, self.origin)
                else:
                    self.next_serial = self.env['stock.lot']._get_next_serial(self.company_id, self.product_id)
+                    if self.picking_type_id.sequence_code == 'DL' and not self.move_line_nosuggest_ids:
+                        self.action_assign_serial_show_details()
            elif self.product_id.tracking == "lot":
                self._put_tool_lot(self.company_id, self.product_id, self.origin)
-            if not self.move_line_nosuggest_ids:
-                self._generate_serial_numbers()
+

        return {
            'name': _('Detailed Operations'),