From a9ba65ec17ea89027465c5b93f4ba738797661e7 Mon Sep 17 00:00:00 2001
From: "qihao.gong@jikimo.com" <qihao.gong@jikimo.com>
Date: Tue, 24 Oct 2023 09:41:28 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E8=BE=93=E5=85=A5?=
 =?UTF-8?q?=E6=A1=86=E5=B1=85=E4=B8=AD=E7=9A=84=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jikimo_frontend/static/src/scss/custom_style.scss | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/jikimo_frontend/static/src/scss/custom_style.scss b/jikimo_frontend/static/src/scss/custom_style.scss
index d4df8c40..3626cd08 100644
--- a/jikimo_frontend/static/src/scss/custom_style.scss
+++ b/jikimo_frontend/static/src/scss/custom_style.scss
@@ -317,10 +317,10 @@ div[class="o_content o_component_with_search_panel"] .o_kanban_primary_right > .
 .o_horizontal_separator {
   font-size: 1.5rem;
 }
-
-.o_field_widget input[class='o_input'] {
-text-align: center
-}
+//
+//.o_field_widget input[class='o_input'] {
+//text-align: center
+//}
 
 div:has(.o_required_modifier) > label::before {
   position: absolute;

From 575c856f27825cae23d22d746d8a40fdda260ad7 Mon Sep 17 00:00:00 2001
From: "jinling.yang" <jinling.yang@jikimo.com>
Date: Tue, 24 Oct 2023 14:43:11 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=88=9B=E5=BB=BA?=
 =?UTF-8?q?=E9=94=80=E5=94=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_sale/models/quick_easy_order.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/sf_sale/models/quick_easy_order.py b/sf_sale/models/quick_easy_order.py
index 94f70f0a..f5e4f931 100644
--- a/sf_sale/models/quick_easy_order.py
+++ b/sf_sale/models/quick_easy_order.py
@@ -183,7 +183,7 @@ class QuickEasyOrder(models.Model):
             company_id = self.env.ref('base.main_company').sudo()
             # user_id = request.env.ref('base.user_admin').sudo()
             order_id = self.env['sale.order'].sale_order_create(company_id, 'XXXXX', 'XXXXX', 'XXXXX',
-                                                                str(datetime.now()))
+                                                                str(datetime.now()), '现结', '支付')
             i = 1
             # 给sale_order的default_code字段赋值
             aa = self.env['sale.order'].sudo().search([('name', '=', order_id.name)])
@@ -243,8 +243,7 @@ class QuickEasyOrder(models.Model):
             # self.cr.rollback()
             return UserError('工厂创建销售订单和产品失败，请联系管理员')
 
-
-# 特征识别
+    # 特征识别
     def feature_recognition(self, report_path, model_code):
         feature_path = self.env['sf.auto_quatotion.common'].sudo().get_feature_full_path()
         process_time_db_path = self.env['sf.auto_quatotion.common'].sudo().get_process_time_db_path()

From 076c4a2bcb5646e9a88120fddcfc23b8f607b6df Mon Sep 17 00:00:00 2001
From: "jinling.yang" <jinling.yang@jikimo.com>
Date: Tue, 24 Oct 2023 14:55:45 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=94=80=E5=94=AE?=
 =?UTF-8?q?=E6=96=B9=E6=B3=95=E7=9A=84=E4=BC=A0=E5=8F=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_sale/models/quick_easy_order.py | 2 +-
 sf_sale/models/sale_order.py       | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/sf_sale/models/quick_easy_order.py b/sf_sale/models/quick_easy_order.py
index f5e4f931..caadb6c2 100644
--- a/sf_sale/models/quick_easy_order.py
+++ b/sf_sale/models/quick_easy_order.py
@@ -183,7 +183,7 @@ class QuickEasyOrder(models.Model):
             company_id = self.env.ref('base.main_company').sudo()
             # user_id = request.env.ref('base.user_admin').sudo()
             order_id = self.env['sale.order'].sale_order_create(company_id, 'XXXXX', 'XXXXX', 'XXXXX',
-                                                                str(datetime.now()), '现结', '支付')
+                                                                str(datetime.now()), '现结', '支付宝')
             i = 1
             # 给sale_order的default_code字段赋值
             aa = self.env['sale.order'].sudo().search([('name', '=', order_id.name)])
diff --git a/sf_sale/models/sale_order.py b/sf_sale/models/sale_order.py
index c57aa780..35d877fe 100644
--- a/sf_sale/models/sale_order.py
+++ b/sf_sale/models/sale_order.py
@@ -1,6 +1,7 @@
 from odoo import models, fields
 import datetime
 import base64
