From 8aca6ce0843615f419d3834f1a05b334dea415e6 Mon Sep 17 00:00:00 2001
From: hujiaying <hujiaying@jikimo.com>
Date: Wed, 18 Sep 2024 14:03:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A1=E5=88=92=E6=8E=92?=
 =?UTF-8?q?=E7=A8=8B=E7=94=98=E7=89=B9=E5=9B=BE=E7=95=8C=E9=9D=A2=E4=B8=8D?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=B7=B2=E7=BB=8F=E6=8E=92=E7=A8=8B=E7=9A=84?=
 =?UTF-8?q?=E5=88=B6=E9=80=A0=E8=AE=A2=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_plan/models/custom_plan.py | 23 +++++++++++++++++++++++
 sf_plan/views/view.xml        |  4 ++--
 2 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/sf_plan/models/custom_plan.py b/sf_plan/models/custom_plan.py
index 05ebf034..6fef2a31 100644
--- a/sf_plan/models/custom_plan.py
+++ b/sf_plan/models/custom_plan.py
@@ -69,6 +69,27 @@ class sf_production_plan(models.Model):
     sequence = fields.Integer(string='序号', copy=False, readonly=True, index=True)
     current_operation_name = fields.Char(string='当前工序名称', size=64, default='生产计划')
 
+    @api.onchange('date_planned_start')
+    def date_planned_start_onchange(self):
+        if self.date_planned_start:
+            self.date_planned_finished = self.date_planned_start + timedelta(hours=1)
+
+    #处理计划状态非代排程，计划结束时间为空的数据处理
+    def deal_no_date_planned_finished(self):
+        plans = self.env['sf.production.plan'].search(
+            [('date_planned_finished', '=', False), ('state', 'in', ['processing', 'done', 'finished'])])
+        for item in plans:
+            if item.date_planned_start:
+                item.date_planned_finished = item.date_planned_start + timedelta(hours=1)
+            if not item.order_deadline and item.date_planned_start:
+                item.order_deadline = item.date_planned_start + timedelta(days=7)
+
+    @api.model
+    def search_read(self, domain=None, fields=None, offset=0, limit=None, order=None):
+
+        info = super(sf_production_plan, self).search_read(domain, fields, offset, limit, order)
+        return info
+
     # 计算实际加工时长
     @api.depends('actual_start_time', 'actual_end_time')
     def _compute_actual_process_time(self):
@@ -220,6 +241,8 @@ class sf_production_plan(models.Model):
                                 record.date_planned_start, record.date_planned_finished = \
                                     item.date_planned_start, item.date_planned_finished
                     record.state = 'done'
+                    record.date_planned_finished = record.date_planned_start + timedelta(
+                        minutes=60) if not record.date_planned_finished else record.date_planned_finished
                     # record.production_id.schedule_state = '已排'
                     record.sudo().production_id.schedule_state = '已排'
                     record.sudo().production_id.process_state = '待装夹'
diff --git a/sf_plan/views/view.xml b/sf_plan/views/view.xml
index 10992f4a..82382ef3 100644
--- a/sf_plan/views/view.xml
+++ b/sf_plan/views/view.xml
@@ -88,8 +88,8 @@
 
                             <group string="加工信息">
 
-                                <field name="date_planned_start" placeholder="如果不选择计划开始时间，会取当前时间来做排程"/>
-                                <field name="date_planned_finished"/>
+                                <field name="date_planned_start" placeholder="如果不选择计划开始时间，会取当前时间来做排程" required="1"/>
+                                <field name="date_planned_finished" required="1"/>
                                 <field name="actual_process_time"/>
                                 <field name="actual_start_time"/>
                                 <field name="actual_end_time"/>