From 69e8bf67d1331b753e5ba4f2f9d4d0575eaad63c Mon Sep 17 00:00:00 2001
From: liaodanlong <liaodanlong@jikimo.com>
Date: Mon, 21 Apr 2025 10:04:59 +0800
Subject: [PATCH 1/2] =?UTF-8?q?sf-=E5=88=B6=E9=80=A0-=E8=A1=A8=E9=9D=A2?=
 =?UTF-8?q?=E5=B7=A5=E8=89=BA=E5=8F=AF=E9=80=89=E5=8F=82=E6=95=B0-?=
 =?UTF-8?q?=E4=BB=8Ecloud=E5=90=8C=E6=AD=A5=E8=BF=87=E6=9D=A5=E7=9A=84?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=EF=BC=8C=E8=8E=B7=E5=8F=96=E6=96=B9=E5=BC=8F?=
 =?UTF-8?q?=E6=96=B9=E5=BC=8F=3D=E5=A4=96=E5=8D=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_dlm_management/models/sf_production_common.py | 6 +++---
 sf_mrs_connect/models/sync_common.py             | 4 +++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/sf_dlm_management/models/sf_production_common.py b/sf_dlm_management/models/sf_production_common.py
index 0c937175..484295ae 100644
--- a/sf_dlm_management/models/sf_production_common.py
+++ b/sf_dlm_management/models/sf_production_common.py
@@ -13,10 +13,10 @@ class SfProductionProcessParameter(models.Model):
     def create(self, vals):
         # if vals.get('code', '/') == '/' or vals.get('code', '/') is False:
         #     vals['code'] = '101'+self.routing_id.code +self.env['ir.sequence'].next_by_code('sf.production.process.parameter')
-        if not vals.get('process_id') and vals.get('routing_id'):
-            vals['gain_way'] = '外协'
+        if  vals.get('routing_id'):
+            # vals['gain_way'] = '外协'
             routing_id = self.env['mrp.routing.workcenter'].browse(vals.get('routing_id'))
-            if routing_id.surface_technics_id:
+            if routing_id.surface_technics_id and not vals.get('process_id'):
                 vals['process_id'] = routing_id.surface_technics_id.id
             if vals.get('code', '/') == '/' or vals.get('code', '/') is False:
                 vals['code'] = '101' + routing_id.code + self.env['ir.sequence'].next_by_code(
diff --git a/sf_mrs_connect/models/sync_common.py b/sf_mrs_connect/models/sync_common.py
index b2b65e29..4202e200 100644
--- a/sf_mrs_connect/models/sync_common.py
+++ b/sf_mrs_connect/models/sync_common.py
@@ -1148,10 +1148,12 @@ class sfProductionProcessParameter(models.Model):
                             "process_id": process.id,
                             'materials_model_ids': self.env['sf.materials.model'].search(
                                 [('materials_no', 'in', item['materials_model_ids_codes'])]),
-                            'processing_mm': item['processing_mm']
+                            'processing_mm': item['processing_mm'],
+                            'gain_way':'外协',
                         })
                         production_process_parameter.create_service_product()
                     else:
+                        production_process_parameter.gain_way = '外协'
                         production_process_parameter.name = item['name']
                         production_process_parameter.process_description = item['process_description']
                         production_process_parameter.processing_day = item['processing_day']

From 77478fd173ee1d568546288766bf830a36e6091a Mon Sep 17 00:00:00 2001
From: liaodanlong <liaodanlong@jikimo.com>
Date: Mon, 21 Apr 2025 13:16:15 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=88=B6=E9=80=A0=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_manufacturing/views/mrp_production_addional_change.xml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/sf_manufacturing/views/mrp_production_addional_change.xml b/sf_manufacturing/views/mrp_production_addional_change.xml
index 9a9db4ac..7a8591c0 100644
--- a/sf_manufacturing/views/mrp_production_addional_change.xml
+++ b/sf_manufacturing/views/mrp_production_addional_change.xml
@@ -383,7 +383,7 @@
                                 <field name="process_parameters_id"
                                        attrs="{'readonly': [('id', '!=', False),('routing_tag', '=', 'standard')]}"
                                        string="参数" context="{'route_id':route_id,'production_id': production_id}"
-                                       options="{'no_create': True}"/>
+                                       options="{'no_create': True}" domain="[('routing_id', '=', 'route_id')]"/>
                                 <field name="panel" readonly="1"/>
                                 <field name="routing_tag" readonly="1" widget="badge"
                                        decoration-success="routing_tag == 'standard'"
@@ -459,7 +459,11 @@
                     <attribute name="decoration-warning">delivery_warning == 'warning'</attribute>
                     <attribute name="decoration-danger">delivery_warning == 'overdue'</attribute>
                 </xpath>
+<!--                <xpath expr="//field[@name='create_date']" position="before">-->
+<!--                        -->
+<!--                </xpath>-->
                 <xpath expr="//field[@name='state']" position="replace">
+                    <field name="create_date" invisible="True"/>
                     <field name="delivery_warning" invisible="True"/>
                     <field name="state" widget="badge" decoration-warning="state == 'progress'"
                            decoration-success="state == 'done'" decoration-danger="state in ('cancel','rework')"