Accept Merge Request #1165: (feature/修复返工向导 -> develop)

Merge Request: 修复返工向导

Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威 
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1165

sf_manufacturing/models/mrp_production.py

@@ -803,7 +803,7 @@ class MrpProduction(models.Model):
                 'default_production_id': self.id,
                 'default_reprogramming_num': cloud_programming['reprogramming_num'],
                 'default_programming_state': cloud_programming['programming_state'],
-                'default_is_reprogramming': False if cloud_programming['programming_state'] not in ['已下发'] else True
+                'default_is_reprogramming': True if cloud_programming['programming_state'] in ['已下发'] else False
             }
         }
 

sf_manufacturing/models/mrp_workorder.py

@@ -13,7 +13,7 @@ from dateutil.relativedelta import relativedelta
 # import subprocess
 from odoo import api, fields, models, SUPERUSER_ID, _
 from odoo.addons.sf_base.commons.common import Common
-from odoo.exceptions import UserError,ValidationError
+from odoo.exceptions import UserError, ValidationError
 from odoo.addons.sf_mrs_connect.models.ftp_operate import FtpController
 
 
@@ -801,6 +801,13 @@ class ResMrpWorkOrder(models.Model):
                         'cancel']:
                         if re_work and workorder.production_id.is_rework is False:
                             workorder.state = 'ready'
+                    if workorder.routing_type == '表面工艺' and workorder.state not in ['done', 'progress']:
+                        unclamp_workorder = self.env['mrp.workorder'].search(
+                            [('production_id', '=', workorder.production_id.id),
+                             ('sequence', '=', workorder.sequence - 1),
+                             ('state', 'in', ['done'])])
+                        if unclamp_workorder:
+                            workorder.state = 'ready'
                     # else:
                     #     if workorder.state not in ['cancel', 'rework']:
                     #         workorder.state = 'rework'