jikimo/jikimo_sf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accept Merge Request #1293: (feature/update_production_line -> develop)

Browse Source 
Merge Request: 修改计划排程时间范围内判断取值向上取整

Created By: @胡嘉莹
Reviewed By: @马广威
Approved By: @马广威 
Accepted By: @胡嘉莹
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1293?initial=true
This commit is contained in:
胡嘉莹
2024-09-11 12:15:17 +08:00
committed by Coding
parent 97a5d91fce 181f490d47
commit 8a10d18f37
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sf_manufacturing/models/mrp_workcenter.py
View File

@@ -4,6 +4,7 @@ from collections import defaultdict
from odoo import fields, models, api from odoo import fields, models, api
from odoo.addons.resource.models.resource import Intervals from odoo.addons.resource.models.resource import Intervals
from odoo.exceptions import UserError, ValidationError from odoo.exceptions import UserError, ValidationError
import math
class ResWorkcenter(models.Model): class ResWorkcenter(models.Model):
@@ -195,7 +196,9 @@ class ResWorkcenter(models.Model):
def get_integer_and_decimal_parts(self, value): def get_integer_and_decimal_parts(self, value):
integer_part = int(value) integer_part = int(value)
decimal_part = value - integer_part decimal_part = value - integer_part
return int(integer_part), int(decimal_part) if decimal_part > 0:
decimal_part = round(decimal_part, 2) * 60
return int(integer_part), math.ceil(decimal_part)
# 处理排程是否超过日产能 # 处理排程是否超过日产能
def deal_available_default_capacity(self, date_planned): def deal_available_default_capacity(self, date_planned):