From f4428fde9f5480301ab3f105a4b4afe49150c8e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?WEB=E8=AE=B8=E4=BD=95=E5=93=B2=5Cxuhez?= Date: Wed, 16 Aug 2023 09:25:13 +0800 Subject: [PATCH 01/13] =?UTF-8?q?gantt=E5=9B=BE=E6=A0=B7=E5=BC=8F=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_plan/__manifest__.py | 1 + sf_plan/static/src/scss/gannt_change.scss | 3 ++ sf_plan/views/view.xml | 63 ++++++++++++++++------- 3 files changed, 47 insertions(+), 20 deletions(-) create mode 100644 sf_plan/static/src/scss/gannt_change.scss diff --git a/sf_plan/__manifest__.py b/sf_plan/__manifest__.py index 2c965850..80a9d5fb 100644 --- a/sf_plan/__manifest__.py +++ b/sf_plan/__manifest__.py @@ -24,6 +24,7 @@ 'web.assets_qweb': [ ], 'web.assets_backend': [ + 'sf_plan/static/src/scss/gannt_change.scss' ], }, diff --git a/sf_plan/static/src/scss/gannt_change.scss b/sf_plan/static/src/scss/gannt_change.scss new file mode 100644 index 00000000..e9ffbc59 --- /dev/null +++ b/sf_plan/static/src/scss/gannt_change.scss @@ -0,0 +1,3 @@ +//.o_gantt_view .o_gantt_row_nogroup .o_gantt_pill { +// background-color: #6ec89b !important; +//} \ No newline at end of file diff --git a/sf_plan/views/view.xml b/sf_plan/views/view.xml index 9e82fd8a..3366ce49 100644 --- a/sf_plan/views/view.xml +++ b/sf_plan/views/view.xml @@ -66,12 +66,13 @@ sf.pl.plan.gantt sf.pl.plan - + @@ -80,21 +81,43 @@ -
-
-
-
    -
  • 开始时间:
    • -
  • 结束时间:
    • -
  • 坯料编号:
    • -
  • 坯料名称:
    • -
  • 数量:
    • -
  • 材质:
    • -
+
+
+
+
    +
  • + 开始时间: + +
    • +
  • + 结束时间: + +
    • +
  • + 坯料编号: + +
    • +
  • + 坯料名称: + +
    • +
  • + 数量: + +
    • +
  • + 材质: + +
    • +
  • + 状态: + +
    • +
+
-
- + @@ -113,6 +136,6 @@ parent="mrp_workorder.mrp_workorder_menu_planning" sequence="10" action="sf_pl_plan_action" - /> + /> From 06ed10bd5e8d60e8477cc13e45889e539dd2112b Mon Sep 17 00:00:00 2001 From: mgw <1392924357@qq.com> Date: Wed, 16 Aug 2023 09:42:51 +0800 Subject: [PATCH 02/13] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=95=8C=E9=9D=A2?= =?UTF-8?q?=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_plan/views/view.xml | 31 +++++++++++++++---- .../static/src/js/3d_viewer.js | 3 ++ 2 files changed, 28 insertions(+), 6 deletions(-) diff --git a/sf_plan/views/view.xml b/sf_plan/views/view.xml index 9e82fd8a..c3cc8218 100644 --- a/sf_plan/views/view.xml +++ b/sf_plan/views/view.xml @@ -27,8 +27,14 @@
+
+

+ +

