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

Merge branch 'refs/heads/develop' into feature/物料需求计划管理

Browse Source 
# Conflicts:
#	sf_demand_plan/models/sf_production_demand_plan.py
#	sf_demand_plan/views/demand_plan.xml
This commit is contained in:
guanhuan
2025-07-02 08:57:20 +08:00
parent b267f2351d 20df1c0365
commit 0350f78710
20 changed files with 379 additions and 362 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
sf_demand_plan/models/sf_production_demand_plan.py
View File

@@ -79,6 +79,7 @@ class SfProductionDemandPlan(models.Model):
model_long = fields.Char('尺寸(mm)', compute='_compute_model_long')
blank_type = fields.Selection([('圆料', '圆料'), ('方料', '方料')], string='坯料分类',
related='product_id.blank_type')
blank_precision = fields.Selection([('精坯', '精坯'), ('粗坯', '粗坯')], string='坯料类型', related='product_id.blank_precision')
embryo_long = fields.Char('坯料尺寸(mm)', related='demand_plan_id.embryo_long')
materials_id = fields.Char('材料', related='demand_plan_id.materials_id')
model_machining_precision = fields.Selection(selection=_get_machining_precision, string='精度',

7
sf_demand_plan/static/src/scss/style.css
View File

@@ -81,4 +81,9 @@
input,label {
cursor: pointer;
}
}
}
th[data-name=processing_time] + th::before{
content: '待执行单据';
line-height: 38px;
}

10
sf_demand_plan/views/demand_plan.xml
View File

@@ -4,14 +4,13 @@
<field name="model">sf.production.demand.plan</field>
<field name="arch" type="xml">
<tree string="需求计划" default_order="sequence desc,id desc" editable="bottom"
class="demand_plan_tree" create="false" delete="false">
class="demand_plan_tree freeze-columns-before-part_number" create="false" delete="false">
<header>
<button string="打印" name="button_action_print" type="object"
class="btn-primary"/>
</header>
<field name="sequence" widget="handle"/>
<field name="id" optional="hide"/>
<field name="priority"/>
<field name="status"/>
<field name="customer_name"/>
<field name="order_remark"/>
@@ -29,6 +28,7 @@
<field name="qty_to_deliver"/>
<field name="model_long"/>
<field name="blank_type" optional="hide"/>
<field name="blank_precision"/>
<field name="embryo_long"/>
<field name="materials_id"/>
<field name="model_machining_precision"/>
@@ -44,7 +44,10 @@
<field name="date_order"/>
<field name="contract_code"/>
<field name="plan_remark" attrs="{'readonly': [('status', 'in', ('60','100'))]}"/>
<field name="processing_time"/>
<field name="priority" decoration-danger="priority == '1'"
decoration-warning="priority == '2'"
decoration-info="priority == '3'"
decoration-success="priority == '4'"/>
<field name="material_check" optional="hide"/>
<!-- <field name="hide_action_open_mrp_production" invisible="1"/>-->
<!-- <field name="hide_action_purchase_orders" invisible="1"/>-->
@@ -63,6 +66,7 @@
<field name="planned_start_date" attrs="{'readonly': [('status', 'in', ('60','100'))]}"/>
<field name="actual_start_date"/>
<field name="actual_end_date"/>
<field name="processing_time"/>
<field name="create_date" optional="hide" string="创建时间"/>
<field name="create_uid" optional="hide" string="创建人"/>
<field name="write_date" string="更新时间"/>