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

Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化制造功能

Browse Source
This commit is contained in:
mgw
2024-09-11 18:11:07 +08:00
parent 908e4a3df6 6b403f2c1e
commit 335151f6ca
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sf_manufacturing/models/mrp_workcenter.py
View File

@@ -207,7 +207,8 @@ class ResWorkcenter(models.Model):
date_planned_end = date_planned_end.strftime('%Y-%m-%d') date_planned_end = date_planned_end.strftime('%Y-%m-%d')
plan_ids = self.env['sf.production.plan'].sudo().search([('date_planned_start', '>=', date_planned_start), plan_ids = self.env['sf.production.plan'].sudo().search([('date_planned_start', '>=', date_planned_start),
('date_planned_start', '<', ('date_planned_start', '<',
date_planned_end), ('state', '!=', 'draft')]) date_planned_end),
('state', 'not in', ['draft', 'cancel'])])
if plan_ids: if plan_ids:
sum_qty = sum([p.product_qty for p in plan_ids]) sum_qty = sum([p.product_qty for p in plan_ids])
if sum_qty >= self.default_capacity: if sum_qty >= self.default_capacity:
@@ -222,7 +223,8 @@ class ResWorkcenter(models.Model):
date_planned_end = date_planned_end.strftime('%Y-%m-%d %H:00:00') date_planned_end = date_planned_end.strftime('%Y-%m-%d %H:00:00')
plan_ids = self.env['sf.production.plan'].sudo().search([('date_planned_start', '>=', date_planned_start), plan_ids = self.env['sf.production.plan'].sudo().search([('date_planned_start', '>=', date_planned_start),
('date_planned_start', '<', ('date_planned_start', '<',
date_planned_end), ('state', '!=', 'draft')]) date_planned_end),
('state', 'not in', ['draft', 'cancel'])])
if plan_ids: if plan_ids:
sum_qty = sum([p.product_qty for p in plan_ids]) sum_qty = sum([p.product_qty for p in plan_ids])