Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/新增工艺退回调整

# Conflicts:
#	sf_manufacturing/models/mrp_production.py
#	sf_manufacturing/views/mrp_production_addional_change.xml

sf_manufacturing/models/mrp_production.py

@@ -34,6 +34,95 @@ class MrpProduction(models.Model):
     tool_state_remark = fields.Text(string='功能刀具状态备注(缺刀)', compute='_compute_tool_state_remark', store=True)
     tool_state_remark2 = fields.Text(string='功能刀具状态备注(无效刀)', readonly=True)
 
+    def _compute_default_delivery_status(self):
+        try:
+            if self.state == 'cancel':
+                return False
+            if not self.deadline_of_delivery:
+                return False
+            hours = self.get_hours_diff()
+            if hours >= 48:
+                return '正常'
+            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:
+            logging.error("Error processing production ID {}: {}".format(self.id, e))
+            raise e
+
+    @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',
+        ]
+        # 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):
+        # 获取当前日期和时间
+        current_datetime = fields.Datetime.now()
+
+        # 将 date_field 转换为 datetime 对象
+        if self.deadline_of_delivery:
+            date_obj = fields.Date.from_string(self.deadline_of_delivery)
+            # 将 date 对象转换为 datetime 对象，设置时间为 00:00:00
+            date_obj = datetime.datetime.combine(date_obj, datetime.time.min)
+
+            # 计算两个日期之间的差值
+            delta = date_obj - current_datetime
+
+            # 返回差值的小时数
+            return int(delta.total_seconds() / 3600)
+        else:
+            return 0.0
+
     @api.depends('procurement_group_id.mrp_production_ids.move_dest_ids.group_id.sale_id')
     def _compute_deadline_of_delivery(self):
         for production in self:
@@ -612,20 +701,6 @@ class MrpProduction(models.Model):
             for workorder in production.workorder_ids:
                 workorder.duration_expected = workorder._get_duration_expected()
 
-    # 生成采购单
-    def get_subcontract_purchase(self):
-        production_all = self.sorted(lambda x: x.id)
-        for production in production_all:
-            for special in production.technology_design_ids:
-                if special.process_parameters_id.gain_way == '外协':
-                    product_id_to_production_names = {}
-                    grouped_product_ids = {k: list(g) for k, g in
-                                           groupby(production_all, key=lambda x: x.product_id.id)}
-                    for product_id, pd in grouped_product_ids.items():
-                        product_id_to_production_names[product_id] = [p.name for p in pd]
-                    self.env['purchase.order'].get_purchase_order(special.process_parameters_id,
-                                                                  special.production_id,
-                                                                  product_id_to_production_names)
 
     # 外协出入库单处理
     def get_subcontract_pick_purchase(self):
@@ -800,6 +875,7 @@ class MrpProduction(models.Model):
                     if td_ids:
                         work.sequence = td_ids[0].sequence
 
+
     def _reset_work_order_sequence_1(self):
         """
         工单工序排序方法（旧）