From 8cff3d8377579f3e0079b02c5037fd743e3dfa2a Mon Sep 17 00:00:00 2001
From: hujiaying <hujiaying@jikimo.com>
Date: Fri, 18 Oct 2024 16:39:15 +0800
Subject: [PATCH] =?UTF-8?q?sf=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E6=96=B0=E5=A2=9E=E6=98=AF=E5=90=A6=E5=B8=A6=E6=96=99?=
 =?UTF-8?q?=EF=BC=8C=E5=B8=A6=E6=96=99=E5=B0=BA=E5=AF=B8=EF=BC=8C=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9bfm=E5=88=86=E9=85=8D=E5=B7=A5=E5=8E=82=EF=BC=8Csf?=
 =?UTF-8?q?=E6=8E=A5=E6=94=B6=E8=AE=A2=E5=8D=95=E7=94=9F=E6=88=90=E9=94=80?=
 =?UTF-8?q?=E5=94=AE=E8=AE=A2=E5=8D=95=E6=96=B0=E5=A2=9E=E4=B8=A4=E4=B8=AA?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=EF=BC=8C=E5=B9=B6=E4=BF=AE=E6=94=B9=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E8=AF=A6=E6=83=85=E5=8F=8A=E8=AE=A2=E5=8D=95=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E8=A1=A8=E5=8D=95=E6=96=B0=E5=A2=9E=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_sale/models/sale_order.py      | 8 ++++++--
 sf_sale/views/sale_order_view.xml | 8 +++++++-
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/sf_sale/models/sale_order.py b/sf_sale/models/sale_order.py
index f28a76c4..d3ec1aa0 100644
--- a/sf_sale/models/sale_order.py
+++ b/sf_sale/models/sale_order.py
@@ -57,7 +57,6 @@ class ReSaleOrder(models.Model):
 
     delivery_warning = fields.Selection([('normal', '正常'), ('warning', '告警'), ('overdue', '逾期')], string='时效')
 
-
     # 业务平台分配工厂后在智能工厂先创建销售订单
     def sale_order_create(self, company_id, delivery_name, delivery_telephone, delivery_address,
                           deadline_of_delivery, payments_way, pay_way):
@@ -128,7 +127,9 @@ class ReSaleOrder(models.Model):
             'price_unit': product.list_price,
             'product_uom_qty': item['number'],
             'model_glb_file': base64.b64decode(item['model_file']),
-            'remark': item.get('remark')
+            'remark': item.get('remark'),
+            'is_incoming_material': item.get('is_incoming_material'),
+            'incoming_size': item.get('incoming_size'),
         }
         return self.env['sale.order.line'].with_context(skip_procurement=True).create(vals)
 
@@ -169,6 +170,9 @@ class ResaleOrderLine(models.Model):
     check_status = fields.Selection(related='order_id.check_status')
     remark = fields.Char('备注')
 
+    is_incoming_material = fields.Boolean('是否带料', default=False)
+    incoming_size = fields.Char('带料尺寸')
+
     @api.depends('product_template_id')
     def _compute_model_glb_file(self):
         for line in self:
diff --git a/sf_sale/views/sale_order_view.xml b/sf_sale/views/sale_order_view.xml
index 61b53b08..be8c469b 100644
--- a/sf_sale/views/sale_order_view.xml
+++ b/sf_sale/views/sale_order_view.xml
@@ -118,6 +118,8 @@
                 <xpath expr="//field[@name='order_line']/tree/field[@name='name']" position="replace">
                     <field name="name" widget="section_and_note_text" optional="show"
                            string="参数说明(长/宽/高/体积/精度/材质)"/>
+                    <field name="is_incoming_material" optional="hide"/>
+                    <field name="incoming_size" optional="hide"/>
                 </xpath>
                 <field name="user_id" position="attributes">
                     <attribute name="attrs">{'readonly': [('state', 'in', ['cancel','sale'])]}</attribute>
@@ -162,6 +164,11 @@
                 <xpath expr="//button[@name='action_cancel']" position="attributes">
                     <attribute name="string">拒绝接单</attribute>
                 </xpath>
+                <!--新增带料字段-->
+                 <xpath expr="//field[@name='order_line']/form//group//group//field[@name='analytic_distribution']" position="after">
+                    <field name="is_incoming_material"/>
+                    <field name="incoming_size" attrs="{'invisible': [('is_incoming_material', '=', False)],'readonly':1}"/>
+                </xpath>
             </field>
         </record>
 
@@ -265,7 +272,6 @@
                 </field>
             </field>
         </record>
-
         <record id="sale.product_template_action" model="ir.actions.act_window">
             <field name="context">{"search_default_categ_id":1,
                 "search_default_filter_to_sell":1,"sale_multi_pricelist_product_template": 1}