Accept Merge Request #1339: (feature/update_production_line -> 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/1339

sf_stock/models/stock_picking.py

@@ -74,6 +74,8 @@ class StockPicking(models.Model):
 
     def send_to_bfm(self):
         skip_backorder = self.env.context.get('skip_backorder')
+        cancel_backorder_ids = self.env.context.get('picking_ids_not_to_backorder')
+
         # 下发发货到bfm
         config = self.env['res.config.settings'].get_values()
         move_ids, move_line_ids = self.deal_move_ids(self.move_ids, self.move_line_ids)
@@ -92,13 +94,13 @@ class StockPicking(models.Model):
                 'state': self.state,
                 'backorder_id': self.deal_send_backorder_id(self.backorder_id),
                 'backorder_ids': self.deal_send_backorder_id(self.backorder_ids),
-                'cancel_backorder_ids': skip_backorder,
+                'cancel_backorder_ids': True if skip_backorder and cancel_backorder_ids else False,  # 没有欠单判断
                 'move_type': self.move_type,
             },
         }
         url1 = config['bfm_url_new'] + '/api/stock/deliver_goods'
         json_str = json.dumps(data)
-        print('json_str', json_str)
+        logging.info('json_str= %s', json_str)
         r = requests.post(url1, json=data, data=None)
         if r.status_code == 200:
             result = json.loads(r.json()['result'])