Accept Merge Request #1505: (feature/delivery_status -> develop)

Merge Request: 交期状态

Created By: @廖丹龙
Reviewed By: @胡尧
Approved By: @胡尧 
Accepted By: @廖丹龙
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1505

sf_manufacturing/__manifest__.py

@@ -10,8 +10,9 @@
     """,
     'category': 'sf',
     'website': 'https://www.sf.jikimo.com',
-    'depends': ['sf_base', 'sf_maintenance', 'web_widget_model_viewer', 'sf_warehouse','jikimo_attachment_viewer'],
+    'depends': ['sf_base', 'sf_maintenance', 'web_widget_model_viewer', 'sf_warehouse', 'jikimo_attachment_viewer'],
     'data': [
+        'data/cron_data.xml',
         'data/stock_data.xml',
         'data/empty_racks_data.xml',
         'data/panel_data.xml',

sf_manufacturing/data/cron_data.xml

@@ -0,0 +1,29 @@
+<odoo>
+    <data noupdate="1">
+        <record model="ir.cron" id="ir_cron_update_construction_period_status">
+            <field name="name">工期状态变更</field>
+            <field name="model_id" ref="model_mrp_workorder"/>
+            <field name="state">code</field>
+            <field name="code">model._corn_update_construction_period_status()</field>
+            <field name="interval_number">12</field>
+            <field name="interval_type">hours</field>
+            <field name="numbercall">-1</field>
+            <field name="doall" eval="False"/>
+            <field name="user_id" ref="base.user_root"/>
+            <field name="active" eval="True"/>
+        </record>
+
+        <record model="ir.cron" id="ir_cron_update_delivery_status">
+            <field name="name">交期状态变更</field>
+            <field name="model_id" ref="model_mrp_production"/>
+            <field name="state">code</field>
+            <field name="code">model._corn_update_delivery_status()</field>
+            <field name="interval_number">12</field>
+            <field name="interval_type">hours</field>
+            <field name="numbercall">-1</field>
+            <field name="doall" eval="False"/>
+            <field name="user_id" ref="base.user_root"/>
+            <field name="active" eval="True"/>
+        </record>
+    </data>
+</odoo>

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:
+        # previous_workorder = self.env['mrp.production'].search([('state', 'in', need_list)])
-            production.delivery_status = production._compute_default_delivery_status()
+        self.get_page_all_records('mrp.production', self.run_compute_delivery_status,
-
+                                  [('state', 'in', need_list)], 100)
-    delivery_status = fields.Selection([('正常', '正常'), ('预警', '预警'), ('已逾期', '已逾期')], string='交期状态',
-                                       store=True,
-                                       compute='_compute_delivery_status',
-                                       default=lambda self: self._compute_default_delivery_status())
 
     def get_hours_diff(self):
         # 获取当前日期和时间

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 = [
+        need_list=['pending', 'waiting', 'ready', 'progress', 'to be detected','done']
-        'progress',
-        'to be detected']
         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='工期状态',
+    construction_period_status = fields.Selection([('正常', '正常'), ('预警', '预警'), ('已逾期', '已逾期')],
+                                                  string='工期状态',
                                                   store=True,
                                                   compute='_compute_construction_period_status',
-                                       default=lambda self: self._compute_default_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):
         # 获取当前日期和时间

sf_manufacturing/views/mrp_production_addional_change.xml

@@ -557,7 +557,7 @@
                     <separator/>
                 </xpath>
                 <xpath expr="//search" position="inside">
-                    <searchpanel class="account_root">
+                    <searchpanel>
                         <field name="state" icon="fa-filter" enable_counters="1"/>
                         <field name="delivery_status" icon="fa-filter" enable_counters="1"/>
                     </searchpanel>