Skip to content

D
dwsproject
Commit ac64f852 by 夏超
Options

[add] 新增工艺设计前端页面，修改返修单数量问题

parent 97a7f48e
Showing with 61 additions and 14 deletions
jzjx_project/controllers/roke_work_order.py
...@@ -28,7 +28,7 @@ class RokeWorkstationWorkOrderModel(http.Controller): ...@@ -28,7 +28,7 @@ class RokeWorkstationWorkOrderModel(http.Controller):
"routing_id": routing_id, "routing_id": routing_id,
"user_id": user_id "user_id": user_id
} }
template = env.get_template('/src/html/index.html') template = env.get_template('/src/html/view/craft_design.html')
html = template.render(values) html = template.render(values)
return html return html
......
jzjx_project/models/inherit_roke_work_order.py
...@@ -9,6 +9,7 @@ class InheritWorkOrder(models.Model): ...@@ -9,6 +9,7 @@ class InheritWorkOrder(models.Model):
repair_task_id = fields.Many2one('roke.production.task', string="上级任务") repair_task_id = fields.Many2one('roke.production.task', string="上级任务")
def write(self, vals): def write(self, vals):
old_finish_qty = self.finish_qty
id_dict = {} id_dict = {}
for v in self: for v in self:
id_dict[str(v.id)] = v.state id_dict[str(v.id)] = v.state
...@@ -22,13 +23,19 @@ class InheritWorkOrder(models.Model): ...@@ -22,13 +23,19 @@ class InheritWorkOrder(models.Model):
repair_order_id = self.env["roke.repair.order.line"].sudo().search([ repair_order_id = self.env["roke.repair.order.line"].sudo().search([
("repair_work_order_id", "=", self.id)], limit=1) ("repair_work_order_id", "=", self.id)], limit=1)
if repair_order_id: if repair_order_id:
repair_order_id.write({"state": "返修完成"}) repair_order_id.write({
"state": "返修完成",
"execute_qty": repair_order_id.execute_qty + self.finish_qty
})
repair_order_id.order_id.write({"state": "返修完成"}) repair_order_id.order_id.write({"state": "返修完成"})
if state == "未完工" and old_state in ["暂停", "强制完工", "已完工"]: if state == "未完工" and old_state in ["暂停", "强制完工", "已完工"]:
repair_order_id = self.env["roke.repair.order.line"].sudo().search([ repair_order_id = self.env["roke.repair.order.line"].sudo().search([
("repair_work_order_id", "=", self.id)], limit=1) ("repair_work_order_id", "=", self.id)], limit=1)
if repair_order_id: if repair_order_id:
repair_order_id.write({"state": "返修中"}) repair_order_id.write({
"state": "返修中",
"execute_qty": repair_order_id.execute_qty + self.finish_qty - old_finish_qty
})
repair_order_id.order_id.write({"state": "返修中"}) repair_order_id.order_id.write({"state": "返修中"})
return res return res
......
jzjx_project/static/src/html/assets/iconfont/iconfont.css 0 → 100644
@font-face {
font-family: "iconfont"; /* Project id 4723859 */
src: url('iconfont.woff2?t=1731743989340') format('woff2'),
url('iconfont.woff?t=1731743989340') format('woff'),
url('iconfont.ttf?t=1731743989340') format('truetype');
}
.iconfont {
font-family: "iconfont" !important;
font-size: 16px;
font-style: normal;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
}
.icon-BOM1:before {
content: "\e707";
}
.icon-BOM:before {
content: "\e622";
}
.icon-tuozhuai1:before {
content: "\e611";
}
.icon-chanpin2:before {
content: "\e61b";
}
.icon-chanpin1:before {
content: "\e623";
}
.icon-zhankai:before {
content: "\e60a";
}
.icon-zhedie:before {
content: "\e62f";
}
.icon-wenjianjiazhankai:before {
content: "\e602";
}
.icon-wenjianjiaguanbi:before {
content: "\e74a";
}
jzjx_project/static/src/html/element-ui/index.css 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
jzjx_project/static/src/html/element-ui/index.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
jzjx_project/static/src/html/index.html deleted 100644 → 0
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<title>Title</title>
</head>
<body>
[[ product_id ]] [[ routing_id ]]
</body>
</html>
\ No newline at end of file
jzjx_project/static/src/html/js/vue.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
jzjx_project/static/src/html/view/craft_design.html 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
jzjx_project/static/src/html/view/index.html 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
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