+import logging
 
 
 class ReSaleOrder(models.Model):
@@ -16,6 +17,7 @@ class ReSaleOrder(models.Model):
     # 业务平台分配工厂后在智能工厂先创建销售订单
     def sale_order_create(self, company_id, delivery_name, delivery_telephone, delivery_address,
                           deadline_of_delivery, payments_way, pay_way):
+        logging.info('---------sale_order_create------')
         now_time = datetime.datetime.now()
         partner = self.get_customer()
         order_id = self.env['sale.order'].sudo().create({

From a953ca189e2e3f8ef28f1728352755811f6b0893 Mon Sep 17 00:00:00 2001
From: "JIKIMO-YXH\\xianghui" <3437689193@qq.com>
Date: Tue, 24 Oct 2023 17:11:37 +0800
Subject: [PATCH 4/5] =?UTF-8?q?1=E3=80=81=E4=BC=98=E5=8C=96=E4=BA=A7?=
 =?UTF-8?q?=E5=93=81=E6=A8=A1=E5=9D=97=E4=B8=8B=E5=A4=B9=E5=85=B7=E7=B1=BB?=
 =?UTF-8?q?=E5=88=AB=E4=B8=8B=E7=9A=84=E9=9B=B6=E7=82=B9=E6=89=98=E7=9B=98?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0=E6=98=BE=E7=A4=BA=EF=BC=9B2=E3=80=81?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=8A=9F=E8=83=BD=E5=88=80=E5=85=B7=E7=BB=84?=
 =?UTF-8?q?=E8=A3=85=E5=8D=95=E7=9A=84=E5=88=80=E5=85=B7=E7=89=A9=E6=96=99?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=B8=83=E5=B1=80=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_dlm/views/product_template_view.xml       |  15 +-
 sf_tool_management/views/tool_base_views.xml | 149 ++++++-------------
 2 files changed, 54 insertions(+), 110 deletions(-)

diff --git a/sf_dlm/views/product_template_view.xml b/sf_dlm/views/product_template_view.xml
index fbc12cee..a1322117 100644
--- a/sf_dlm/views/product_template_view.xml
+++ b/sf_dlm/views/product_template_view.xml
@@ -398,11 +398,10 @@
                         </group>
                     </page>
                     <page string="夹具物料参数" attrs="{'invisible': [('categ_type', '!=', '夹具')]}">
-                        <group attrs='{"invisible": [("fixture_material_type","not in",("气动夹具","转接板(锁板)夹具","磁吸夹具","虎钳夹具","零点卡盘"))]}'>
+                        <group attrs='{"invisible": [("fixture_material_type","not in",("气动夹具","转接板(锁板)夹具","磁吸夹具","虎钳夹具","零点卡盘","零点托盘"))]}'>
                             <group>
                                 <field name="brand_id"/>
-                                <field name="fixture_multi_mounting_type_id" options="{'no_create': True}"
-                                       attrs="{'required': [('categ_type', '=', '夹具')]}"/>
+                                <field name="fixture_multi_mounting_type_id" options="{'no_create': True}"/>
                                 <label for="tool_length" string="尺寸(mm)"/>
                                 <div class="o_address_format">
                                     <label for="tool_length" string="长"/>
@@ -419,9 +418,9 @@
                                 </div>
                                 <field name="tool_weight"></field>
                                 <label for="fixture_clamp_workpiece_length_max" string="夹持工件最大尺寸(mm)"
-                                       attrs='{"invisible": [("fixture_material_type","=",("零点卡盘"))]}'/>
+                                       attrs='{"invisible": [("fixture_material_type","in",("零点卡盘","零点托盘"))]}'/>
                                 <div class="o_address_format"
-                                     attrs='{"invisible": [("fixture_material_type","=",("零点卡盘"))]}'>
+                                     attrs='{"invisible": [("fixture_material_type","in",("零点卡盘","零点托盘"))]}'>
                                     <label for="fixture_clamp_workpiece_length_max" string="长"/>
                                     <field name="fixture_clamp_workpiece_length_max" class="o_address_zip"
                                            options="{'format': false}"
@@ -438,7 +437,7 @@
                                            attrs="{'required': [('fixture_material_type', 'in',('气动托盘','转接板(锁板)夹具','磁吸夹具','虎钳夹具'))]}"/>
                                 </div>
                                 <field name="fixture_clamp_workpiece_diameter_max"
-                                       attrs="{'invisible': [('fixture_material_type','=','零点卡盘')],'required': [('fixture_material_type', 'in',('气动夹具','转接板(锁板)夹具','磁吸夹具','虎钳夹具'))]}"/>
+                                       attrs="{'invisible': [('fixture_material_type','in',('零点卡盘','零点托盘'))],'required': [('fixture_material_type', 'in',('气动夹具','转接板(锁板)夹具','磁吸夹具','虎钳夹具'))]}"/>
                                 <field name="fixture_maximum_carrying_weight"></field>
                                 <field name="fixture_maximum_clamping_force"></field>
                             </group>
@@ -453,10 +452,10 @@
                                 <field name="fixture_screw_size"
                                        attrs='{"invisible": [("fixture_material_type","!=",("转接板(锁板)夹具"))]}'/>
                                 <field name="fixture_driving_way"
-                                       attrs='{"invisible": [("fixture_material_type","not in",("虎钳夹具","零点卡盘"))]}'/>
+                                       attrs='{"invisible": [("fixture_material_type","not in",("虎钳夹具","零点卡盘","零点托盘"))]}'/>
                                 <field name="fixture_apply_machine_tool_type_ids" options="{'no_create': True}"
                                        widget="many2many_tags"
-                                       attrs='{"invisible": [("fixture_material_type","!=",("零点卡盘"))]}'/>
+                                       attrs='{"invisible": [("fixture_material_type","not in",("零点卡盘","零点托盘"))]}'/>
                             </group>
                         </group>
 
diff --git a/sf_tool_management/views/tool_base_views.xml b/sf_tool_management/views/tool_base_views.xml
index 1e079896..0e9f7386 100644
--- a/sf_tool_management/views/tool_base_views.xml
+++ b/sf_tool_management/views/tool_base_views.xml
@@ -1101,6 +1101,8 @@
                                <field name="functional_tool_diameter"/>
                                <field name="functional_tool_length"/>
                                <field name="functional_tool_cutting_type"/>
+<!--                               <field name="barcode"/>-->
+<!--                               <field name="barcode_image"/>-->
                            </group>
                        </group>
 
@@ -1125,78 +1127,58 @@
                                 </group>
                                 <group>
                                     <group col="1">
-                                        <group col="1" attrs="{'invisible': [('integral_code_id', '=', False)]}">
-                                            <div>
-                                               <separator string="整体式刀具:" style="font-size: 13px;"/>
-                                            </div>
-                                            <group>
-                                                <group>
-                                                    <field name="integral_code_id" placeholder="请选择" string="序列号"
-                                                           options="{'no_create': True, 'no_quick_create': True}"/>
-                                                </group>
-                                            </group>
-                                            <group col="3">
-                                                 <group>
-                                                    <field name="integral_name" string="名称"/>
-                                                </group>
-                                                <group>
-                                                    <field name="cutting_tool_integral_model_id" string="型号"/>
-                                                </group>
-                                                <group>
-                                                    <field name="sf_tool_brand_id_1" string="品牌"/>
-                                                </group>
-                                            </group>
-                                        </group>
-                                    </group>
-                                </group>
-                                <group>
-                                    <group col="1">
-                                        <group col="1" attrs="{'invisible': [('blade_code_id', '=', False)]}">
-                                            <div>
-                                               <separator string="刀片:" style="font-size: 13px;"/>
-                                            </div>
-                                            <group>
-                                                <group>
-                                                    <field name="blade_code_id" placeholder="请选择" string="序列号"
-                                                           options="{'no_create': True, 'no_quick_create': True}"/>
-                                                </group>
-                                            </group>
-                                            <group col="3">
-                                                 <group>
-                                                    <field name="blade_name" string="名称"/>
-                                                </group>
-                                                <group>
-                                                    <field name="cutting_tool_blade_model_id" string="型号"/>
-                                                </group>
-                                                <group>
-                                                    <field name="sf_tool_brand_id_2" string="品牌"/>
-                                                </group>
-                                            </group>
-                                        </group>
                                         <group col="1">
                                             <div>
                                                <separator string="刀柄:" style="font-size: 13px;"/>
                                             </div>
                                             <group>
-                                                <group>
-                                                    <field name="handle_code_id" string="序列号" placeholder="请选择"
-                                                           options="{'no_create': True, 'no_quick_create': True}"/>
-                                                </group>
+                                                <field name="handle_code_id" string="序列号" placeholder="请选择"
+                                                       options="{'no_create': True, 'no_quick_create': True}"/>
+                                                <field name="handle_name" string="名称"/>
+                                                <field name="cutting_tool_cutterhandle_model_id" string="型号"/>
+                                                <field name="sf_tool_brand_id_5" string="品牌"/>
                                             </group>
-                                            <group col="3">
-                                                 <group>
-                                                    <field name="handle_name" string="名称"/>
-                                                </group>
-                                                <group>
-                                                    <field name="cutting_tool_cutterhandle_model_id" string="型号"/>
-                                                </group>
-                                                <group>
-                                                   <field name="sf_tool_brand_id_5" string="品牌"/>
-                                                </group>
+                                        </group>
+                                        <group col="1" attrs="{'invisible': [('integral_code_id', '=', False)]}">
+                                            <div>
+                                               <separator string="整体式刀具:" style="font-size: 13px;"/>
+                                            </div>
+                                            <group>
+                                                <field name="integral_code_id" placeholder="请选择" string="序列号"
+                                                       options="{'no_create': True, 'no_quick_create': True}"/>
+                                                <field name="integral_name" string="名称"/>
+                                                <field name="cutting_tool_integral_model_id" string="型号"/>
+                                                <field name="sf_tool_brand_id_1" string="品牌"/>
+                                            </group>
+                                        </group>
+                                        <group col="1" attrs="{'invisible': [('blade_code_id', '=', False)]}">
+                                            <div>
+                                               <separator string="刀片:" style="font-size: 13px;"/>
+                                            </div>
+                                            <group>
+                                                <field name="blade_code_id" placeholder="请选择" string="序列号"
+                                                       options="{'no_create': True, 'no_quick_create': True}"/>
+                                                <field name="blade_name" string="名称"/>
+                                                <field name="cutting_tool_blade_model_id" string="型号"/>
+                                                <field name="sf_tool_brand_id_2" string="品牌"/>
                                             </group>
                                         </group>
                                     </group>
                                     <group col="1">
+                                        <group col="1">
+                                            <div>
+                                               <separator string="夹头:" style="font-size: 13px;"/>
+                                            </div>
+                                            <group>
+                                                <group>
+                                                    <field name="chuck_code_id" string="序列号" placeholder="请选择"
+                                                           options="{'no_create': True, 'no_quick_create': True}"/>
+                                                    <field name="chuck_name" string="名称"/>
+                                                    <field name="cutting_tool_cutterhead_model_id" string="型号"/>
+                                                    <field name="sf_tool_brand_id_6" string="品牌"/>
+                                                </group>
+                                            </group>
+                                        </group>
                                         <group col="1" attrs="{'invisible': [('bar_code_id', '=', False)]}">
                                             <div>
                                                <separator string="刀杆:" style="font-size: 13px;"/>
@@ -1205,17 +1187,9 @@
                                                 <group>
                                                     <field name="bar_code_id" placeholder="请选择" string="序列号"
                                                            options="{'no_create': True, 'no_quick_create': True}"/>
-                                                </group>
-                                            </group>
-                                            <group col="3">
-                                                 <group>
                                                     <field name="bar_name" string="名称"/>
-                                                </group>
-                                                <group>
                                                     <field name="cutting_tool_cutterbar_model_id" string="型号"/>
-                                                </group>
-                                                <group>
-                                                   <field name="sf_tool_brand_id_3" string="品牌"/>
+                                                    <field name="sf_tool_brand_id_3" string="品牌"/>
                                                 </group>
                                             </group>
                                         </group>
@@ -1227,43 +1201,14 @@
                                                 <group>
                                                     <field name="pad_code_id" placeholder="请选择" string="序列号"
                                                            options="{'no_create': True, 'no_quick_create': True}"/>
-                                              </group>
-                                            </group>
-                                            <group col="3">
-                                                 <group>
                                                     <field name="pad_name" string="名称"/>
-                                                </group>
-                                                <group>
                                                     <field name="cutting_tool_cutterpad_model_id" string="型号"/>
-                                                </group>
-                                                <group>
-                                                   <field name="sf_tool_brand_id_4" string="品牌"/>
-                                                </group>
-                                            </group>
-                                        </group>
-                                        <group col="1">
-                                            <div>
-                                               <separator string="夹头:" style="font-size: 13px;"/>
-                                            </div>
-                                            <group>
-                                                <group>
-                                                    <field name="chuck_code_id" string="序列号" placeholder="请选择"
-                                                           options="{'no_create': True, 'no_quick_create': True}"/>
-                                                </group>
-                                            </group>
-                                            <group col="3">
-                                                 <group>
-                                                    <field name="chuck_name" string="名称"/>
-                                                </group>
-                                                <group>
-                                                    <field name="cutting_tool_cutterhead_model_id" string="型号"/>
-                                                </group>
-                                                <group>
-                                                   <field name="sf_tool_brand_id_6" string="品牌"/>
+                                                    <field name="sf_tool_brand_id_4" string="品牌"/>
                                                 </group>
                                             </group>
                                         </group>
                                     </group>
+
 <!--                                   <group>-->
 <!--                                       <field name="integral_code_id"/>-->
 <!--                                       <field name="cutting_tool_integral_model_id"/>-->

From 4098dda5b8a6a33cb5f7e2e7eb00eaa975a01399 Mon Sep 17 00:00:00 2001
From: "qihao.gong@jikimo.com" <qihao.gong@jikimo.com>
Date: Tue, 24 Oct 2023 17:31:42 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=BE=E5=A4=87?=
 =?UTF-8?q?=E6=97=A5=E5=BF=97=E5=88=97=E8=A1=A8=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/maintenance_logs_views.xml          | 10 ++++----
 .../views/production_line_view.xml            |  2 +-
 .../views/sf_maintenance_equipment.xml        | 23 +------------------
 3 files changed, 7 insertions(+), 28 deletions(-)

diff --git a/sf_maintenance/views/maintenance_logs_views.xml b/sf_maintenance/views/maintenance_logs_views.xml
index f226349f..a4e8d605 100644
--- a/sf_maintenance/views/maintenance_logs_views.xml
+++ b/sf_maintenance/views/maintenance_logs_views.xml
@@ -9,16 +9,16 @@
                 <tree>
                     <field name="code"/>
                     <field name="name"/>
-                    <field name="type"/>
+                    <field name="type" optional="hide"/>
                     <field name="brand"/>
                     <field name="maintenance_equipment_id"/>
-                    <field name="code_location"/>
+                    <field name="code_location" optional="hide"/>
                     <field name="fault_type"/>
-                    <field name="fault_code"/>
+                    <field name="fault_code" optional="hide"/>
                     <field name="fault_alarm_info"/>
-                    <field name="alarm_level"/>
+                    <field name="alarm_level" optional="hide"/>
                     <field name="alarm_time"/>
-                    <field name="alarm_way"/>
+                    <field name="alarm_way" optional="hide"/>
                     <field name="fault_process"/>
                     <field name="operator"/>
                     <field name="recovery_time"/>
diff --git a/sf_manufacturing/views/production_line_view.xml b/sf_manufacturing/views/production_line_view.xml
index 47e03488..237697c3 100644
--- a/sf_manufacturing/views/production_line_view.xml
+++ b/sf_manufacturing/views/production_line_view.xml
@@ -101,7 +101,7 @@
         <field name="inherit_id" ref="sf_maintenance.view_maintenance_logs_tree"/>
          <field name="arch" type="xml">
              <xpath expr="//field[@name='code']" position="after">
-                 <field name="production_line_id"/>
+                 <field name="production_line_id" optional="hide"/>
              </xpath>
          </field>
      </record>
diff --git a/sf_manufacturing/views/sf_maintenance_equipment.xml b/sf_manufacturing/views/sf_maintenance_equipment.xml
index f072967b..a2d9437d 100644
--- a/sf_manufacturing/views/sf_maintenance_equipment.xml
+++ b/sf_manufacturing/views/sf_maintenance_equipment.xml
@@ -1,27 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <odoo>
-<!--    设备新增生产线-->
-     <record id="sf_hr_equipment_view_form_manufacturing" model="ir.ui.view">
-        <field name="name">sf_equipment.form</field>
-        <field name="model">maintenance.equipment</field>
-        <field name="inherit_id" ref="sf_maintenance.sf_hr_equipment_view_form"/>
-         <field name="arch" type="xml">
-             <xpath expr="//field[@name='brand_id']" position="after">
-                 <field name="production_line_id"/>
-             </xpath>
-         </field>
-     </record>
-<!--    故障日志增加产线对象-->
-         <record id="sf_view_maintenance_logs_tree" model="ir.ui.view">
-        <field name="name">sf.maintenance.logs.tree</field>
-        <field name="model">sf.maintenance.logs</field>
-        <field name="inherit_id" ref="sf_maintenance.view_maintenance_logs_tree"/>
-         <field name="arch" type="xml">
-             <xpath expr="//field[@name='code']" position="after">
-                 <field name="production_line_id"/>
-             </xpath>
-         </field>
-     </record>
+
 <!--    设备增加刀具库位table-->
     <record id="sf_manufacturing_hr_equipment_view_form" model="ir.ui.view">
         <field name="name">sf_manufacturing_equipment.form</field>