From f251878637d94cacfd2775d1ba786b7aeab83f45 Mon Sep 17 00:00:00 2001
From: "jinling.yang" <jinling.yang@jikimo.com>
Date: Thu, 29 Aug 2024 19:53:37 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=B7=A5=E5=8D=95?=
 =?UTF-8?q?=E5=B7=A5=E5=BA=8F,=E4=BC=98=E5=8C=96=E8=A1=A8=E9=9D=A2?=
 =?UTF-8?q?=E5=B7=A5=E8=89=BA=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_base/models/common.py                  | 1 +
 sf_base/views/common_view.xml             | 2 +-
 sf_manufacturing/models/mrp_production.py | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/sf_base/models/common.py b/sf_base/models/common.py
index c2858b95..95572631 100644
--- a/sf_base/models/common.py
+++ b/sf_base/models/common.py
@@ -84,6 +84,7 @@ class MrsProductionProcessCategory(models.Model):
 class MrsProductionProcess(models.Model):
     _name = 'sf.production.process'
     _description = '表面工艺'
+    order = 'sequence asc'
 
     code = fields.Char("编码")
     name = fields.Char('名称')
diff --git a/sf_base/views/common_view.xml b/sf_base/views/common_view.xml
index 334eaa32..c529354f 100644
--- a/sf_base/views/common_view.xml
+++ b/sf_base/views/common_view.xml
@@ -165,7 +165,7 @@
             <field name="model">sf.production.process</field>
             <field name="arch" type="xml">
                 <tree string="表面工艺" create="0" edit="0" delete="0">
-                    <field name="sequence" widget="handle" string="序号"  readonly="1"/>
+                    <field name="sequence"  string="加工顺序"  readonly="1"/>
                     <field name="code"/>
                     <field name="name" string="名称"/>
                     <field name="remark"/>
diff --git a/sf_manufacturing/models/mrp_production.py b/sf_manufacturing/models/mrp_production.py
index 8e6fe9b7..5095556d 100644
--- a/sf_manufacturing/models/mrp_production.py
+++ b/sf_manufacturing/models/mrp_production.py
@@ -673,7 +673,7 @@ class MrpProduction(models.Model):
                                 for surface_tmpl_id in surface_tmpl_ids:
                                     if process_id == surface_tmpl_id.route_workcenter_id.surface_technics_id:
                                         surface_tmpl_name = surface_tmpl_id.route_workcenter_id.name
-                                        process_dict.update({int(process_id.code): '%s-%s' % (
+                                        process_dict.update({int(process_id.sequence): '%s-%s' % (
                                             surface_tmpl_name, process_parameters_id.name)})
                         process_list = sorted(process_dict.keys())
                         for process_num in process_list:

From 5121e455d2293925ab47d7e0742d5bf58abec6a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=83=A1=E5=B0=A7?= <huyao@jikimo.com>
Date: Thu, 29 Aug 2024 20:20:39 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9agv=E7=9B=B8=E5=85=B3?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=AF=B7=E6=B1=82=E6=8E=88=E6=9D=83=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_manufacturing/controllers/controllers.py | 6 +++---
 sf_manufacturing/controllers/workpiece.py   | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/sf_manufacturing/controllers/controllers.py b/sf_manufacturing/controllers/controllers.py
index 23be7d38..632e9e4c 100644
--- a/sf_manufacturing/controllers/controllers.py
+++ b/sf_manufacturing/controllers/controllers.py
@@ -477,7 +477,7 @@ class Manufacturing_Connect(http.Controller):
             logging.info('LocationChange error:%s' % e)
         return json.JSONEncoder().encode(res)
 
-    @http.route('/AutoDeviceApi/AGVToProduct', type='json', auth='none', methods=['GET', 'POST'], csrf=False,
+    @http.route('/AutoDeviceApi/AGVToProduct', type='json', auth='sf_token', methods=['GET', 'POST'], csrf=False,
                 cors="*")
     def AGVToProduct(self, **kw):
         """
@@ -549,7 +549,7 @@ class Manufacturing_Connect(http.Controller):
             logging.info('AGVToProduct error:%s' % e)
         return json.JSONEncoder().encode(res)
 
-    @http.route('/AutoDeviceApi/AGVDownProduct', type='json', auth='none', methods=['GET', 'POST'], csrf=False,
+    @http.route('/AutoDeviceApi/AGVDownProduct', type='json', auth='sf_token', methods=['GET', 'POST'], csrf=False,
                 cors="*")
     def AGVDownProduct(self, **kw):
         """
@@ -668,7 +668,7 @@ class Manufacturing_Connect(http.Controller):
             logging.info('AGVDownProduct error:%s' % e)
         return json.JSONEncoder().encode(res)
 
-    @http.route('/AutoDeviceApi/AgvStationState', type='json', auth='none', methods=['GET', 'POST'], csrf=False,
+    @http.route('/AutoDeviceApi/AgvStationState', type='json', auth='sf_token', methods=['GET', 'POST'], csrf=False,
                 cors="*")
     def AGVStationState(self, **kw):
         """
diff --git a/sf_manufacturing/controllers/workpiece.py b/sf_manufacturing/controllers/workpiece.py
index 5d79a1b3..370c71a0 100644
--- a/sf_manufacturing/controllers/workpiece.py
+++ b/sf_manufacturing/controllers/workpiece.py
@@ -8,7 +8,7 @@ from odoo.http import request
 
 class Workpiece(http.Controller):
 
-    @http.route('/agvApi/backfeed', type='json', auth='none', methods=['GET', 'POST'], csrf=False,
+    @http.route('/agvApi/backfeed', type='json', auth='sf_token', methods=['GET', 'POST'], csrf=False,
                 cors="*")
     def backfeed(self, **kw):
         """