From 65d2593db951058132b7a6627b10adf714c7cd86 Mon Sep 17 00:00:00 2001
From: "jinling.yang" <jinling.yang@jikimo.com>
Date: Wed, 29 May 2024 15:03:08 +0800
Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E9=80=81=E7=A9=BA=E6=96=99=E6=9E=B6?=
 =?UTF-8?q?=E5=BC=80=E6=94=BE=E6=96=B0=E5=BB=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_manufacturing/models/mrp_workorder.py      |  2 ++
 sf_manufacturing/models/product_template.py   |  4 ++--
 sf_manufacturing/views/agv_setting_views.xml  |  2 +-
 sf_manufacturing/views/mrp_workorder_view.xml | 14 +++++++++-----
 sf_sale/models/quick_easy_order_old.py        |  4 ++--
 5 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/sf_manufacturing/models/mrp_workorder.py b/sf_manufacturing/models/mrp_workorder.py
index c3342744..743f060c 100644
--- a/sf_manufacturing/models/mrp_workorder.py
+++ b/sf_manufacturing/models/mrp_workorder.py
@@ -1332,6 +1332,8 @@ class WorkPieceDelivery(models.Model):
     def create(self, vals):
         if vals.get('name', '/') == '/' or vals.get('name', '/') is False:
             vals['name'] = self.env['ir.sequence'].next_by_code('sf.workpiece.delivery') or '/'
+        else:
+            vals['type'] = '运送空料架'
         obj = super(WorkPieceDelivery, self).create(vals)
         return obj
 
diff --git a/sf_manufacturing/models/product_template.py b/sf_manufacturing/models/product_template.py
index 7d9bbac5..49a7e483 100644
--- a/sf_manufacturing/models/product_template.py
+++ b/sf_manufacturing/models/product_template.py
@@ -7,8 +7,8 @@ import os
 from odoo import models, fields, api, _
 from odoo.exceptions import ValidationError
 from odoo.modules import get_resource_path
-from OCC.Extend.DataExchange import read_step_file
-from OCC.Extend.DataExchange import write_stl_file
+# from OCC.Extend.DataExchange import read_step_file
+# from OCC.Extend.DataExchange import write_stl_file
 
 
 class ResProductMo(models.Model):
diff --git a/sf_manufacturing/views/agv_setting_views.xml b/sf_manufacturing/views/agv_setting_views.xml
index 42662e2c..9a4bf25e 100644
--- a/sf_manufacturing/views/agv_setting_views.xml
+++ b/sf_manufacturing/views/agv_setting_views.xml
@@ -36,7 +36,7 @@
                 <tree editable="bottom">
                     <field name="name" required="1"/>
                     <field name="type" readonly="1" string="任务类型"/>
-                    <field name="route_type" string="类型"/>
+                    <field name="route_type" string="类型" required="1"/>
                     <field name="start_site_id" required="1" options="{'no_create': True}" string="起点接驳站"/>
                     <field name="end_site_id" required="1" options="{'no_create': True}" string="终点接驳站"/>
                     <field name="destination_production_line_id" required="1" options="{'no_create': True}"/>
diff --git a/sf_manufacturing/views/mrp_workorder_view.xml b/sf_manufacturing/views/mrp_workorder_view.xml
index 30801086..36739742 100644
--- a/sf_manufacturing/views/mrp_workorder_view.xml
+++ b/sf_manufacturing/views/mrp_workorder_view.xml
@@ -668,14 +668,18 @@
         <field name="name">空料架配送</field>
         <field name="model">sf.workpiece.delivery</field>
         <field name="arch" type="xml">
-            <tree string="工件配送" class="center" create="0" edit="0" delete="0">
+            <tree string="工件配送" editable="bottom" class="center" delete="0">
                 <header>
                     <button name="button_delivery" type="object" string="配送" class="oe_highlight"/>
                 </header>
-                <field name="name" string="路线名称" readonly="1"/>
-                <field name="route_id" options="{'no_create': True}"/>
-                <field name="feeder_station_start_id" readonly="1"/>
-                <field name="feeder_station_destination_id" readonly="1"/>
+                <field name="name" string="路线名称" attrs="{'readonly': [('id', '!=', False)]}"
+                       placeholder="例如:运送空料架路线:G01-A01" required="1" force_save="1"/>
+                <field name="route_id" options="{'no_create': True}" required="1"
+                       attrs="{'readonly': [('id', '!=', False)]}" domain="[('route_type', '=', '运送空料架')]"
+                       force_save="1"/>
+                <field name="feeder_station_start_id" readonly="1" force_save="1"/>
+<!--                <field name="type" readonly="1"/>-->
+                <field name="feeder_station_destination_id" readonly="1" force_save="1"/>
                 <button name="action_delivery_history" type="object" class="btn btn-link text-info" icon="fa-history"
                         string="历史"/>
             </tree>
diff --git a/sf_sale/models/quick_easy_order_old.py b/sf_sale/models/quick_easy_order_old.py
index dc4c588f..f26b6f4a 100644
--- a/sf_sale/models/quick_easy_order_old.py
+++ b/sf_sale/models/quick_easy_order_old.py
@@ -6,8 +6,8 @@ import os
 from datetime import datetime
 from stl import mesh
 # from OCC.Core.GProp import GProp_GProps
-from OCC.Extend.DataExchange import read_step_file
-from OCC.Extend.DataExchange import write_stl_file
+# from OCC.Extend.DataExchange import read_step_file
+# from OCC.Extend.DataExchange import write_stl_file
 from odoo.addons.sf_base.commons.common import Common
 from odoo import models, fields, api
 from odoo.modules import get_resource_path