Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化制造订单和编程

# Conflicts: # sf_manufacturing/models/mrp_workorder.py
2024-05-11 00:20:08 +08:00
parent 2bffc5964a 7d7096a36c
commit ec01b89242
6 changed files with 28 additions and 6 deletions
--- a/sf_manufacturing/controllers/controllers.py
+++ b/sf_manufacturing/controllers/controllers.py
@@ -214,8 +214,8 @@ class Manufacturing_Connect(http.Controller):
                res = {'Succeed': False, 'ErrorCode': 202, 'Error': '该工单未开始'}
                return json.JSONEncoder().encode(res)
            workorder.button_finish()
-            workorder.process_state = '待解除装夹'
-            workorder.sudo().production_id.process_state = '待解除装夹'
+            # workorder.process_state = '待解除装夹'
+            # workorder.sudo().production_id.process_state = '待解除装夹'

            # 根据工单的实际结束时间修改排程单的结束时间、状态，同时修改销售订单的状态
            if workorder.date_finished: