解决冲突

This commit is contained in:
胡尧
2024-11-11 16:32:54 +08:00
33 changed files with 392 additions and 250 deletions

View File

@@ -90,7 +90,7 @@
<group string="加工信息">
<field name="date_planned_start" placeholder="如果不选择计划开始时间,会取当前时间来做排程" required="1"/>
<field name="date_planned_finished" required="1"/>
<field name="date_planned_finished" required="0" invisible="1"/>
<field name="actual_process_time"/>
<field name="actual_start_time"/>
<field name="actual_end_time"/>