From 12615b3dbaebd9f7fb798b6a6daf465f69efc1c1 Mon Sep 17 00:00:00 2001
From: "jinling.yang" <jinling.yang@jikimo.com>
Date: Tue, 22 Nov 2022 11:08:07 +0800
Subject: [PATCH] =?UTF-8?q?=E9=94=80=E5=94=AE=E5=92=8C=E4=BA=A7=E5=93=81?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=95=B4=E5=90=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_dlm/__manifest__.py                    |  2 +-
 sf_dlm/data/product_data.xml              |  2 +-
 sf_dlm/views/product_template_view.xml    | 10 ++--
 sf_manufacturing/models/mrp_production.py |  5 +-
 sf_manufacturing/models/mrp_workorder.py  | 60 +++++++++++------------
 sf_mrs_connect/__manifest__.py            |  4 +-
 sf_sale/__manifest__.py                   |  2 +-
 sf_sale/models/sale_order.py              |  2 +-
 8 files changed, 44 insertions(+), 43 deletions(-)

diff --git a/sf_dlm/__manifest__.py b/sf_dlm/__manifest__.py
index aabf049d..df6b5425 100644
--- a/sf_dlm/__manifest__.py
+++ b/sf_dlm/__manifest__.py
@@ -10,7 +10,7 @@
     """,
     'category': 'sf',
     'website': 'https://www.sf.jikimo.com',
-    'depends': ['product', 'base'],
+    'depends': ['mrp', 'base', 'sf_manufacturing'],
     'data': [
         'data/product_data.xml',
         'views/product_template_view.xml'
diff --git a/sf_dlm/data/product_data.xml b/sf_dlm/data/product_data.xml
index 03a8588f..2b7bedd5 100644
--- a/sf_dlm/data/product_data.xml
+++ b/sf_dlm/data/product_data.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <odoo>
-    <data noupdate="0">
+    <data noupdate="1">
         <record id="product_template_sf"  model="product.product">
             <field name="name">CNC加工产品模板</field>
             <field name="categ_id" ref="product.product_category_5"/>
diff --git a/sf_dlm/views/product_template_view.xml b/sf_dlm/views/product_template_view.xml
index e6e670b5..83d70cfa 100644
--- a/sf_dlm/views/product_template_view.xml
+++ b/sf_dlm/views/product_template_view.xml
@@ -6,11 +6,11 @@
             <field name="model">product.template</field>
             <field name="inherit_id" ref="product.product_template_only_form_view"/>
             <field name="arch" type="xml">
-<!--                <field name="invoice_policy" position="after">-->
-<!--                    <field name="materials_id" string="材料"/>-->
-<!--                    <field name="materials_type_id" string="型号"-->
-<!--                           domain="[('materials_id', '=', materials_id)]"/>-->
-<!--                </field>-->
+                <field name="invoice_policy" position="after">
+                    <field name="materials_id" string="材料"/>
+                    <field name="materials_type_id" string="型号"
+                           domain="[('materials_id', '=', materials_id)]"/>
+                </field>
 
                 <xpath expr="//label[@for='volume']" position="before">
                     <label for="long" string="尺寸"
diff --git a/sf_manufacturing/models/mrp_production.py b/sf_manufacturing/models/mrp_production.py
index 9b5ea04e..57164e63 100644
--- a/sf_manufacturing/models/mrp_production.py
+++ b/sf_manufacturing/models/mrp_production.py
@@ -2,6 +2,7 @@
 from odoo import api, fields, models
 
 
+
 class MrpProduction(models.Model):
     _inherit = 'mrp.production'
     _description = "制造订单"
@@ -69,7 +70,7 @@ class MrpProduction(models.Model):
     # 则根据设备找到工作中心；否则采用前面描述的工作中心分配机制；
     # 其他规则限制： 默认只分配给工作中心状态为非故障的工作中心；
 
-    def _create_workorder(self):
+    def _create_workorder3(self):
         for production in self:
             if not production.bom_id or not production.product_id:
                 continue
@@ -214,6 +215,6 @@ class MrpProduction(models.Model):
                 current_sequence += 1
 
     def _create_workorder(self):
-        res = super()._create_workorder()
+        res = self._create_workorder3()
         self._reset_work_order_sequence()
         return res
diff --git a/sf_manufacturing/models/mrp_workorder.py b/sf_manufacturing/models/mrp_workorder.py
index e86d52da..bd688a65 100644
--- a/sf_manufacturing/models/mrp_workorder.py
+++ b/sf_manufacturing/models/mrp_workorder.py
@@ -17,36 +17,36 @@ class ResMrpWorkOrder(models.Model):
         ('解除装夹', '解除装夹'),
     ], string="工序类型")
     material_center_point = fields.Char(string='配料中心点')
-    X1_axis = fields.Float(string='Lx1', default=0)
-    Y1_axis = fields.Float(string='Ly1', default=0)
-    Z1_axis = fields.Float(string='Lz1', default=0)
-    X2_axis = fields.Float(string='Lx2', default=0)
-    Y2_axis = fields.Float(string='Ly2', default=0)
-    Z2_axis = fields.Float(string='Lz2', default=0)
-    X3_axis = fields.Float(string='Fx3', default=0)
-    Y3_axis = fields.Float(string='Fy3', default=0)
-    Z3_axis = fields.Float(string='Fz3', default=0)
-    X4_axis = fields.Float(string='Fx4', default=0)
-    Y4_axis = fields.Float(string='Fy4', default=0)
-    Z4_axis = fields.Float(string='Fz4', default=0)
-    X5_axis = fields.Float(string='Rx5', default=0)
-    Y5_axis = fields.Float(string='Ry5', default=0)
-    Z5_axis = fields.Float(string='Rz5', default=0)
-    X6_axis = fields.Float(string='Rx6', default=0)
-    Y6_axis = fields.Float(string='Ry6', default=0)
-    Z6_axis = fields.Float(string='Rz6', default=0)
-    X7_axis = fields.Float(string='Bx7', default=0)
-    Y7_axis = fields.Float(string='By7', default=0)
-    Z7_axis = fields.Float(string='Bz7', default=0)
-    X8_axis = fields.Float(string='Bx8', default=0)
-    Y8_axis = fields.Float(string='By8', default=0)
-    Z8_axis = fields.Float(string='Bz8', default=0)
-    X9_axis = fields.Float(string='Uz9', default=0)
-    Y9_axis = fields.Float(string='Uz9', default=0)
-    Z9_axis = fields.Float(string='Uz9', default=0)
-    X10_axis = fields.Float(string='Uz10', default=0)
-    Y10_axis = fields.Float(string='Uz10', default=0)
-    Z10_axis = fields.Float(string='Uz10', default=0)
+    X1_axis = fields.Float(default=0)
+    Y1_axis = fields.Float(default=0)
+    Z1_axis = fields.Float(default=0)
+    X2_axis = fields.Float(default=0)
+    Y2_axis = fields.Float(default=0)
+    Z2_axis = fields.Float(default=0)
+    X3_axis = fields.Float(default=0)
+    Y3_axis = fields.Float(default=0)
+    Z3_axis = fields.Float(default=0)
+    X4_axis = fields.Float(default=0)
+    Y4_axis = fields.Float(default=0)
+    Z4_axis = fields.Float(default=0)
+    X5_axis = fields.Float(default=0)
+    Y5_axis = fields.Float(default=0)
+    Z5_axis = fields.Float(default=0)
+    X6_axis = fields.Float(default=0)
+    Y6_axis = fields.Float(default=0)
+    Z6_axis = fields.Float(default=0)
+    X7_axis = fields.Float(default=0)
+    Y7_axis = fields.Float(default=0)
+    Z7_axis = fields.Float(default=0)
+    X8_axis = fields.Float(default=0)
+    Y8_axis = fields.Float(default=0)
+    Z8_axis = fields.Float(default=0)
+    X9_axis = fields.Float(default=0)
+    Y9_axis = fields.Float(default=0)
+    Z9_axis = fields.Float(default=0)
+    X10_axis = fields.Float(default=0)
+    Y10_axis = fields.Float(default=0)
+    Z10_axis = fields.Float(default=0)
     X_deviation_angle = fields.Integer(string="X轴偏差度", default=0)
     test_results = fields.Selection([("合格", "合格"), ("返工", "返工"), ("报废", "报废")], string="检测结果")
     cnc_ids = fields.One2many("sf.cnc.processing", 'workorder_id', string="CNC加工")
diff --git a/sf_mrs_connect/__manifest__.py b/sf_mrs_connect/__manifest__.py
index c054561f..ed57fe43 100644
--- a/sf_mrs_connect/__manifest__.py
+++ b/sf_mrs_connect/__manifest__.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 {
-    'name': '机企猫智能工厂连接制造资源库 ',
+    'name': '机企猫智能工厂 连接制造资源库模块 ',
     'version': '1.0',
     'summary': '智能工厂连接制造资源库模块',
     'sequence': 1,
@@ -12,7 +12,7 @@
     'website': 'https://www.sf.cs.jikimo.com',
     'depends': ['sf_base'],
     'data': [
-        # 'data/ir_cron_data.xml',
+        'data/ir_cron_data.xml',
         'views/res_config_settings_views.xml'
     ],
     'demo': [
diff --git a/sf_sale/__manifest__.py b/sf_sale/__manifest__.py
index 1823a8ad..cfa92582 100644
--- a/sf_sale/__manifest__.py
+++ b/sf_sale/__manifest__.py
@@ -10,7 +10,7 @@
     """,
     'category': 'sf',
     'website': 'https://www.sf.jikimo.com',
-    'depends': ['sale', 'sf_bf_connect'],
+    'depends': ['sale', 'sf_bf_connect', 'sf_dlm'],
     'data': [
         'views/sale_order_view.xml'
     ],
diff --git a/sf_sale/models/sale_order.py b/sf_sale/models/sale_order.py
index 1618a4e3..dd2b2ac1 100644
--- a/sf_sale/models/sale_order.py
+++ b/sf_sale/models/sale_order.py
@@ -27,7 +27,7 @@ class ReSaleOrder(models.Model):
         vals = {
             'order_id': self.id,
             'product_id': product.id,
-            'name': '%s/%s/%s/%s/%s' % (item['model_long'], item['model_width'], item['model_height'], item['model_volume'], product.model_materials_id.name),
+            'name': '%s/%s/%s/%s/%s' % (item['model_long'], item['model_width'], item['model_height'], item['model_volume'], product.materials_id.name),
             'price_unit': item['price'],
             'product_uom_qty': item['number']
         }