jikimo/test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

需求计划对应产品的调拨单显示不正确

Browse Source
This commit is contained in:
guanhuan
2025-06-12 10:53:46 +08:00
parent 154a17657c
commit 5a071188cc
3 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sf_demand_plan/__manifest__.py
View File

@@ -10,7 +10,7 @@
""",
'category': 'sf',
'website': 'https://www.sf.jikimo.com',
'depends': ['sf_plan', 'jikimo_printing'],
'depends': ['sf_plan'],
'data': [
'security/ir.model.access.csv',
'views/demand_plan.xml',

16
sf_demand_plan/models/sf_production_demand_plan.py
View File

@@ -91,7 +91,7 @@ class SfProductionDemandPlan(models.Model):
route_id = fields.Many2one('stock.route', string='路线', related='sale_order_line_id.route_id', store=True)
contract_date = fields.Date('合同日期', related='sale_order_id.contract_date')
date_order = fields.Datetime('下单日期', related='sale_order_id.date_order')
contract_code = fields.Char('合同号', related='sale_order_id.contract_code')
contract_code = fields.Char('合同号', related='sale_order_id.contract_code', store=True)
plan_remark = fields.Text("计划备注")
material_check = fields.Selection([
('0', "未齐套"),
@@ -160,10 +160,12 @@ class SfProductionDemandPlan(models.Model):
if pending_productions:
record.status = '50' # 待下达生产
# 检查所有制造订单的排程单状态
if record.sale_order_id.mrp_production_ids and all(
order.product_id == record.product_id and order.schedule_state != '未排' for order in
record.sale_order_id.mrp_production_ids):
record.status = '60' # 已下达
if record.sale_order_id.mrp_production_ids:
product_productions = record.sale_order_id.mrp_production_ids.filtered(
lambda p: p.product_id.id == record.product_id.id
)
if product_productions and all(order.schedule_state != '未排' for order in product_productions):
record.status = '60' # 已下达
if sale_order_state == 'cancel' or not record.sale_order_line_id:
record.status = '100' # 取消
@@ -458,7 +460,9 @@ class SfProductionDemandPlan(models.Model):
record.hide_action_stock_picking = False
record.hide_action_outsourcing_stock_picking = False
if record.supply_method in ('automation', 'manual'):
manufacturing_orders = record.sale_order_id.mrp_production_ids
manufacturing_orders = record.sale_order_id.mrp_production_ids.filtered(
lambda p: p.product_id.id == record.product_id.id
)
record.hide_action_stock_picking = bool(manufacturing_orders.mapped('picking_ids').filtered(
lambda p: p.state == 'assigned'))
elif record.supply_method in ('purchase', 'outsourcing'):

3
sf_demand_plan/views/demand_plan.xml
View File

@@ -85,6 +85,7 @@
<field name="materials_id"/>
<field name="model_process_parameters_ids"/>
<field name="plan_remark"/>
<field name="contract_code"/>
<group expand="0" string="Group By">
<filter name="group_by_priority" string="优先级" domain="[]" context="{'group_by': 'priority'}"/>
<filter name="group_by_status" string="状态" domain="[]" context="{'group_by': 'status'}"/>
@@ -97,6 +98,8 @@
context="{'group_by': 'deadline_of_delivery'}"/>
<filter name="group_by_materials_id" string="材料" domain="[]"
context="{'group_by': 'materials_id'}"/>
<filter name="group_by_contract_code" string="合同号" domain="[]"
context="{'group_by': 'contract_code'}"/>
</group>
</search>
</field>