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

sf_manufacturing/models/mrp_production.py

@@ -1652,6 +1652,9 @@ class MrpProduction(models.Model):
         for production in self:
             if production.state not in ['confirmed', 'pending_cam'] or production.programming_state != '已编程':
                 raise UserError('不可操作。所选制造订单必须同时满足如下条件：\n1、制造订单状态：待排程 或 待加工；\n2、制造订单编程状态：已编程。\n请检查！')
+            cloud_programming = production._cron_get_programming_state()
+            if cloud_programming['programming_state'] in ['待编程', '已编程', '编程中']:
+                raise UserError("当前编程单正在重新编程，请注意查看当前制造订单的“编程记录”确认进度!")
 
         return {
             'type': 'ir.actions.act_window',