Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop

2024-10-17 11:01:57 +08:00
parent 78f486ad7c 1c713d3278
commit 93187d7f4a
2 changed files with 3584 additions and 0 deletions
--- a/sf_maintenance/i18n/zh_CN.po
+++ b/sf_maintenance/i18n/zh_CN.po
--- a/sf_tool_management/models/mrp_workorder.py
+++ b/sf_tool_management/models/mrp_workorder.py
@@ -194,6 +194,7 @@ class MrpProduction(models.Model):
            # 自动调用重新获取编程的方法
            logging.info('cnc用刀校验到无效刀自动调用重新编程方法：update_programming_state()')
            self[0].update_programming_state()
+            self[0].write({'is_rework': False})
            # 修改制造订单 编程状态变为“编程中” 制造订单状态为‘返工’
            self.write({'programming_state': '编程中', 'work_state': '编程中', 'state': 'rework'})
        if missing_tool_1: