Commit 273b2677 by 夏超

[fix] 修改前端工艺设计

parent 2fb3af5b
import logging import logging
import pytz import pytz
from odoo.osv import expression
from odoo import models, fields, api, http, SUPERUSER_ID, _ from odoo import models, fields, api, http, SUPERUSER_ID, _
from odoo.addons.roke_workstation_api.controllers.product_task import RokeWorkstationProductionTask from odoo.addons.roke_workstation_api.controllers.product_task import RokeWorkstationProductionTask
from odoo.addons.roke_workstation_api.controllers.work_order import RokeWorkstationWorkOrder from odoo.addons.roke_workstation_api.controllers.work_order import RokeWorkstationWorkOrder
...@@ -214,13 +215,12 @@ class InheritRokeWorkstationWorkOrder(RokeWorkstationWorkOrder): ...@@ -214,13 +215,12 @@ class InheritRokeWorkstationWorkOrder(RokeWorkstationWorkOrder):
return {"code": 1, "message": f"入参错误! “工位ID”为必传数据。", "data": {}} return {"code": 1, "message": f"入参错误! “工位ID”为必传数据。", "data": {}}
domain = [ domain = [
"|", "&", "&", "&",
("task_id", "=", task_id),
("process_id", "in", process_ids), ("process_id", "in", process_ids),
("state", "in", ["未完工", "暂停"]), ("state", "in", ["未完工", "暂停"]),
("work_center_id", "=", False), ("work_center_id", "=", False)
("work_center_id", "=", work_center_id)
] ]
domain = expression.OR([domain, [("work_center_id", "=", work_center_id)]])
domain = expression.AND([[("task_id", "=", task_id)], domain])
if work_order_id: if work_order_id:
domain = [("id", "=", work_order_id)] domain = [("id", "=", work_order_id)]
work_order = _self.env["roke.work.order"].search(domain, order=f"sequence asc, process_id asc, id asc", limit=1) work_order = _self.env["roke.work.order"].search(domain, order=f"sequence asc, process_id asc, id asc", limit=1)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment