Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造代码优化

sf_manufacturing/models/mrp_workorder.py

@@ -989,9 +989,9 @@ class SfWorkOrderBarcodes(models.Model):
         #     raise UserError('该托盘已绑定工件，请先解除绑定！！！')
         if workorder:
             if workorder.routing_type == '装夹预调':
-                if workorder.state in ['progress', 'done']:
-                    work_state = {'progress': '进行中', 'done': '已完工'}
-                    raise UserError('该工单%s，不能重新绑定托盘' % work_state.get(workorder.state))
+                if workorder.state in ['done']:
+                    work_state = {'done': '已完工'}
+                    raise UserError('装夹%s，请勿重复扫码' % work_state.get(workorder.state))
                 lots = self.env['stock.lot'].sudo().search([('rfid', '=', barcode)])
                 if lots:
                     for lot in lots: