开发

sf_sale/models/sale_order.py

@@ -60,7 +60,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):
+                          deadline_of_delivery, payments_way, pay_way, state='sale'):
         now_time = datetime.datetime.now()
         partner = self.get_customer()
         data = {
@@ -69,7 +69,7 @@ class ReSaleOrder(models.Model):
             'name': self.env['ir.sequence'].next_by_code('sale.order', sequence_date=now_time),
             'partner_id': partner.id,
             'check_status': 'approved',
-            'state': 'sale',
+            'state': state,
             'user_id': partner.user_id.id,
             'person_of_delivery': delivery_name,
             'telephone_of_delivery': delivery_telephone,
@@ -133,8 +133,7 @@ class ReSaleOrder(models.Model):
             'product_uom_qty': item['number'],
             'model_glb_file': base64.b64decode(item['model_file']),
             'remark': item.get('remark'),
-            'is_incoming_material': item.get('is_incoming_material'),
-            'incoming_size': item.get('incoming_size'),
+            'is_incoming_material': item.get('is_incoming_material')
         }
         return self.env['sale.order.line'].with_context(skip_procurement=True).create(vals)
 
@@ -175,8 +174,7 @@ 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('带料尺寸')
+    is_incoming_material = fields.Boolean('客供料', default=False)
 
     @api.depends('product_template_id')
     def _compute_model_glb_file(self):

sf_sale/views/sale_order_view.xml

@@ -118,8 +118,7 @@
                 <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"/>
+                    <field name="is_incoming_material"/>
                 </xpath>
                 <field name="user_id" position="attributes">
                     <attribute name="attrs">{'readonly': [('state', 'in', ['cancel','sale'])]}</attribute>
@@ -167,7 +166,6 @@
                 <!--新增带料字段-->
                  <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>
@@ -207,12 +205,12 @@
                 <field name="create_date" position="attributes">
                     <attribute name="string">下单时间</attribute>
                 </field>
-                <field name="state" position="after">
+                <!-- <field name="state" position="after">
                     <field name="check_status" widget="badge"
                            decoration-success="check_status == 'approved'"
                            decoration-warning="check_status == 'pending'"
                            decoration-danger="check_status == 'fail'"/>
-                </field>
+                </field> -->
             </field>
         </record>