+
@@ -38,12 +44,25 @@ - - - - - - + + + + + + + + + + + + + + + + + + + diff --git a/web_widget_model_viewer/static/src/js/3d_viewer.js b/web_widget_model_viewer/static/src/js/3d_viewer.js index 261590fb..582c887f 100644 --- a/web_widget_model_viewer/static/src/js/3d_viewer.js +++ b/web_widget_model_viewer/static/src/js/3d_viewer.js @@ -20,6 +20,7 @@ import { Component, onWillUpdateProps, useState, useRef, useEffect } from "@odoo export class StepViewer extends Component { setup() { + console.log('setup') this.props.url = this.formatUrl(); } @@ -33,9 +34,11 @@ export class StepViewer extends Component { id: JSON.stringify(this.props.record.data['id']), field: this.props.name} url = url_props['base_url']+'/web/content/'+url_props['model']+'/'+url_props['id']+'/'+url_props['field']+'?download=true' + console.log('url', url) } else { url = "data:model/gltf-binary;base64," + this.props.value; + console.log('url222', url) } } return url From 2169c10417c5b167abaae57d15ad069c8b50eb08 Mon Sep 17 00:00:00 2001 From: mgw <1392924357@qq.com> Date: Wed, 16 Aug 2023 10:11:40 +0800 Subject: [PATCH 03/13] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=9F=E4=BA=A7?= =?UTF-8?q?=E7=BA=BF=E9=A9=BE=E9=A9=B6=E8=88=B1=E5=BD=A2=E5=BC=8F=E4=B8=BA?= =?UTF-8?q?searchpanel=EF=BC=8C=E8=B4=B4=E8=BF=91=E6=95=B4=E4=BD=93?= =?UTF-8?q?=E5=B8=83=E5=B1=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/mrp_workcenter_views.xml | 415 +++++++++--------- 1 file changed, 208 insertions(+), 207 deletions(-) diff --git a/sf_manufacturing/views/mrp_workcenter_views.xml b/sf_manufacturing/views/mrp_workcenter_views.xml index cc3f6015..3bd8260e 100644 --- a/sf_manufacturing/views/mrp_workcenter_views.xml +++ b/sf_manufacturing/views/mrp_workcenter_views.xml @@ -102,197 +102,202 @@ - - - - - - - - - - - - - - - mrp.workcenter.kanban.inherit - mrp.workcenter - - - - - - - - - - - - - - - -
-
-
- - - -
-
- - - -
-
-
-
-
-
- - - - - - -
-
-
-
-
- - To Launch - -
-
- -
-
-
-
- - In Progress - -
-
- -
-
-
-
- - Late - -
-
- -
-
-
-
- - OEE - -
-
- - - % - - -
-
-
-
-
-
- - - -
-
-
- -
- - - - - - + + + + + + + + + + + + + + + + + + + + + + + + --> + --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -321,22 +326,18 @@ - - - - - - - - - - - - - - + + + mrp.workcenter.inherit + mrp.workcenter + + + + + + + + + - - ======= - >>>>>>> develop From 9d025c10b4c47d1271e4a26e1940d0560d3627a4 Mon Sep 17 00:00:00 2001 From: yuxianghui <1608204036@qq.com> Date: Wed, 16 Aug 2023 11:00:34 +0800 Subject: [PATCH 04/13] =?UTF-8?q?=E5=B0=86=E8=AE=B0=E5=BD=95=E7=9A=84?= =?UTF-8?q?=E8=AE=A8=E8=AE=BA=E5=92=8C=E8=AF=84=E8=AE=BA=E7=AA=97=E5=8F=A3?= =?UTF-8?q?=E4=BB=8Eform=E8=A7=86=E5=9B=BE=E5=8F=B3=E4=BE=A7=E7=A7=BB?= =?UTF-8?q?=E5=8A=A8=E5=88=B0=E8=A7=86=E5=9B=BE=E6=9C=80=E4=B8=8B=E6=96=B9?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../static/src/scss/tablet_view.scss | 25 +++++++++++++++++++ mrp_workorder/views/mrp_production_views.xml | 18 +++++++++++++ 2 files changed, 43 insertions(+) diff --git a/mrp_workorder/static/src/scss/tablet_view.scss b/mrp_workorder/static/src/scss/tablet_view.scss index 16aa5d06..0ecc86da 100644 --- a/mrp_workorder/static/src/scss/tablet_view.scss +++ b/mrp_workorder/static/src/scss/tablet_view.scss @@ -224,3 +224,28 @@ } } } + +.o_form_view.o_xxl_form_view { + flex-flow:column !important; +} + +.o_form_view_container { + width:100% !important; +} + +html .o_web_client > .o_action_manager > .o_action { + overflow:scroll !important; +} + +.o_FormRenderer_chatterContainer.o-aside { + width:100% !important; + max-width: 1320px !important; + background-color:#ccc !important; +} + +.o_form_view { + background-color:unset !important; + border: 1px solid #C9CCD2 !important; + border-left-color:unset !important; + box-shadow: 0 5px 20px -15px rgb(0 0 0 / 40%) !important; +} diff --git a/mrp_workorder/views/mrp_production_views.xml b/mrp_workorder/views/mrp_production_views.xml index be335b85..a033d501 100644 --- a/mrp_workorder/views/mrp_production_views.xml +++ b/mrp_workorder/views/mrp_production_views.xml @@ -19,6 +19,24 @@ + + + + + + + + + + + + + + + + + + mrp.production.search.view.inherit.planning mrp.production From 1747f38bcad336c4f3a84a7c3096e1248e0c811f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?WEB=E8=AE=B8=E4=BD=95=E5=93=B2=5Cxuhez?= Date: Wed, 16 Aug 2023 11:22:50 +0800 Subject: [PATCH 05/13] =?UTF-8?q?=E5=BF=85=E5=A1=AB=E5=AD=97=E6=AE=B5label?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=98=9F=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_base/static/src/scss/test.scss | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/sf_base/static/src/scss/test.scss b/sf_base/static/src/scss/test.scss index e351acc2..24d638e3 100644 --- a/sf_base/static/src/scss/test.scss +++ b/sf_base/static/src/scss/test.scss @@ -1,15 +1,22 @@ .test_model { display: flex !important; } -.test_model>.o_form_label { + +.test_model > .o_form_label { margin-left: 20px; margin-right: 0px !important; white-space: nowrap; } -.o_form_label.o_field_invalid::after { + +div:has(.o_required_modifier)>label::before { content: '*' !important; color: red !important; padding: 0 4px !important; vertical-align: top !important; font-size: 1.5rem !important; - } \ No newline at end of file + display: inline !important; +} + +.o_required_modifier { + display: flex !important; +} \ No newline at end of file From fcf5963079419b066f4b5db3070645dbbcf84779 Mon Sep 17 00:00:00 2001 From: "qihao.gong@jikimo.com" Date: Wed, 16 Aug 2023 11:56:41 +0800 Subject: [PATCH 06/13] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E6=B8=85=E5=8D=95=E7=9C=8B=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_maintenance/views/maintenance_views.xml | 39 +++++++++++++++++++++- 1 file changed, 38 insertions(+), 1 deletion(-) diff --git a/sf_maintenance/views/maintenance_views.xml b/sf_maintenance/views/maintenance_views.xml index b1d914a0..f52fe6e5 100644 --- a/sf_maintenance/views/maintenance_views.xml +++ b/sf_maintenance/views/maintenance_views.xml @@ -19,7 +19,7 @@ - + @@ -196,6 +196,8 @@ + + @@ -249,6 +251,41 @@ + + sf.maintenance.equipment.view.kanban.inherit.hr + maintenance.equipment + + + + + + + + +
+
+
+ +
+
+ +
+ +
+
+ + | + +
+
+ + + + + Date: Wed, 16 Aug 2023 15:00:03 +0800 Subject: [PATCH 07/13] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E5=9F=BA=E7=A1=80?= =?UTF-8?q?=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_maintenance/views/maintenance_views.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sf_maintenance/views/maintenance_views.xml b/sf_maintenance/views/maintenance_views.xml index f52fe6e5..23ebdb76 100644 --- a/sf_maintenance/views/maintenance_views.xml +++ b/sf_maintenance/views/maintenance_views.xml @@ -111,7 +111,7 @@ - From cd0f455db3a4da518a630b1ea451866b34898dd5 Mon Sep 17 00:00:00 2001 From: "qihao.gong@jikimo.com" Date: Wed, 16 Aug 2023 17:30:30 +0800 Subject: [PATCH 08/13] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=E7=9C=8B=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_base/static/src/scss/test.scss | 19 +- sf_maintenance/views/maintenance_views.xml | 270 +++++++++++---------- 2 files changed, 159 insertions(+), 130 deletions(-) diff --git a/sf_base/static/src/scss/test.scss b/sf_base/static/src/scss/test.scss index e351acc2..3206d847 100644 --- a/sf_base/static/src/scss/test.scss +++ b/sf_base/static/src/scss/test.scss @@ -12,4 +12,21 @@ padding: 0 4px !important; vertical-align: top !important; font-size: 1.5rem !important; - } \ No newline at end of file + } +.my-image div { + width: 100px !important; + height: 130px !important; +} +.add_flex { + display: flex; + flex-direction: column; +} +.maintenance_name { + font-weight: bold; +} +.o_kanban_renderer .o_kanban_record .o_kanban_record_has_image_fill .o_kanban_image_fill_left { + flex:unset !important; +} +.o_kanban_renderer .o_kanban_record .o_kanban_record_bottom { + margin-top: 5px; +} \ No newline at end of file diff --git a/sf_maintenance/views/maintenance_views.xml b/sf_maintenance/views/maintenance_views.xml index 23ebdb76..8ba7e9ef 100644 --- a/sf_maintenance/views/maintenance_views.xml +++ b/sf_maintenance/views/maintenance_views.xml @@ -20,8 +20,8 @@ - - + + @@ -30,121 +30,122 @@ - - + - - - - - - + + + + + + + + + + + + + + + @@ -251,38 +252,49 @@ - + sf.maintenance.equipment.view.kanban.inherit.hr maintenance.equipment - + + - - -
+ +
-
-
- + + + +
+
+
+ +
+ +
+ +
+
+ +
+ + + + +
- -
- -
-
- - | - -
-
- - + +
+ + From facd5d23d789d9a9905474cb08c21e13385b16f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?WEB=E8=AE=B8=E4=BD=95=E5=93=B2=5Cxuhez?= Date: Thu, 17 Aug 2023 10:06:59 +0800 Subject: [PATCH 09/13] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F=E8=B0=83=E6=95=B4=E5=90=8Ea=E6=A0=87=E7=AD=BE?= =?UTF-8?q?=E6=96=87=E5=AD=97=E5=8F=98=E8=93=9D=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../static/src/scss/table_custom.scss | 28 ++ .../static/src/scss/tablet_view.scss | 460 +++++++++--------- 2 files changed, 248 insertions(+), 240 deletions(-) create mode 100644 mrp_workorder/static/src/scss/table_custom.scss diff --git a/mrp_workorder/static/src/scss/table_custom.scss b/mrp_workorder/static/src/scss/table_custom.scss new file mode 100644 index 00000000..d0557894 --- /dev/null +++ b/mrp_workorder/static/src/scss/table_custom.scss @@ -0,0 +1,28 @@ +.o_form_view.o_xxl_form_view { + flex-flow: column !important; +} + +.o_form_view_container { + width: 100% !important; +} + +html .o_web_client > .o_action_manager > .o_action { + height: unset !important; + overflow: scroll !important; +} + +.o_FormRenderer_chatterContainer.o-aside { + width: 100% !important; + max-width: 1320px !important; + background-color: #fff !important; + padding-left: 32px !important; + padding-right: 32px !important; + box-sizing: border-box !important; + border: 1px solid #dee2e6; + //margin-bottom: 12px; +} + +.o_form_view { + background-color: unset !important; + min-height: unset !important; +} diff --git a/mrp_workorder/static/src/scss/tablet_view.scss b/mrp_workorder/static/src/scss/tablet_view.scss index 0ecc86da..1e251ed7 100644 --- a/mrp_workorder/static/src/scss/tablet_view.scss +++ b/mrp_workorder/static/src/scss/tablet_view.scss @@ -1,251 +1,231 @@ .o_web_client { - $o-wo-tablet-padding: $o-horizontal-padding; - $o-wo-tablet-btn-margin: 2px; - $o-wo-tablet-bg: #404040; // emulate the pdf reader - $o-wo-tablet-text: color-contrast($o-wo-tablet-bg, $body-color, #FFF); + $o-wo-tablet-padding: $o-horizontal-padding; + $o-wo-tablet-btn-margin: 2px; + $o-wo-tablet-bg: #404040; // emulate the pdf reader + $o-wo-tablet-text: color-contrast($o-wo-tablet-bg, $body-color, #FFF); - .o_legacy_form_view.o_workorder_tablet { - display: flex; - flex-flow: column nowrap; - padding: 0; - background-color: $o-wo-tablet-bg; - background-image: url(/web/static/lib/pdfjs/web/images/texture.png); - background-repeat: repeat; + .o_legacy_form_view.o_workorder_tablet { + display: flex; + flex-flow: column nowrap; + padding: 0; + background-color: $o-wo-tablet-bg; + background-image: url(/web/static/lib/pdfjs/web/images/texture.png); + background-repeat: repeat; + color: $o-wo-tablet-text; + height: auto; + overflow: auto; + + font-size: 16px; + + @include media-breakpoint-up(xl) { + font-size: 18px; + } + + // Components + h1, h2, h3, h4, h5, h6 { + color: $o-wo-tablet-text; + } + + .btn { + font-size: 1em; + padding: 0.4em 1em; + margin: 0 $o-wo-tablet-btn-margin; + + &.btn-secondary { color: $o-wo-tablet-text; + background-color: $o-wo-tablet-bg; + border: $o-wo-tablet-bg; + text-transform: capitalize; + } + + &.fa-plus-square-o { + margin-bottom: 1px; + } + + &.o_workorder_icon_btn { + padding: 0.4em; + + &.o_workorder_icon_back { + padding: 0.4em 0.8em; + } + } + + .o_workorder_btn_icon_small { + font-size: 0.8em; + margin-top: -1em; + + &.float-end { + margin-top: 0.5em; + } + } + } + + .o_input { + background-color: $o-wo-tablet-bg; + color: $o-wo-tablet-text; + padding: 0.4em 1em; + } + + .o_field_widget { + margin-bottom: 0; + } + + .o_workorder_bar_content { + display: flex; + flex-flow: row nowrap; + flex: 1 0 auto; + align-items: center; + + &.workorder_bar_left { + word-break: break-all; + flex-shrink: 1; + } + + @include media-breakpoint-down(md) { + justify-content: flex-start; + &.workorder_bar_left { + flex-flow: wrap; + } + } + + &.o_workorder_bar_content_right { + justify-content: flex-end; + @include media-breakpoint-down(md) { + justify-content: flex-start; + .o_actions { + display: flex; + flex-flow: column; + width: 100%; + } + } + } + } + + // Both Top Blocks + .workorder_bar, .workorder_actions { + background-color: darken($o-wo-tablet-bg, 5%); + background-image: url(/web/static/lib/pdfjs/web/images/texture.png); + } + + // First Top Block + .workorder_bar { + display: flex; + flex-flow: row wrap; + padding: $o-wo-tablet-padding*0.5 $o-wo-tablet-padding; + padding-left: $o-wo-tablet-padding - $o-wo-tablet-btn-margin; + @include media-breakpoint-down(md) { + flex-flow: column; + } + } + + // Last top Block + .workorder_actions { + display: flex; + flex-flow: row nowrap; + @include media-breakpoint-down(md) { + flex-flow: column; + } + padding: $o-wo-tablet-padding*0.5 $o-wo-tablet-padding - $o-wo-tablet-btn-margin $o-wo-tablet-padding; + box-shadow: 0 1px 1px rgba(black, 0.3); + font-size: 1.2em; + } + + .o_form_label { + color: $o-wo-tablet-text; + } + + // Step's info block + .o_workorder_data { + background-color: $o-wo-tablet-bg; + padding: $o-wo-tablet-padding*0.5 $o-wo-tablet-padding 0; + font-size: 0.9em; + + // Final resume table + table.o_list_table { + color: $body-color; + } + + // Horizontal form + .o_workorder_form { + padding-bottom: $o-wo-tablet-padding*0.5; + justify-content: space-between; + @include media-breakpoint-down(md) { + flex-flow: column; + align-items: flex-start; + } + + > div { + flex: 1 0 auto; + } + + .o_workorder_field { + > div.o_workorder_lot { + width: 100%; + justify-content: center; + + > .o_lot_number { + width: 50%; + + &:not(.o_with_button) button.o_external_button { + display: block !important; + visibility: hidden; + } + } + } + + > div { + display: inline-flex; + align-items: baseline; + } + + .o_form_label { + opacity: 0.7; + display: inline-block; + font-weight: bold; + } + } + + a, a::first-line { + font-weight: bold; + color: $o-wo-tablet-text; + } + } + } + } + + // PDF Viewer block + .workorder_pdf { + display: flex; + flex: 1 0 auto; + + div.o_field_pdfviewer, div.o_field_pdf_viewer, span.o_embed_url_viewer { + margin: 0; + @include media-breakpoint-up(md) { height: auto; - overflow: auto; + } + position: relative; + display: flex; + flex: 1 0 auto; - font-size: 16px; - - @include media-breakpoint-up(xl) { - font-size: 18px; - } - - // Components - h1,h2,h3,h4,h5,h6 { - color: $o-wo-tablet-text; - } - - .btn { - font-size: 1em; - padding: 0.4em 1em; - margin: 0 $o-wo-tablet-btn-margin; - - &.btn-secondary { - color: $o-wo-tablet-text; - background-color: $o-wo-tablet-bg; - border: $o-wo-tablet-bg; - text-transform: capitalize; - } - - &.fa-plus-square-o { - margin-bottom: 1px; - } - - &.o_workorder_icon_btn { - padding: 0.4em; - - &.o_workorder_icon_back { - padding: 0.4em 0.8em; - } - } - - .o_workorder_btn_icon_small { - font-size: 0.8em; - margin-top: -1em; - - &.float-end { - margin-top: 0.5em; - } - } - } - - .o_input { - background-color: $o-wo-tablet-bg; - color: $o-wo-tablet-text; - padding: 0.4em 1em; - } - - .o_field_widget { - margin-bottom: 0; - } - - .o_workorder_bar_content { - display: flex; - flex-flow: row nowrap; - flex: 1 0 auto; - align-items: center; - - &.workorder_bar_left { - word-break: break-all; - flex-shrink: 1; - } - - @include media-breakpoint-down(md) { - justify-content: flex-start; - &.workorder_bar_left { - flex-flow: wrap; - } - } - - &.o_workorder_bar_content_right { - justify-content: flex-end; - @include media-breakpoint-down(md) { - justify-content: flex-start; - .o_actions { - display: flex; - flex-flow: column; - width: 100%; - } - } - } - } - - // Both Top Blocks - .workorder_bar, .workorder_actions { - background-color: darken($o-wo-tablet-bg, 5%); - background-image: url(/web/static/lib/pdfjs/web/images/texture.png); - } - - // First Top Block - .workorder_bar { - display: flex; - flex-flow: row wrap; - padding: $o-wo-tablet-padding*0.5 $o-wo-tablet-padding; - padding-left: $o-wo-tablet-padding - $o-wo-tablet-btn-margin; - @include media-breakpoint-down(md) { - flex-flow: column; - } - } - - // Last top Block - .workorder_actions { - display: flex; - flex-flow: row nowrap; - @include media-breakpoint-down(md) { - flex-flow: column; - } - padding: $o-wo-tablet-padding*0.5 $o-wo-tablet-padding - $o-wo-tablet-btn-margin $o-wo-tablet-padding; - box-shadow: 0 1px 1px rgba(black, 0.3); - font-size: 1.2em; - } - - .o_form_label { - color: $o-wo-tablet-text; - } - - // Step's info block - .o_workorder_data { - background-color: $o-wo-tablet-bg; - padding: $o-wo-tablet-padding*0.5 $o-wo-tablet-padding 0; - font-size: 0.9em; - - // Final resume table - table.o_list_table { - color: $body-color; - } - - // Horizontal form - .o_workorder_form { - padding-bottom: $o-wo-tablet-padding*0.5; - justify-content: space-between; - @include media-breakpoint-down(md) { - flex-flow: column; - align-items: flex-start; - } - - > div { - flex: 1 0 auto; - } - - .o_workorder_field { - > div.o_workorder_lot { - width: 100%; - justify-content: center; - > .o_lot_number { - width: 50%; - &:not(.o_with_button) button.o_external_button { - display: block !important; - visibility: hidden; - } - } - } - > div { - display: inline-flex; - align-items: baseline; - } - - .o_form_label { - opacity: 0.7; - display: inline-block; - font-weight: bold; - } - } - - a, a::first-line { - font-weight: bold; - color: $o-wo-tablet-text; - } - } - } + iframe { + display: block; + margin: 0; + width: 100%; + height: 100%; + @include o-position-absolute(0, 0, 0, 0); + } } + } - // PDF Viewer block - .workorder_pdf { - display: flex; - flex: 1 0 auto; - - div.o_field_pdfviewer, div.o_field_pdf_viewer, span.o_embed_url_viewer { - margin: 0; - @include media-breakpoint-up(md) { - height: auto; - } - position: relative; - display: flex; - flex: 1 0 auto; - - iframe { - display: block; - margin: 0; - width: 100%; - height: 100%; - @include o-position-absolute(0,0,0,0); - } - } - } - - // Work order Modal - .workorder_menu { - .btn { - margin-bottom: $o-wo-tablet-padding; - padding: 1em; - font-size: 2em; - text-transform: uppercase; - } + // Work order Modal + .workorder_menu { + .btn { + margin-bottom: $o-wo-tablet-padding; + padding: 1em; + font-size: 2em; + text-transform: uppercase; } + } } -.o_form_view.o_xxl_form_view { - flex-flow:column !important; -} -.o_form_view_container { - width:100% !important; -} - -html .o_web_client > .o_action_manager > .o_action { - overflow:scroll !important; -} - -.o_FormRenderer_chatterContainer.o-aside { - width:100% !important; - max-width: 1320px !important; - background-color:#ccc !important; -} - -.o_form_view { - background-color:unset !important; - border: 1px solid #C9CCD2 !important; - border-left-color:unset !important; - box-shadow: 0 5px 20px -15px rgb(0 0 0 / 40%) !important; -} From 28fcf5c4faa4cf39dbc5455411b298d1b6a39f41 Mon Sep 17 00:00:00 2001 From: "qihao.gong@jikimo.com" Date: Thu, 17 Aug 2023 11:11:47 +0800 Subject: [PATCH 10/13] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=9C=BA=E5=9C=BA?= =?UTF-8?q?=E7=9C=8B=E6=9D=BF=E4=BB=A5=E5=8F=8A=E6=9C=BA=E5=BA=8A=E8=A1=A8?= =?UTF-8?q?=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_maintenance/models/sf_maintenance.py | 1 + sf_maintenance/models/sf_maintenance_logs.py | 2 +- .../views/maintenance_logs_views.xml | 8 +++--- sf_maintenance/views/maintenance_views.xml | 25 +++++++++++++++---- 4 files changed, 26 insertions(+), 10 deletions(-) diff --git a/sf_maintenance/models/sf_maintenance.py b/sf_maintenance/models/sf_maintenance.py index 7f6104ba..37da5a68 100644 --- a/sf_maintenance/models/sf_maintenance.py +++ b/sf_maintenance/models/sf_maintenance.py @@ -135,6 +135,7 @@ class SfMaintenanceEquipment(models.Model): active = fields.Boolean('有效', default=True) # 多个型号对应一个机床 machine_tool_id = fields.Many2one('sf.machine_tool', '机床') + sf_maintenance_logs_ids = fields.One2many('sf.maintenance.logs','maintenance_equipment_id', '设备故障日志') def name_get(self): diff --git a/sf_maintenance/models/sf_maintenance_logs.py b/sf_maintenance/models/sf_maintenance_logs.py index 8c12529f..05ce3fd9 100644 --- a/sf_maintenance/models/sf_maintenance_logs.py +++ b/sf_maintenance/models/sf_maintenance_logs.py @@ -9,7 +9,7 @@ class SfMaintenanceLogs(models.Model): name = fields.Char(string='名称') type = fields.Selection([('type1', '类型1'), ('type2', '类型2')], string='类型') brand = fields.Many2one('sf.machine.brand', relared='model.brand_id', string='品牌') - model = fields.Many2one('maintenance.equipment', string='设备') + maintenance_equipment_id = fields.Many2one('maintenance.equipment', string='设备') code_location = fields.Char(string='编码位置') fault_type = fields.Selection([('电气类', '电气类'), ('机械类', '机械类'), ('程序类', '程序类'), ('系统类', '系统类')], string='故障类型') fault_code = fields.Char(string='故障代码') diff --git a/sf_maintenance/views/maintenance_logs_views.xml b/sf_maintenance/views/maintenance_logs_views.xml index 14ddd9e0..33e22bf2 100644 --- a/sf_maintenance/views/maintenance_logs_views.xml +++ b/sf_maintenance/views/maintenance_logs_views.xml @@ -11,7 +11,7 @@ - + @@ -39,7 +39,7 @@ - + @@ -64,13 +64,13 @@ - + - + diff --git a/sf_maintenance/views/maintenance_views.xml b/sf_maintenance/views/maintenance_views.xml index 8ba7e9ef..39f6a316 100644 --- a/sf_maintenance/views/maintenance_views.xml +++ b/sf_maintenance/views/maintenance_views.xml @@ -19,16 +19,31 @@ - - - + +
+ + +
+ + + + + + + - + @@ -282,7 +297,7 @@
-
+
From 8b88f3167213332aef9150375b80cddfbb31a02e Mon Sep 17 00:00:00 2001 From: yuxianghui <1608204036@qq.com> Date: Thu, 17 Aug 2023 11:19:59 +0800 Subject: [PATCH 11/13] =?UTF-8?q?=E5=88=80=E5=85=B7=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E4=B8=8B=E9=99=A4=E5=88=80=E5=85=B7=E7=89=A9=E6=96=99=E5=A4=96?= =?UTF-8?q?=E7=9A=84=E7=95=8C=E9=9D=A2=E5=B8=83=E5=B1=80=E5=8F=8A=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E7=9A=84=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_tool_management/models/base.py | 248 ++++++--- sf_tool_management/views/tool_base_views.xml | 556 +++++++++++-------- sf_tool_management/wizard/wizard.py | 6 +- sf_tool_management/wizard/wizard_view.xml | 49 -- 4 files changed, 499 insertions(+), 360 deletions(-) diff --git a/sf_tool_management/models/base.py b/sf_tool_management/models/base.py index 781580b7..b343feca 100644 --- a/sf_tool_management/models/base.py +++ b/sf_tool_management/models/base.py @@ -12,12 +12,12 @@ class FunctionalCuttingToolEntity(models.Model): _name = 'sf.functional.cutting.tool.entity' _description = '功能刀具列表' - code = fields.Char('编码') name = fields.Char('名称') mrs_cutting_tool_model_id = fields.Many2one('sf.cutting.tool.model', string='刀具型号') - mrs_cutting_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', string='功能刀具类型',tracking=True, + mrs_cutting_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', string='功能刀具类型', tracking=True, group_expand='_read_group_mrs_cutting_tool_type_ids') + @api.model def _read_group_mrs_cutting_tool_type_ids(self, categories, domain, order): mrs_cutting_tool_type_ids = categories._search([], order=order, access_rights_uid=SUPERUSER_ID) @@ -52,17 +52,29 @@ class FunctionalCuttingToolEntity(models.Model): 'sf_functional_cutting_tool_entity_id', string='夹头型号', domain= [('mrs_cutting_tool_material_name', '=', '夹头')]) + cutting_tool_material = fields.Selection([('0', '整体式刀具'), ('1', '组合式刀具')], string='刀具物料', default='0') + + @api.onchange('cutting_tool_material') + def _onchange_cutting_tool_material(self): + for record in self: + if record: + if record.cutting_tool_material == '1': + record.mrs_cutting_tool_integral_model_ids = None + if record.cutting_tool_material == '0': + record.mrs_cutting_tool_blade_model_ids = None + record.mrs_cutting_tool_cutterbar_model_ids = None + record.mrs_cutting_tool_cutterpad_model_ids = None diameter = fields.Float('直径(mm)') tool_grade = fields.Selection([('1', 'P1'), ('2', 'P2'), ('3', 'P3'), ('4', 'P4'), ('5', 'P5'), ('6', 'P6')], string='刀具等级') machining_accuracy = fields.Float('加工精度(mm)') - tool_length = fields.Float('装刀长') + tool_length = fields.Float('装刀长(mm)') blade_number = fields.Integer('刃数') integral_blade_length = fields.Float('整体刃长(mm)') effective_blade_length = fields.Float('有效刃长(mm)') max_life = fields.Float('最大寿命值') - is_standard = fields.Boolean('是否标准刀') + is_standard = fields.Selection([('1', '是'), ('0', '否')], '是否标准刀') applicable_range = fields.Char('适用范围') image = fields.Binary('图片') @@ -89,7 +101,8 @@ class FunctionalCuttingToolEntityCache(models.Model): string='整体式刀具型号', domain= [('mrs_cutting_tool_material_name', '=', '整体式刀具')]) # 刀片型号 - mrs_cutting_tool_blade_model_ids = fields.Many2many('sf.cutting.tool.model', 'sf_functional_cutting_tool_entity_cache_id', + mrs_cutting_tool_blade_model_ids = fields.Many2many('sf.cutting.tool.model', + 'sf_functional_cutting_tool_entity_cache_id', string='刀片型号', domain= [('mrs_cutting_tool_material_name', '=', '刀片')]) # 刀杆型号 @@ -112,17 +125,29 @@ class FunctionalCuttingToolEntityCache(models.Model): 'sf_functional_cutting_tool_entity_cache_id', string='夹头型号', domain= [('mrs_cutting_tool_material_name', '=', '夹头')]) + cutting_tool_material = fields.Selection([('0', '整体式刀具'), ('1', '组合式刀具')], string='刀具物料', default='0') + + @api.onchange('cutting_tool_material') + def _onchange_cutting_tool_material(self): + for record in self: + if record: + if record.cutting_tool_material == '1': + record.mrs_cutting_tool_integral_model_ids = None + if record.cutting_tool_material == '0': + record.mrs_cutting_tool_blade_model_ids = None + record.mrs_cutting_tool_cutterbar_model_ids = None + record.mrs_cutting_tool_cutterpad_model_ids = None diameter = fields.Float('直径(mm)') tool_grade = fields.Selection([('1', 'P1'), ('2', 'P2'), ('3', 'P3'), ('4', 'P4'), ('5', 'P5'), ('6', 'P6')], string='刀具等级') machining_accuracy = fields.Float('加工精度(mm)') - tool_length = fields.Float('装刀长') + tool_length = fields.Float('装刀长(mm)') blade_number = fields.Integer('刃数') integral_blade_length = fields.Float('整体刃长(mm)') effective_blade_length = fields.Float('有效刃长(mm)') max_life = fields.Float('最大寿命值') - is_standard = fields.Boolean('是否标准刀') + is_standard = fields.Selection([('1', '是'), ('0', '否')], '是否标准刀') applicable_range = fields.Char('适用范围') image = fields.Binary('图片') @@ -131,32 +156,32 @@ class FunctionalToolWarning(models.Model): _name = 'sf.functional.tool.warning' _description = '功能刀具预警' - functional_cutting_tool_id = fields.Many2one('sf.functional.cutting.tool.entity', '功能刀具', readonly=True) functional_tool_assembly_id = fields.Many2one('sf.functional.tool.assembly', '功能刀具组装', readonly=True) code = fields.Char('编码', readonly=True, related='functional_cutting_tool_id.code') name = fields.Char('名称', invisible=True, readonly=True, related='functional_cutting_tool_id.name') - mrs_cutting_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', string='功能刀具类型', readonly=True, + mrs_cutting_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', string='功能刀具类型', readonly=True, related='functional_cutting_tool_id.mrs_cutting_tool_type_id') # 整体式刀具型号 mrs_cutting_tool_integral_model_ids = fields.Many2many('sf.cutting.tool.model', 'sf_functional_tool_warning_id', string='整体式刀具型号', readonly=True, - domain= [('mrs_cutting_tool_material_name', '=', '整体式刀具')], + domain=[ + ('mrs_cutting_tool_material_name', '=', '整体式刀具')], related='functional_cutting_tool_id.mrs_cutting_tool_integral_model_ids') # 刀片型号 mrs_cutting_tool_blade_model_ids = fields.Many2many('sf.cutting.tool.model', 'sf_functional_tool_warning_id', string='刀片型号', readonly=True, - domain= [('mrs_cutting_tool_material_name', '=', '刀片')], + domain=[('mrs_cutting_tool_material_name', '=', '刀片')], related='functional_cutting_tool_id.mrs_cutting_tool_blade_model_ids') # 刀杆型号 mrs_cutting_tool_cutterbar_model_ids = fields.Many2many('sf.cutting.tool.model', 'sf_functional_tool_warning_id', string='刀杆型号', readonly=True, - domain= [('mrs_cutting_tool_material_name', '=', '刀杆')], + domain=[('mrs_cutting_tool_material_name', '=', '刀杆')], related='functional_cutting_tool_id.mrs_cutting_tool_cutterbar_model_ids') # 刀盘型号 mrs_cutting_tool_cutterpad_model_ids = fields.Many2many('sf.cutting.tool.model', @@ -176,34 +201,51 @@ class FunctionalToolWarning(models.Model): string='夹头型号', readonly=True, domain=[('mrs_cutting_tool_material_name', '=', '夹头')], related='functional_cutting_tool_id.mrs_cutting_tool_cutterhead_model_ids') + cutting_tool_material = fields.Selection([('0', '整体式刀具'), ('1', '组合式刀具')], string='刀具物料', default='0') + + @api.onchange('cutting_tool_material') + def _onchange_cutting_tool_material(self): + for record in self: + if record: + if record.cutting_tool_material == '1': + record.mrs_cutting_tool_integral_model_ids = None + if record.cutting_tool_material == '0': + record.mrs_cutting_tool_blade_model_ids = None + record.mrs_cutting_tool_cutterbar_model_ids = None + record.mrs_cutting_tool_cutterpad_model_ids = None diameter = fields.Float('直径(mm)', readonly=True, related='functional_cutting_tool_id.diameter') tool_grade = fields.Selection([('1', 'P1'), ('2', 'P2'), ('3', 'P3'), ('4', 'P4'), ('5', 'P5'), ('6', 'P6')], string='刀具等级', readonly=True, related='functional_cutting_tool_id.tool_grade') - machining_accuracy = fields.Float('加工精度(mm)', readonly=True, related='functional_cutting_tool_id.machining_accuracy') - tool_length = fields.Float('装刀长', readonly=True, related='functional_cutting_tool_id.tool_length') + machining_accuracy = fields.Float('加工精度(mm)', readonly=True, + related='functional_cutting_tool_id.machining_accuracy') + tool_length = fields.Float('装刀长(mm)', readonly=True, related='functional_cutting_tool_id.tool_length') blade_number = fields.Integer('刃数', readonly=True, related='functional_cutting_tool_id.blade_number') - integral_blade_length = fields.Float('整体刃长(mm)', readonly=True, related='functional_cutting_tool_id.integral_blade_length') - effective_blade_length = fields.Float('有效刃长(mm)', readonly=True, related='functional_cutting_tool_id.effective_blade_length') + integral_blade_length = fields.Float('整体刃长(mm)', readonly=True, + related='functional_cutting_tool_id.integral_blade_length') + effective_blade_length = fields.Float('有效刃长(mm)', readonly=True, + related='functional_cutting_tool_id.effective_blade_length') max_life = fields.Float('最大寿命值', readonly=True, related='functional_cutting_tool_id.max_life') - is_standard = fields.Boolean('是否标准刀', readonly=True, related='functional_cutting_tool_id.is_standard') + is_standard = fields.Selection([('1', '是'), ('0', '否')],'是否标准刀', readonly=True, related='functional_cutting_tool_id.is_standard') applicable_range = fields.Char('适用范围', readonly=True, related='functional_cutting_tool_id.applicable_range') image = fields.Binary('图片', readonly=True, related='functional_cutting_tool_id.image') # 功能刀具预警 特有字段 - install_tool_time = fields.Datetime("装刀时间", readonly=True,related='functional_tool_assembly_id.tool_loading_time') - outbound_time = fields.Datetime('出库时间', readonly=True,related='functional_tool_assembly_id.receive_time') + install_tool_time = fields.Datetime("装刀时间", readonly=True, + related='functional_tool_assembly_id.tool_loading_time') + outbound_time = fields.Datetime('出库时间', readonly=True, related='functional_tool_assembly_id.receive_time') on_board_time = fields.Datetime('上机时间', readonly=False) machine_table_name_id = fields.Many2one('maintenance.equipment', string='机床名称', readonly=True, tracking=True, group_expand='_read_group_machine_table_name_ids') + @api.model def _read_group_machine_table_name_ids(self, categories, domain, order): machine_table_name_ids = categories._search([], order=order, access_rights_uid=SUPERUSER_ID) return categories.browse(machine_table_name_ids) - machine_tool_code = fields.Char('机台号', readonly=True,related='functional_tool_assembly_id.machine_tool_code') - cutting_tool_code = fields.Char('刀位号', readonly=True,related='functional_tool_assembly_id.cutter_spacing_code') - idle_time = fields.Char('闲置时长', readonly=False) + machine_tool_code = fields.Char('机台号', readonly=True, related='functional_tool_assembly_id.machine_tool_code') + cutting_tool_code = fields.Char('刀位号', readonly=True, related='functional_tool_assembly_id.cutter_spacing_code') + idle_time = fields.Char('闲置时长(h)', readonly=False) alarm_value = fields.Char('报警值', readonly=False) used_value = fields.Char('已使用值', readonly=False) alarm_type = fields.Char('报警类型', readonly=False) @@ -224,7 +266,8 @@ class RealTimeDistributionOfFunctionalTools(models.Model): functional_cutting_tool_id = fields.Many2one('sf.functional.cutting.tool.entity', '功能刀具', readonly=True) mrs_cutting_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', string='功能刀具类型', readonly=True, - tracking=True, group_expand='_read_mrs_cutting_tool_type_ids',store=True, + tracking=True, group_expand='_read_mrs_cutting_tool_type_ids', + store=True, compute='_compute_functional_cutting_tool_id') @api.model @@ -280,20 +323,32 @@ class RealTimeDistributionOfFunctionalTools(models.Model): string='夹头型号', readonly=True, domain=[('mrs_cutting_tool_material_name', '=', '夹头')], related='functional_cutting_tool_id.mrs_cutting_tool_cutterhead_model_ids') + cutting_tool_material = fields.Selection([('0', '整体式刀具'), ('1', '组合式刀具')], string='刀具物料', default='0') + + @api.onchange('cutting_tool_material') + def _onchange_cutting_tool_material(self): + for record in self: + if record: + if record.cutting_tool_material == '1': + record.mrs_cutting_tool_integral_model_ids = None + if record.cutting_tool_material == '0': + record.mrs_cutting_tool_blade_model_ids = None + record.mrs_cutting_tool_cutterbar_model_ids = None + record.mrs_cutting_tool_cutterpad_model_ids = None diameter = fields.Float('直径(mm)', readonly=True, related='functional_cutting_tool_id.diameter') tool_grade = fields.Selection([('1', 'P1'), ('2', 'P2'), ('3', 'P3'), ('4', 'P4'), ('5', 'P5'), ('6', 'P6')], string='刀具等级', readonly=True, related='functional_cutting_tool_id.tool_grade') machining_accuracy = fields.Float('加工精度(mm)', readonly=True, related='functional_cutting_tool_id.machining_accuracy') - tool_length = fields.Float('装刀长', readonly=True, related='functional_cutting_tool_id.tool_length') + tool_length = fields.Float('装刀长(mm)', readonly=True, related='functional_cutting_tool_id.tool_length') blade_number = fields.Integer('刃数', readonly=True, related='functional_cutting_tool_id.blade_number') integral_blade_length = fields.Float('整体刃长(mm)', readonly=True, related='functional_cutting_tool_id.integral_blade_length') effective_blade_length = fields.Float('有效刃长(mm)', readonly=True, related='functional_cutting_tool_id.effective_blade_length') max_life = fields.Float('最大寿命值', readonly=True, related='functional_cutting_tool_id.max_life') - is_standard = fields.Boolean('是否标准刀', readonly=True, related='functional_cutting_tool_id.is_standard') + is_standard = fields.Selection([('1', '是'), ('0', '否')],'是否标准刀', readonly=True, related='functional_cutting_tool_id.is_standard') applicable_range = fields.Char('适用范围', readonly=True, related='functional_cutting_tool_id.applicable_range') image = fields.Binary('图片', readonly=True, related='functional_cutting_tool_id.image') @@ -328,7 +383,6 @@ class RealTimeDistributionOfFunctionalTools(models.Model): self.total = record.tool_stock_total + record.return_total - class InboundAndOutboundRecordsOfFunctionalTools(models.Model): _name = 'sf.inbound.and.outbound.records.of.functional.tools' _description = '功能刀具出入库记录' @@ -390,20 +444,32 @@ class InboundAndOutboundRecordsOfFunctionalTools(models.Model): string='夹头型号', readonly=True, domain=[('mrs_cutting_tool_material_name', '=', '夹头')], related='functional_cutting_tool_id.mrs_cutting_tool_cutterhead_model_ids') + cutting_tool_material = fields.Selection([('0', '整体式刀具'), ('1', '组合式刀具')], string='刀具物料', default='0') + + @api.onchange('cutting_tool_material') + def _onchange_cutting_tool_material(self): + for record in self: + if record: + if record.cutting_tool_material == '1': + record.mrs_cutting_tool_integral_model_ids = None + if record.cutting_tool_material == '0': + record.mrs_cutting_tool_blade_model_ids = None + record.mrs_cutting_tool_cutterbar_model_ids = None + record.mrs_cutting_tool_cutterpad_model_ids = None diameter = fields.Float('直径(mm)', readonly=True, related='functional_cutting_tool_id.diameter') tool_grade = fields.Selection([('1', 'P1'), ('2', 'P2'), ('3', 'P3'), ('4', 'P4'), ('5', 'P5'), ('6', 'P6')], string='刀具等级', readonly=True, related='functional_cutting_tool_id.tool_grade') machining_accuracy = fields.Float('加工精度(mm)', readonly=True, related='functional_cutting_tool_id.machining_accuracy') - tool_length = fields.Float('装刀长', readonly=True, related='functional_cutting_tool_id.tool_length') + tool_length = fields.Float('装刀长(mm)', readonly=True, related='functional_cutting_tool_id.tool_length') blade_number = fields.Integer('刃数', readonly=True, related='functional_cutting_tool_id.blade_number') integral_blade_length = fields.Float('整体刃长(mm)', readonly=True, related='functional_cutting_tool_id.integral_blade_length') effective_blade_length = fields.Float('有效刃长(mm)', readonly=True, related='functional_cutting_tool_id.effective_blade_length') max_life = fields.Float('最大寿命值', readonly=True, related='functional_cutting_tool_id.max_life') - is_standard = fields.Boolean('是否标准刀', readonly=True, related='functional_cutting_tool_id.is_standard') + is_standard = fields.Selection([('1', '是'), ('0', '否')],'是否标准刀', readonly=True, related='functional_cutting_tool_id.is_standard') applicable_range = fields.Char('适用范围', readonly=True, related='functional_cutting_tool_id.applicable_range') image = fields.Binary('图片', readonly=True, related='functional_cutting_tool_id.image') @@ -420,7 +486,8 @@ class InboundAndOutboundRecordsOfFunctionalTools(models.Model): reason_application = fields.Char(string='申请原因', readonly=False) applicant = fields.Char(string='申请人', readonly=False) - inbound_and_outbound_records_ids = fields.One2many('sf.inbound.and.outbound.records','inbound_and_outbound_tools_id', string='出入库记录') + inbound_and_outbound_records_ids = fields.One2many('sf.inbound.and.outbound.records', + 'inbound_and_outbound_tools_id', string='出入库记录') remark = fields.Char(string='备注/说明', readonly=False) @@ -430,7 +497,8 @@ class InboundAndOutboundRecords(models.Model): _description = '出入库记录' _order = 'id DESC' - inbound_and_outbound_tools_id = fields.Many2one('sf.inbound.and.outbound.records.of.functional.tools',string='功能刀具出入库记录') + inbound_and_outbound_tools_id = fields.Many2one('sf.inbound.and.outbound.records.of.functional.tools', + string='功能刀具出入库记录') name = fields.Char(string='出入库记录') tool_state = fields.Selection([('0', '领用出库'), ('1', '归还入库')], string="出入库类别", readonly=False) @@ -454,25 +522,30 @@ class MachineTableToolChangingApply(models.Model): # string='换刀需求信息', # attrs="{'invisible': 1}") - name = fields.Many2one('maintenance.equipment', string='CNC机床', readonly=False,tracking=True, group_expand='_read_group_names') - machine_table_type_id = fields.Many2one('sf.machine_tool.category', string='机床类型', readonly=True, compute='_compute_name') + name = fields.Many2one('maintenance.equipment', string='CNC机床',required=True, readonly=False, tracking=True, + group_expand='_read_group_names') + machine_table_type_id = fields.Many2one('sf.machine_tool.category', string='机床类型', readonly=True, + compute='_compute_name') machine_tool_code = fields.Char(string='机台号', attrs="{'invisible': 1}", readonly=True, compute='_compute_name') cutter_spacing_code = fields.Char(string='刀位号', readonly=False) functional_tool_code = fields.Char(string='功能刀具编码', readonly=True, compute='_compute_functional_tool_name_id') functional_tool_name_id = fields.Many2one('sf.functional.cutting.tool', string='功能刀具名称', readonly=False) - functional_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model',string='功能刀具类型', readonly=True, compute='_compute_functional_tool_name_id') - diameter = fields.Char(string='直径', readonly=False) + functional_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', string='功能刀具类型', readonly=True, + compute='_compute_functional_tool_name_id') + diameter = fields.Char(string='直径(mm)', readonly=False) coarse_middle_thin = fields.Selection([("1", "粗"), ('2', '中'), ('3', '精')], string='粗/中/精', readonly=False) hilt_name = fields.Char(string='刀柄名称', readonly=False) hilt_code = fields.Char(string='刀柄编号', readonly=False) max_lifetime_value = fields.Char(string='最大寿命值', readonly=False) alarm_value = fields.Char(string='报警值', readonly=False) used_value = fields.Char(string='已使用值', readonly=False) - functional_tool_status = fields.Selection([('正常', '正常'), ('异常', '异常')], string='功能刀具状态', default='正常', readonly=False) + functional_tool_status = fields.Selection([('正常', '正常'), ('异常', '异常')], string='功能刀具状态', + default='正常', readonly=False) replacement_tool_code = fields.Char(string='待换功能刀具编码', readonly=True) replacement_tool_name_id = fields.Many2one('sf.functional.cutting.tool', string='待换功能刀具名称', readonly=True) - replacement_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', string='待换功能刀具类型', readonly=True) + replacement_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', string='待换功能刀具类型', + readonly=True) replacement_tool_coarse_middle_thin = fields.Selection([("1", "粗"), ('2', '中'), ('3', '精')], string='粗/中/精', readonly=True) new_former = fields.Selection([('0', '新'), ('1', '旧')], string='新/旧', readonly=True) @@ -512,19 +585,19 @@ class MachineTableToolChangingApply(models.Model): """ # 更新数据到机台换刀申请界面 # todo 自动换刀申请条件需补充完善 - if(self.functional_tool_status == '异常'): + if (self.functional_tool_status == '异常'): self.env['sf.machine.table.tool.changing.apply'].search([ ('name', '=', self.name.id)]).write({ - 'replacement_tool_code': self.functional_tool_code, - 'replacement_tool_name_id': self.functional_tool_name_id.id, - 'replacement_tool_type_id': self.functional_tool_type_id.id, - 'replacement_tool_coarse_middle_thin': self.coarse_middle_thin, - 'new_former': '0', - 'applicant': '自动申请', - 'used_tool_time': fields.Datetime.now(), - 'reason_for_applying': '功能刀具状态异常', - 'remark': None, - 'status': '1' + 'replacement_tool_code': self.functional_tool_code, + 'replacement_tool_name_id': self.functional_tool_name_id.id, + 'replacement_tool_type_id': self.functional_tool_type_id.id, + 'replacement_tool_coarse_middle_thin': self.coarse_middle_thin, + 'new_former': '0', + 'applicant': '自动申请', + 'used_tool_time': fields.Datetime.now(), + 'reason_for_applying': '功能刀具状态异常', + 'remark': None, + 'status': '1' }) # 新建组装任务 @@ -542,9 +615,7 @@ class MachineTableToolChangingApply(models.Model): 'cutter_spacing_code': self.cutter_spacing_code, }) - - - def new_assembly_task(self,vals): + def new_assembly_task(self, vals): """ 新建组装任务 :param vals: @@ -557,7 +628,6 @@ class MachineTableToolChangingApply(models.Model): self.env['sf.functional.tool.assembly'].create(vals) - def revocation_1(self): """ 换刀申请撤回按键 @@ -583,7 +653,6 @@ class MachineTableToolChangingApply(models.Model): 'sf_functional_tool_assembly_id': None, }) - def revocation_2(self): """ 转移撤回按键 @@ -615,7 +684,8 @@ class CAMWorkOrderProgramKnifePlan(models.Model): functional_tool_code = fields.Char(string='功能刀具编码', readonly=False) functional_tool_name_id = fields.Many2one('sf.functional.cutting.tool', string='功能刀具名称', readonly=False) functional_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', string='功能刀具类型', readonly=False) - machine_table_name_id = fields.Many2one('maintenance.equipment', string='机床名称', readonly=False, tracking=True, group_expand='_read_group_machine_table_name_ids') + machine_table_name_id = fields.Many2one('maintenance.equipment', string='机床名称', readonly=False, tracking=True, + group_expand='_read_group_machine_table_name_ids') @api.model def _read_group_machine_table_name_ids(self, categories, domain, order): @@ -623,14 +693,16 @@ class CAMWorkOrderProgramKnifePlan(models.Model): return categories.browse(machine_table_name_ids) machine_tool_cutter_spacing_code = fields.Char(string='机床刀位号', readonly=False) - diameter = fields.Char(string='直径（程式）', readonly=False) - tool_loading_length = fields.Char(string='装刀长', readonly=False) - clearance_length = fields.Char(string='避空长', readonly=False) + diameter = fields.Char(string='直径（程式）(mm)', readonly=False) + tool_loading_length = fields.Char(string='装刀长(mm)', readonly=False) + clearance_length = fields.Char(string='避空长(mm)', readonly=False) tool_included_angle = fields.Char(string='刀尖角（R角）', readonly=False) L_D = fields.Char(string='L/D', readonly=False) - coarse_middle_thin = fields.Selection([("1", "粗"), ('2', '中'), ('3', '精')], string='粗/中/精', readonly=False, default='2') + coarse_middle_thin = fields.Selection([("1", "粗"), ('2', '中'), ('3', '精')], string='粗/中/精', readonly=False, + default='2') required_cutting_time = fields.Char(string='需切削时长', readonly=False) - whether_standard_tool = fields.Selection([('1', '是'), ('0', '否')],string='是否标准刀', readonly=False, default='1') + whether_standard_tool = fields.Selection([('1', '是'), ('0', '否')], string='是否标准刀', readonly=False, + default='1') need_knife_time = fields.Datetime(string='需要用刀时间', readonly=False) plan_execute_status = fields.Selection([('0', '待下发'), ('1', '执行中'), ('2', '已完成')], string='计划执行状态', default='0', readonly=False) @@ -703,19 +775,19 @@ class FunctionalToolAssembly(models.Model): _description = '功能刀具组装' _order = 'use_tool_time asc' - functional_tool_code = fields.Char(string='功能刀具编码', readonly=True) name = fields.Many2one('sf.functional.cutting.tool', string='功能刀具名称', readonly=True) functional_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', string='功能刀具类型', readonly=True, tracking=True, group_expand='_read_group_functional_tool_type_ids') + @api.model def _read_group_functional_tool_type_ids(self, categories, domain, order): """读取分组自定义以便在看板视图中显示所有的类别，即使它们为空""" functional_tool_type_ids = categories._search([], order=order, access_rights_uid=SUPERUSER_ID) return categories.browse(functional_tool_type_ids) - functional_tool_diameter = fields.Char(string='功能刀具直径', readonly=True) - functional_tool_length = fields.Char(string='功能刀具伸出长', readonly=True) + functional_tool_diameter = fields.Char(string='功能刀具直径(mm)', readonly=True) + functional_tool_length = fields.Char(string='功能刀具伸出长(mm)', readonly=True) functional_tool_cutting_type = fields.Char(string='功能刀具切削类型', readonly=False) # 整体式刀具型号 @@ -748,7 +820,8 @@ class FunctionalToolAssembly(models.Model): sf_tool_brand_id_4 = fields.Many2one('sf.machine.brand', '刀盘品牌', readonly=True) # 刀柄型号 - mrs_cutting_tool_cutterhandle_model_ids = fields.Many2many('sf.cutting.tool.model', 'sf_functional_tool_assembly_id', + mrs_cutting_tool_cutterhandle_model_ids = fields.Many2many('sf.cutting.tool.model', + 'sf_functional_tool_assembly_id', string='刀柄型号', readonly=True, domain= [('mrs_cutting_tool_material_name', '=', '刀柄')]) handle_code = fields.Char('刀柄序列号', readonly=True) @@ -763,18 +836,19 @@ class FunctionalToolAssembly(models.Model): sf_tool_brand_id_6 = fields.Many2one('sf.machine.brand', '夹头品牌', readonly=True) coarse_middle_thin = fields.Selection([("1", "粗"), ('2', '中'), ('3', '精')], string='粗/中/精', readonly=True) - tool_loading_length = fields.Char(string='装刀长', readonly=True) + tool_loading_length = fields.Char(string='装刀长(mm)', readonly=True) new_former = fields.Selection([('0', '新'), ('1', '旧')], string='新/旧', readonly=True) - reference_length = fields.Char(string='参考伸出长', readonly=True) + reference_length = fields.Char(string='参考伸出长(mm)', readonly=True) cut_time = fields.Char(string='已切削时间', readonly=True) - cut_length = fields.Char(string='已切削长度', readonly=True) + cut_length = fields.Char(string='已切削长度(mm)', readonly=True) cut_number = fields.Char(string='已切削次数', readonly=True) loading_task_source = fields.Selection([('0', 'CAM装刀'), ('1', '机台换刀')], string='装刀任务来源', readonly=True) applicant = fields.Char(string='申请人', readonly=True) reason_for_applying = fields.Char(string='申请原因', readonly=True) apply_time = fields.Datetime(string='申请时间', default=fields.Datetime.now(), readonly=True) - assemble_status = fields.Selection([('0', '待组装'), ('1', '已组装'), ('2', '已出库')],string='组装状态', default='0', readonly=True) + assemble_status = fields.Selection([('0', '待组装'), ('1', '已组装'), ('2', '已出库')], string='组装状态', + default='0', readonly=True) use_tool_time = fields.Datetime(string='用刀时间', readonly=True) production_line_name_id = fields.Many2one('sf.production.line', string='产线名称', readonly=False) machine_tool_name_id = fields.Many2one('maintenance.equipment', string='机床名称', readonly=True) @@ -789,7 +863,8 @@ class FunctionalToolAssembly(models.Model): check_box_1 = fields.Boolean(string='复选框', default=False, readonly=False) sf_machine_table_tool_changing_apply_id = fields.Many2one('sf.machine.table.tool.changing.apply', '机床换刀申请') - sf_cam_work_order_program_knife_plan_id = fields.Many2one('sf.cam.work.order.program.knife.plan', 'CAM工单程序用刀计划') + sf_cam_work_order_program_knife_plan_id = fields.Many2one('sf.cam.work.order.program.knife.plan', + 'CAM工单程序用刀计划') def open_sf_cam_work_order_program_knife_plan(self): """ @@ -860,7 +935,6 @@ class FunctionalToolAssembly(models.Model): self.env['sf.functional.cutting.tool.entity.cache'].search([ ('code', '=', self.functional_tool_code)]).unlink() - # # 删除功能刀具预警、实时分布、出入库记录的新记录 # self.env['sf.functional.tool.warning'].search([ # ('code', '=', self.functional_tool_code)]).unlink() @@ -907,11 +981,10 @@ class FunctionalToolAssembly(models.Model): 'cut_length': None, 'cut_number': None, 'assemble_status': '0', - 'tool_loading_person':None, - 'tool_loading_time':None + 'tool_loading_person': None, + 'tool_loading_time': None }) - def show_popup(self): """ 单个功能刀具出库 @@ -919,26 +992,27 @@ class FunctionalToolAssembly(models.Model): """ self.env['sf.delivery.of.cargo.from.storage'].search([]).unlink() - vals = self.env['sf.functional.tool.assembly'].search([('check_box_1', '=', True),('assemble_status', '=', '1')]) + vals = self.env['sf.functional.tool.assembly'].search( + [('check_box_1', '=', True), ('assemble_status', '=', '1')]) if vals: for val in vals: self.env['sf.delivery.of.cargo.from.storage'].create({ - 'functional_tool_code': val.functional_tool_code, - 'name': val.name.id, - 'functional_tool_type_id': val.functional_tool_type_id.id, - 'production_line_name_id': val.production_line_name_id.id, - 'machine_tool_code': val.machine_tool_code, - 'receive_person': val.receive_person, - 'receive_time': val.receive_time}) + 'functional_tool_code': val.functional_tool_code, + 'name': val.name.id, + 'functional_tool_type_id': val.functional_tool_type_id.id, + 'production_line_name_id': val.production_line_name_id.id, + 'machine_tool_code': val.machine_tool_code, + 'receive_person': val.receive_person, + 'receive_time': val.receive_time}) else: self.env['sf.delivery.of.cargo.from.storage'].create({ - 'functional_tool_code': self.functional_tool_code, - 'name': self.name.id, - 'functional_tool_type_id': self.functional_tool_type_id.id, - 'production_line_name_id': self.production_line_name_id.id, - 'machine_tool_code': self.machine_tool_code, - 'receive_person': self.receive_person, - 'receive_time': self.receive_time}) + 'functional_tool_code': self.functional_tool_code, + 'name': self.name.id, + 'functional_tool_type_id': self.functional_tool_type_id.id, + 'production_line_name_id': self.production_line_name_id.id, + 'machine_tool_code': self.machine_tool_code, + 'receive_person': self.receive_person, + 'receive_time': self.receive_time}) return { 'type': 'ir.actions.act_window', @@ -965,4 +1039,4 @@ class FunctionalToolAssembly(models.Model): """ todo 组装单打印 :return: - """ \ No newline at end of file + """ diff --git a/sf_tool_management/views/tool_base_views.xml b/sf_tool_management/views/tool_base_views.xml index 2aa91feb..04f06b27 100644 --- a/sf_tool_management/views/tool_base_views.xml +++ b/sf_tool_management/views/tool_base_views.xml @@ -27,48 +27,69 @@ - +
+

+ +

+
+ - - - + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + @@ -137,29 +158,49 @@
- +
+

+ +

+
+ - - + + + + + + + + - - - - - - - - - - - - @@ -286,29 +327,49 @@ - +
+

+ +

+
+ - + + + + + + + - - - - - - - - - - - - @@ -423,29 +484,49 @@ - +
+

+ +

+
+ - + + + + + + + - - - - - - - - - - - - @@ -675,53 +756,63 @@
-
-
+ + + + + + + + + + diff --git a/sf_manufacturing/views/tray_view.xml b/sf_manufacturing/views/tray_view.xml index 07068211..33b8db9a 100644 --- a/sf_manufacturing/views/tray_view.xml +++ b/sf_manufacturing/views/tray_view.xml @@ -1,30 +1,30 @@ - - - - - 托盘条形码生成 - sf.tray - - - - - - - - - - -
-
+ + + + + + + + + + + + + + + + + + + + + - + - - - - - - \ No newline at end of file + + + + + + \ No newline at end of file