From 2dc98667358cd833036527caebdf66c9eab70138 Mon Sep 17 00:00:00 2001 From: "jinling.yang" Date: Fri, 17 May 2024 16:26:15 +0800 Subject: [PATCH 1/3] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E8=A1=A8=E9=9D=A2?= =?UTF-8?q?=E5=B7=A5=E8=89=BA=E5=B7=A5=E5=8D=95=E5=AE=8C=E6=88=90=E6=8A=A5?= =?UTF-8?q?=E9=94=992.=E5=A4=96=E5=8D=8F=E4=BD=8D=E7=BD=AE=E6=94=B9?= =?UTF-8?q?=E4=B8=BA=E4=BE=9B=E5=BA=94=E5=95=86=E4=BD=8D=E7=BD=AE3.?= =?UTF-8?q?=E9=87=87=E8=B4=AD=E6=80=BB=E7=9B=91=E6=B7=BB=E5=8A=A0=E5=88=9B?= =?UTF-8?q?=E5=BB=BA=E5=88=B6=E9=80=A0=E8=AE=A2=E5=8D=95=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_manufacturing/data/stock_data.xml | 42 +++++++++++------------ sf_manufacturing/models/mrp_workorder.py | 7 ++-- sf_warehouse/security/ir.model.access.csv | 2 +- 3 files changed, 26 insertions(+), 25 deletions(-) diff --git a/sf_manufacturing/data/stock_data.xml b/sf_manufacturing/data/stock_data.xml index 3558e892..447e4220 100644 --- a/sf_manufacturing/data/stock_data.xml +++ b/sf_manufacturing/data/stock_data.xml @@ -29,7 +29,7 @@ 外协 - internal + supplier VL-OC true @@ -74,25 +74,25 @@ True 11 - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + diff --git a/sf_manufacturing/models/mrp_workorder.py b/sf_manufacturing/models/mrp_workorder.py index 40c35833..364207d5 100644 --- a/sf_manufacturing/models/mrp_workorder.py +++ b/sf_manufacturing/models/mrp_workorder.py @@ -911,9 +911,10 @@ class ResMrpWorkOrder(models.Model): }) tem_date_planned_finished = record.date_planned_finished super().button_finish() - record.write({ - 'date_planned_finished': tem_date_planned_finished # 保持原值 - }) + if record.routing_type != '表面工艺': + record.write({ + 'date_planned_finished': tem_date_planned_finished # 保持原值 + }) is_production_id = True for workorder in record.production_id.workorder_ids: if workorder.state != 'done': diff --git a/sf_warehouse/security/ir.model.access.csv b/sf_warehouse/security/ir.model.access.csv index 4940d040..394eeddf 100644 --- a/sf_warehouse/security/ir.model.access.csv +++ b/sf_warehouse/security/ir.model.access.csv @@ -112,7 +112,7 @@ access_stock_inventory_warning,stock.inventory.warning,stock.model_stock_invento access_stock_inventory_adjustment_name,stock.inventory.adjustment.name,stock.model_stock_inventory_adjustment_name,sf_base.group_plan_dispatch,1,0,0,0 access_mrp_production_group_purchase,mrp_production_group_purchase,mrp.model_mrp_production,sf_base.group_purchase,1,0,0,0 -access_mrp_production_group_purchase_director,mrp_production_group_purchase_director,mrp.model_mrp_production,sf_base.group_purchase_director,1,0,0,0 +access_mrp_production_group_purchase_director,mrp_production_group_purchase_director,mrp.model_mrp_production,sf_base.group_purchase_director,1,0,1,0 access_mrp_workorder_group_purchase,mrp_workorder_group_purchase,mrp.model_mrp_workorder,sf_base.group_purchase,1,0,0,0 access_mrp_workorder_group_purchase_director,mrp_workorder_group_purchase_director,mrp.model_mrp_workorder,sf_base.group_purchase_director,1,0,0,0 access_mrp_unbuild_group_purchase,mrp_unbuild_group_purchase,mrp.model_mrp_unbuild,sf_base.group_purchase,1,0,0,0 From 70bc2ed7180e41b9734cd7bf7d46288aa49ba684 Mon Sep 17 00:00:00 2001 From: "jinling.yang" Date: Sat, 18 May 2024 10:21:09 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=A1=A8=E9=9D=A2?= =?UTF-8?q?=E5=B7=A5=E8=89=BA=E5=A4=96=E5=8D=8F=E4=BD=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_manufacturing/models/mrp_workorder.py | 1 + sf_manufacturing/models/stock.py | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/sf_manufacturing/models/mrp_workorder.py b/sf_manufacturing/models/mrp_workorder.py index 364207d5..02b64bc6 100644 --- a/sf_manufacturing/models/mrp_workorder.py +++ b/sf_manufacturing/models/mrp_workorder.py @@ -911,6 +911,7 @@ class ResMrpWorkOrder(models.Model): }) tem_date_planned_finished = record.date_planned_finished super().button_finish() + # 表面工艺工单完成不走该修改 if record.routing_type != '表面工艺': record.write({ 'date_planned_finished': tem_date_planned_finished # 保持原值 diff --git a/sf_manufacturing/models/stock.py b/sf_manufacturing/models/stock.py index 39c0f4bf..f6198f02 100644 --- a/sf_manufacturing/models/stock.py +++ b/sf_manufacturing/models/stock.py @@ -552,8 +552,8 @@ class StockPicking(models.Model): [('workorder_id', '=', sorted_workorders.id), ('production_id', '=', item.id)]) if not outcontract_stock_move: new_picking = True - location_id = self.env.ref( - 'sf_manufacturing.stock_location_locations_virtual_outcontract').id, + location_id = self.env['stock.location'].search( + [('barcode', 'ilike', 'VL-SPOC')]).id, location_dest_id = self.env['stock.location'].search( [('barcode', 'ilike', 'WH-PREPRODUCTION')]).id, outcontract_picking_type_in = self.env.ref( From a935112134082fc3a46c62007c7aa157b2c2ded1 Mon Sep 17 00:00:00 2001 From: "jinling.yang" Date: Sat, 18 May 2024 10:24:31 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=A4=96=E5=8D=8F=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E8=BF=98=E5=8E=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_manufacturing/data/stock_data.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sf_manufacturing/data/stock_data.xml b/sf_manufacturing/data/stock_data.xml index 447e4220..07d59708 100644 --- a/sf_manufacturing/data/stock_data.xml +++ b/sf_manufacturing/data/stock_data.xml @@ -29,7 +29,7 @@ 外协 - supplier + internal VL-OC true