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

更新编程记录相关

Browse Source
This commit is contained in:
mgw
2025-01-13 11:11:09 +08:00
parent 9dfe9ba572
commit 6b6f091da8
3 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sf_manufacturing/wizard/sf_programming_reason.py
View File

@@ -35,7 +35,7 @@ class sf_programming_reason(models.TransientModel):
'current_programming_count': cloud_programming['reprogramming_num'], 'current_programming_count': cloud_programming['reprogramming_num'],
'target_production_id': cloud_programming['production_order_no'], 'target_production_id': cloud_programming['production_order_no'],
'apply_time': self._context.get('default_apply_time'), 'apply_time': self._context.get('default_apply_time'),
'send_time': cloud_programming['send_time'], 'send_time': False,
}) })
# 返回弹窗提示“已下达编程任务和消息，请等待编程单下发” # 返回弹窗提示“已下达编程任务和消息，请等待编程单下发”

7
sf_manufacturing/wizard/sf_programming_reason_views.xml
View File

@@ -25,10 +25,11 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<form> <form>
<p>已下达编程任务和消息，请等待编程单下发!</p> <p>已下达编程任务和消息，请等待编程单下发!</p>
<footer>
<button string="关闭" special="cancel" class="btn-secondary"/>
</footer>
</form> </form>
<footer>
<button string="关闭" special="cancel" class="btn-secondary"/>
</footer>
</field> </field>
</record> </record>
<!-- 重新编程原因弹窗 --> <!-- 重新编程原因弹窗 -->

7
sf_mrs_connect/controllers/controllers.py
View File

@@ -100,6 +100,9 @@ class Sf_Mrs_Connect(http.Controller, MultiInheritController):
# 更新编程记录 # 更新编程记录
for production in productions: for production in productions:
record_ids_obj = production.programming_record_ids.filtered(lambda r: r.current_programming_count == ret['reprogramming_num'])
if record_ids_obj:
record_ids_obj.write({'send_time': ret['send_time']})
if ret['reprogramming_num'] == 0: if ret['reprogramming_num'] == 0:
production.programming_record_ids.create({ production.programming_record_ids.create({
'number': 1, 'number': 1,
@@ -108,7 +111,7 @@ class Sf_Mrs_Connect(http.Controller, MultiInheritController):
'programming_method': ret['programme_way'], 'programming_method': ret['programme_way'],
'current_programming_count': ret['reprogramming_num'], 'current_programming_count': ret['reprogramming_num'],
'target_production_id': ret['production_order_no'], 'target_production_id': ret['production_order_no'],
'apply_time': '', 'apply_time': False,
'send_time': ret['send_time'], 'send_time': ret['send_time'],
}) })
if ret['reset_flag']: if ret['reset_flag']:
@@ -119,7 +122,7 @@ class Sf_Mrs_Connect(http.Controller, MultiInheritController):
'programming_method': ret['programme_way'], 'programming_method': ret['programme_way'],
'current_programming_count': ret['reprogramming_num'], 'current_programming_count': ret['reprogramming_num'],
'target_production_id': ret['production_order_no'], 'target_production_id': ret['production_order_no'],
'apply_time': '', 'apply_time': False,
'send_time': ret['send_time'], 'send_time': ret['send_time'],
}) })