Accept Merge Request #1717: (feature/报废优化 -> develop)

Merge Request: 报废解绑rfid

Created By: @管欢
Reviewed By: @胡尧
Approved By: @胡尧 
Accepted By: @管欢
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1717

sf_manufacturing/models/stock.py

@@ -1031,12 +1031,7 @@ class ReStockMove(models.Model):
         """
         res = super(ReStockMove, self)._get_new_picking_values()
         ## 制造订单报废生成的新制造订单不走合并
-        production_remanufacture = None
-        if 'origin' in res:
-            if self.picking_type_id.name in ['生产发料', '内部调拨']:
-                production_remanufacture = self.env['mrp.production'].search(
-                    [('name', '=', res['origin']), ('is_remanufacture', '=', True)])
-        if not production_remanufacture:
+        if not self.env.context.get('is_remanufacture_flag'):
             if self[0].origin and self.picking_type_id.name in ['生产发料', '内部调拨']:
                 production = self.env['mrp.production'].search([('name', '=', self[0].origin)], limit=1, order='id asc')
                 productions = self.env['mrp.production'].search(