Merge branch 'release/优化pda提单理货'

ccs_connect_tiktok/controllers/order_controller.py

@@ -193,6 +193,7 @@ class OrderController(http.Controller):
                                     if package_type == 'ship':
                                         ship_packages.append({
                                             'id': [package_obj.id],
+                                            'bl_id': package_obj.bl_id.id,
                                             'tally_time': tally_time})
                                     else:
                                         for package in package_obj:
@@ -202,6 +203,7 @@ class OrderController(http.Controller):
                                                     'unprocessed_goods', 'checked_goods')):
                                                 ship_packages.append({
                                                     'id': package.ship_package_ids.ids,
+                                                    'bl_id': package.bl_id.id,
                                                     'tally_time': tally_time
                                                 })  # 小包
                                         package_obj.update_big_package_info(action_type=action_type,
@@ -426,7 +428,8 @@ class OrderController(http.Controller):
                         bl_ids = [ship_package.get('bl_id') for ship_package in ship_packages]
                         logging.info('bl_ids:%s' % bl_ids)
                         redis_conn.lpush('mail_push_package_list', json.dumps(
-                            {'ids': list(set(bl_ids)), 'ship_packages': str(ship_packages), 'action_type': action_type}))
+                            {'ids': list(set(bl_ids)), 'ship_packages': str(ship_packages),
+                             'action_type': action_type}))
 
             else:
                 null_msg_dic = {