优化

ccs_connect_tiktok/controllers/order_controller.py

@@ -428,7 +428,7 @@ class OrderController(http.Controller):
                                         if (
                                                 action_type == 'pickup' and package.tally_state == 'unprocessed_goods') or (
                                                 action_type == 'tally' and package.tally_state in (
-                                                'unprocessed_goods', 'checked_goods', 'picked_up')) or (
+                                                'unprocessed_goods', 'picked_up')) or (
                                                 action_type == 'handover' and package.tally_state in (
                                                 'unprocessed_goods', 'checked_goods', 'picked_up')):
                                             ship_packages.append({
@@ -1016,14 +1016,9 @@ class OrderController(http.Controller):
                                 package_obj.update_exception_info(
                                     exception_cause_ids)  # 修改异常信息
                             tally_time = package_item.get('tally_time')
-                            if (action_type == 'pickup' and package_item.get('tally_state') == 'picked_up') or (action_type == 'tally' and package_item.get('tally_state') == 'checked_goods') or (
-                                    action_type == 'handover' and package_item.get(
-                                'tally_state') == 'handover_completed'):
+                            if action_type == 'tally' and package_item.get('tally_state') == 'checked_goods':
                                 for package in package_obj:
-                                    if (
-                                            action_type == 'pickup' and package.tally_state == 'unprocessed_goods') or (action_type == 'tally' and package.tally_state == 'unprocessed_goods') or (
-                                            action_type == 'handover' and package.tally_state in (
-                                            'unprocessed_goods', 'checked_goods')):
+                                    if action_type == 'tally' and package.tally_state in ('picked_up','unprocessed_goods') :
                                         ship_packages.append({
                                             'id': package.ship_package_ids.ids,
                                             'bl_id': package.bl_id.id,