Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造代码优化

This commit is contained in:
mgw
2024-04-24 14:24:59 +08:00
4 changed files with 35 additions and 54 deletions

View File

@@ -429,7 +429,7 @@
<field name="workpiece_delivery_ids">
<tree editable="bottom">
<field name="production_id" invisible="1"/>
<field name="workpiece_code"/>
<field name="sametransport_production_ids" widget="many2many_tags"/>
<field name="route_id" options="{'no_create': True}"/>
<field name="feeder_station_start_id" readonly="1" force_save="1"/>
<field name="feeder_station_destination_id" readonly="1" force_save="1"/>
@@ -584,7 +584,8 @@
decoration-warning="status == '待下发'"
decoration-danger="status == '待配送'"/>
<field name="production_id" string="工件编码"/>
<field name="workpiece_code"/>
<field name="sametransport_production_ids" widget="many2many_tags"/>
<field name="type" />
<field name="production_line_id" options="{'no_create': True}"/>
<field name="route_id" options="{'no_create': True}"/>
<field name="feeder_station_start_id" readonly="1" force_save="1"/>
@@ -603,7 +604,7 @@
<field name="arch" type="xml">
<search string="工件配送">
<field name="production_id"/>
<field name="workpiece_code"/>
<field name="sametransport_production_ids" widget="many2many_tags"/>
<field name="feeder_station_start_id"/>
<field name="production_line_id"/>
<field name="task_delivery_time"/>