From 0a1da794873d1acf0f22896df625f645ce60e383 Mon Sep 17 00:00:00 2001
From: yuxianghui <3437689193@qq.com>
Date: Tue, 26 Nov 2024 11:14:45 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E8=BF=94=E5=B7=A5=E5=90=91=E5=AF=BC?=
=?UTF-8?q?=E6=A8=A1=E5=9E=8B=E6=B7=BB=E5=8A=A0=E6=96=B0=E7=9A=84=E5=B7=A5?=
=?UTF-8?q?=E5=8D=95=E5=AD=97=E6=AE=B5=EF=BC=9B2=E3=80=81=E5=B7=A5?=
=?UTF-8?q?=E5=8D=95tree=E8=A7=86=E5=9B=BE=E6=B7=BB=E5=8A=A0=E9=87=8D?=
=?UTF-8?q?=E6=96=B0=E5=8A=A0=E5=B7=A5=E5=88=86=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
sf_machine_connect/views/WorkCenterBarcodes.xml | 1 +
sf_manufacturing/models/mrp_workorder.py | 11 +++++++++--
sf_manufacturing/views/mrp_workorder_view.xml | 1 +
sf_manufacturing/wizard/rework_wizard.py | 2 ++
sf_manufacturing/wizard/rework_wizard_views.xml | 1 +
5 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/sf_machine_connect/views/WorkCenterBarcodes.xml b/sf_machine_connect/views/WorkCenterBarcodes.xml
index 90058b59..a1a5a5ea 100644
--- a/sf_machine_connect/views/WorkCenterBarcodes.xml
+++ b/sf_machine_connect/views/WorkCenterBarcodes.xml
@@ -12,6 +12,7 @@
+
diff --git a/sf_manufacturing/models/mrp_workorder.py b/sf_manufacturing/models/mrp_workorder.py
index 2bc90f1d..1e006f3c 100644
--- a/sf_manufacturing/models/mrp_workorder.py
+++ b/sf_manufacturing/models/mrp_workorder.py
@@ -141,8 +141,8 @@ class ResMrpWorkOrder(models.Model):
# 是否绑定托盘
is_trayed = fields.Boolean(string='是否绑定托盘', default=False)
-
tag_type = fields.Selection([("重新加工", "重新加工")], string="标签", tracking=True)
+
technology_design_id = fields.Many2one('sf.technology.design')
def _compute_default_construction_period_status(self):
@@ -281,7 +281,7 @@ class ResMrpWorkOrder(models.Model):
# if technology_design.is_auto is False:
# domain = [('origin', '=', order.production_id.name)]
# else:
- domain = [('purchase_type', '=', 'consignment'),('origin', '=', ','.join(production_list))]
+ domain = [('purchase_type', '=', 'consignment'), ('origin', '=', ','.join(production_list))]
purchase = self.env['purchase.order'].search(domain)
if not purchase:
order.surface_technics_purchase_count = 0
@@ -1075,6 +1075,13 @@ class ResMrpWorkOrder(models.Model):
if workorder.state != 'pending':
workorder.state = 'pending'
continue
+ # ================= 如果制造订单制造类型为【人工线下加工】==========================
+ if (workorder.production_id.production_type == '人工线下加工'
+ and workorder.production_id.schedule_state == '已排'
+ and len(workorder.production_id.picking_ids.filtered(
+ lambda w: w.state not in ['done', 'cancel'])) == 0):
+ workorder.state = 'ready'
+ continue
# ================= 如果制造订单刀具状态为[无效刀、缺刀] 或者 制造订单状态为[返工]==========================
if (workorder.production_id.tool_state in ['1', '2'] or workorder.production_id.state == 'rework'
or workorder.production_id.schedule_state != '已排'
diff --git a/sf_manufacturing/views/mrp_workorder_view.xml b/sf_manufacturing/views/mrp_workorder_view.xml
index 1faec0ac..4c856a41 100644
--- a/sf_manufacturing/views/mrp_workorder_view.xml
+++ b/sf_manufacturing/views/mrp_workorder_view.xml
@@ -32,6 +32,7 @@
+
+