From de32f5db788f8f0eaa5985822f7b59155710a567 Mon Sep 17 00:00:00 2001 From: mgw <1392924357@qq.com> Date: Mon, 7 Aug 2023 08:58:50 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E7=9C=8B=E6=9D=BF=E8=A7=86=E5=9B=BE?= =?UTF-8?q?=E7=AD=9B=E9=80=89=E5=AE=9E=E7=8E=B0=E5=8A=9F=E8=83=BD=E7=9A=84?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E5=B7=B2=E5=85=B7=E5=A4=87=EF=BC=88=E7=9C=8B?= =?UTF-8?q?=E6=9D=BF=E5=B7=B2=E6=8A=A0=EF=BC=8C=E5=AD=97=E6=AE=B5=E5=AD=98?= =?UTF-8?q?=E5=9C=A8=EF=BC=89=EF=BC=8C=E5=BE=85=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_manufacturing/models/mrp_workcenter.py | 3 + .../static/src/js/kanban_change.js | 31 +++ .../static/src/xml/kanban_change.xml | 13 +- .../views/mrp_workcenter_views.xml | 197 ++++++++++++++++-- 4 files changed, 223 insertions(+), 21 deletions(-) diff --git a/sf_manufacturing/models/mrp_workcenter.py b/sf_manufacturing/models/mrp_workcenter.py index 7483d188..525c2f54 100644 --- a/sf_manufacturing/models/mrp_workcenter.py +++ b/sf_manufacturing/models/mrp_workcenter.py @@ -6,6 +6,9 @@ from odoo.addons.resource.models.resource import Intervals class ResWorkcenter(models.Model): _inherit = "mrp.workcenter" + + # 生产线显示 + production_line_show = fields.Char(string='生产线') equipment_id = fields.Many2one('maintenance.equipment', string='设备') machine_tool_id = fields.Many2one('sf.machine_tool', string='机床') production_line_id = fields.Many2one('sf.production.line', string='生产线') diff --git a/sf_manufacturing/static/src/js/kanban_change.js b/sf_manufacturing/static/src/js/kanban_change.js index b60a84a4..64963d18 100644 --- a/sf_manufacturing/static/src/js/kanban_change.js +++ b/sf_manufacturing/static/src/js/kanban_change.js @@ -15,8 +15,32 @@ class CustomKanbanController extends KanbanController { this.workOrders = await this.getAllWorkOrders(); console.log('lines', this.workOrders); } + buttonClick(ev) { + const button = ev.currentTarget; + const id = button.getAttribute('data-id'); + + console.log('true_id', id); + const context = {production_line_show: 'shengchanxian1'} + this.env.services.rpc('/web/dataset/call_kw', { + model: 'mrp.workcenter', + method: 'search_read', + args: [[], ['id']], + kwargs: {} + }).then((records) => { + const ids = records.map(record => record.id); + const context = {production_line_show: id}; + this.env.services.rpc('/web/dataset/call_kw', { + model: 'mrp.workcenter', + method: 'write', + args: [ids, context], + kwargs: {} + }).then((response) => { + console.log('response', response); + }); + }); + } async getAllWorkOrders() { const response = await this.env.services.rpc('/web/dataset/call_kw',{ model: 'sf.production.line', @@ -24,7 +48,14 @@ class CustomKanbanController extends KanbanController { args: [], kwargs: {}, }); + // const response1 = await this.env.services.rpc('/web/dataset/call_kw',{ + // model: 'mrp.workcenter', + // method: 'search_read', + // args: [], + // kwargs: {}, + // }); console.log('response', response); + // console.log('response1', response1); // 你可以在这里处理响应，例如将其存储在控制器的状态中 return response; } diff --git a/sf_manufacturing/static/src/xml/kanban_change.xml b/sf_manufacturing/static/src/xml/kanban_change.xml index c18fc103..c652b95e 100644 --- a/sf_manufacturing/static/src/xml/kanban_change.xml +++ b/sf_manufacturing/static/src/xml/kanban_change.xml @@ -1,18 +1,13 @@ - - - - - -
- +
+ -
+
+
diff --git a/sf_manufacturing/views/mrp_workcenter_views.xml b/sf_manufacturing/views/mrp_workcenter_views.xml index 8e360993..dee39525 100644 --- a/sf_manufacturing/views/mrp_workcenter_views.xml +++ b/sf_manufacturing/views/mrp_workcenter_views.xml @@ -94,6 +94,7 @@ + @@ -101,18 +102,175 @@ - - mrp.workcenter.view.kanban.inherit.maintenance - mrp.workcenter - - - - - - - + + + + + + + + + + + + + + + mrp.workcenter.kanban.inherit + mrp.workcenter + + + + + + + + + + + + +
+ +
+
+
+
+ + + + +
+
+ +
+
+
+
+
+
+ + + + + + +
+
+
+
+
+ + To Launch + +
+
+ +
+
+
+
+ + In Progress + +
+
+ +
+
+
+
+ + Late + +
+
+ +
+
+
+
+ + OEE + +
+
+ + + % + + +
+
+
+
+
+
+ + + +
+
+
+
+ + + + + + @@ -140,6 +298,21 @@ + + + mrp.workcenter.inherit + mrp.workcenter + + + + + + + + From 4f893929ca4f0c39cc54ffb40d0229887c54b28b Mon Sep 17 00:00:00 2001 From: mgw <1392924357@qq.com> Date: Mon, 7 Aug 2023 10:50:44 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E4=B8=AD=E5=BF=83?= =?UTF-8?q?=E7=9C=8B=E6=9D=BF=E8=A7=86=E5=9B=BE=E5=8A=A8=E6=80=81=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E6=A0=87=E7=AD=BE=E9=A1=B5=E5=B9=B6=E5=8F=AF=E5=88=9D?= =?UTF-8?q?=E6=AD=A5=E8=BF=9B=E8=A1=8C=E7=82=B9=E5=87=BB=E6=99=92=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../static/src/js/kanban_change.js | 1 + .../views/mrp_workcenter_views.xml | 22 +++---------------- 2 files changed, 4 insertions(+), 19 deletions(-) diff --git a/sf_manufacturing/static/src/js/kanban_change.js b/sf_manufacturing/static/src/js/kanban_change.js index 64963d18..5e2bd5e9 100644 --- a/sf_manufacturing/static/src/js/kanban_change.js +++ b/sf_manufacturing/static/src/js/kanban_change.js @@ -36,6 +36,7 @@ class CustomKanbanController extends KanbanController { kwargs: {} }).then((response) => { console.log('response', response); + location.reload(); }); }); diff --git a/sf_manufacturing/views/mrp_workcenter_views.xml b/sf_manufacturing/views/mrp_workcenter_views.xml index dee39525..6d2a2b33 100644 --- a/sf_manufacturing/views/mrp_workcenter_views.xml +++ b/sf_manufacturing/views/mrp_workcenter_views.xml @@ -128,9 +128,10 @@ + - -
+ +
@@ -298,21 +299,4 @@ - - - mrp.workcenter.inherit - mrp.workcenter - - - - - - - - - - From 5f04cbb896c11127b5e500967789c3b49b71be7a Mon Sep 17 00:00:00 2001 From: mgw <1392924357@qq.com> Date: Mon, 7 Aug 2023 14:37:58 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E7=9C=8B=E6=9D=BF=E8=A7=86=E5=9B=BEcss?= =?UTF-8?q?=E8=B0=83=E6=95=B4=EF=BC=88=E8=80=81=E8=AE=B8=E5=81=9A=E7=9A=84?= =?UTF-8?q?=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../static/src/scss/kanban_change.scss | 19 +++++++------------ .../static/src/xml/kanban_change.xml | 2 +- .../views/mrp_workcenter_views.xml | 3 --- 3 files changed, 8 insertions(+), 16 deletions(-) diff --git a/sf_manufacturing/static/src/scss/kanban_change.scss b/sf_manufacturing/static/src/scss/kanban_change.scss index 82e31b87..24ae15ad 100644 --- a/sf_manufacturing/static/src/scss/kanban_change.scss +++ b/sf_manufacturing/static/src/scss/kanban_change.scss @@ -1,18 +1,13 @@ -.alerts { +.choosekanban { display: flex; justify-content: flex-start; align-items: center; + margin-top: 1vw !important; } -.alerts>div { - width: 3vw; - height: 1.5vw; - border: 1px solid grey; - border-radius: 5px; - margin: 0 0.5vw; - justify-content: center; +.choosekanban > button { + width: 4vw !important; + height: 2vw !important; + border: none !important; + margin-left: 16px !important; } - -.alerts>div:nth-child(1) { - margin-left: 0 !important; -} \ No newline at end of file diff --git a/sf_manufacturing/static/src/xml/kanban_change.xml b/sf_manufacturing/static/src/xml/kanban_change.xml index c652b95e..ccd8fb21 100644 --- a/sf_manufacturing/static/src/xml/kanban_change.xml +++ b/sf_manufacturing/static/src/xml/kanban_change.xml @@ -2,7 +2,7 @@ -
+