From d216478679d5441e0cc9242f3816354888a04e68 Mon Sep 17 00:00:00 2001
From: mgw <1392924357@qq.com>
Date: Wed, 15 Nov 2023 15:28:32 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=BF=99=E4=B8=A4?=
 =?UTF-8?q?=E4=B8=AA=E6=96=87=E4=BB=B6=E7=9A=84=5F=5Fmanifest=5F=5F.py?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jikimo_frontend/__manifest__.py    | 4 ++--
 sf_machine_connect/__manifest__.py | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/jikimo_frontend/__manifest__.py b/jikimo_frontend/__manifest__.py
index d9885897..65438849 100644
--- a/jikimo_frontend/__manifest__.py
+++ b/jikimo_frontend/__manifest__.py
@@ -32,8 +32,8 @@
             'jikimo_frontend/static/src/scss/rowno_in_tree.scss',
             # 'jikimo_frontend/static/src/views/list_nums/list_render.xml',
             'jikimo_frontend/static/src/list/list_up_down_button.xml',
-            'jikimo_frontend/static/src/list/custom_import.js',
-            'jikimo_frontend/static/src/list/custom_width.js',
+            # 'jikimo_frontend/static/src/list/custom_import.js',
+            # 'jikimo_frontend/static/src/list/custom_width.js',
             'jikimo_frontend/static/src/views/list_nums/extent_purchase.xml',
 
         ],
diff --git a/sf_machine_connect/__manifest__.py b/sf_machine_connect/__manifest__.py
index 3afbb200..6ee1a20a 100644
--- a/sf_machine_connect/__manifest__.py
+++ b/sf_machine_connect/__manifest__.py
@@ -39,6 +39,7 @@
         ],
 
     },
+    'external_dependencies': {'python': ['opcua(使用pip install opcua -i https://pypi.tuna.tsinghua.edu.cn/simple)']},
 
     'installable': True,
     'application': True,

From 076866e9b78830413a139f67c4bb1c7fd35a0c92 Mon Sep 17 00:00:00 2001
From: mgw <1392924357@qq.com>
Date: Thu, 16 Nov 2023 17:01:14 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BA=A7=E5=93=81=E6=A8=A1=E6=9D=BF?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9>>>=E5=A2=9E=E5=8A=A0=E2=80=9C=E8=A7=84?=
 =?UTF-8?q?=E6=A0=BC=E2=80=9D=E5=AD=97=E6=AE=B5specification=5Fid?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/mrp_production_addional_change.xml  | 50 +++++++++++++++++++
 1 file changed, 50 insertions(+)

diff --git a/sf_manufacturing/views/mrp_production_addional_change.xml b/sf_manufacturing/views/mrp_production_addional_change.xml
index 186ebc1c..345e5f38 100644
--- a/sf_manufacturing/views/mrp_production_addional_change.xml
+++ b/sf_manufacturing/views/mrp_production_addional_change.xml
@@ -104,5 +104,55 @@
 <!--                     <filter string="草稿" name="filter_draft" domain="[('state', '=', 'draft')]"/> -->
 <!--                 </xpath> -->
 
+
+<!--         产品模板修改>>>增加“规格”字段specification_id -->
+        <record id="custom_product_template_kanban_view" model="ir.ui.view">
+            <field name="name">custom.Product.template.product.kanban</field>
+            <field name="model">product.template</field>
+            <field name="inherit_id" ref="product.product_template_kanban_view"/>
+            <field name="arch" type="xml">
+                <xpath expr="//kanban" position="replace">
+                    <kanban sample="1" class="o_kanban_product_template">
+                    <field name="id"/>
+                    <field name="product_variant_count"/>
+                    <field name="currency_id"/>
+                    <field name="activity_state"/>
+                    <progressbar field="activity_state" colors='{"planned": "success", "today": "warning", "overdue": "danger"}'/>
+                    <templates>
+                        <t t-name="kanban-box">
+                            <div class="oe_kanban_card oe_kanban_global_click">
+                                <div class="o_kanban_image me-1">
+                                    <img t-att-src="kanban_image('product.template', 'image_128', record.id.raw_value)" alt="Product" class="o_image_64_contain"/>
+                                </div>
+                                <div class="oe_kanban_details">
+                                    <div class="o_kanban_record_top mb-0">
+                                        <div class="o_kanban_record_headings">
+                                            <strong class="o_kanban_record_title">
+                                                <field name="name"/>
+                                            </strong>
+                                        </div>
+                                        <field name="priority" widget="priority"/>
+                                    </div>
+                                    <t t-if="record.default_code.value">[<field name="default_code"/>]</t>
+                                    <div t-if="record.product_variant_count.value &gt; 1" groups="product.group_product_variant">
+                                        <strong>
+                                            <t t-esc="record.product_variant_count.value"/> Variants
+                                        </strong>
+                                    </div>
+                                    <div name="product_lst_price" class="mt-1">
+                                        Price: <field name="list_price" widget="monetary" options="{'currency_field': 'currency_id', 'field_digits': True}"></field>
+                                    </div>
+                                    <div name="product_specification_id" class="mt-1">
+                                        规格: <field name="specification_id"></field>
+                                    </div>
+                                </div>
+                            </div>
+                        </t>
+                    </templates>
+                </kanban>
+                </xpath>
+            </field>
+        </record>
+
     </data>
 </odoo>
\ No newline at end of file