Merge branch 'release/release_2.5'

在下发编程单时，如果已经排程，在修改工单起止时间时先设置大的结束时间，避免设置时间出错
Merge branch 'release/release_2.4'
2024-11-04 19:49:05 +08:00 · 2024-10-31 11:15:06 +08:00 · 2024-10-11 09:29:34 +08:00 · 2024-09-06 13:47:55 +08:00
1 changed files with 2 additions and 0 deletions
--- a/sf_manufacturing/models/mrp_production.py
+++ b/sf_manufacturing/models/mrp_production.py
@@ -806,6 +806,8 @@ class MrpProduction(models.Model):
                    'date_to': date_planned_end,
                })
                # work.write({'date_planned_start': date_planned_start, 'date_planned_finished': date_planned_end})
+                # 设置一个较大的结束时间，防止在设置开始时间时，结束时间小于开始时间
+                work.date_planned_finished = datetime.datetime.today() + datetime.timedelta(days=100)
                work.date_planned_start = date_planned_start
                work.date_planned_finished = date_planned_end
                routing_workcenter = self.env['mrp.routing.workcenter'].sudo().search(
Author	SHA1	Message	Date
胡尧	0575d89227	Merge branch 'release/release_2.5'	2024-11-04 19:49:05 +08:00
胡尧	76597f6ccb	在下发编程单时，如果已经排程，在修改工单起止时间时先设置大的结束时间，避免设置时间出错	2024-10-31 11:15:06 +08:00
胡尧	39afc99b8f	Merge branch 'release/release_2.4'	2024-10-11 09:29:34 +08:00
杨金灵	f230ad55fb	Accept Merge Request #1284 : (hotfix/修复报废-外协入库验证 -> master) Merge Request: 修复报废-外协入库验证 Created By: @杨金灵 Accepted By: @杨金灵 URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1284	2024-09-06 13:47:55 +08:00