增加日志

ccs_connect_tiktok/controllers/order_controller.py

@@ -626,8 +626,7 @@ class OrderController(http.Controller):
                 'zh': '系统解析错误，错误原因是%s' % e
             }
             logging.info('last_mile_delivery error:%s' % e)
-            res['message'] = exceptions_msg_dic[
-                pda_lang]  # _('System parsing error, the reason for the error is %s', e)  # 系统解析错误，错误原因是
+            res['message'] = exceptions_msg_dic[pda_lang]  # _('System parsing error, the reason for the error is %s', e)  # 系统解析错误，错误原因是
         logging.info('last_mile_delivery res:%s' % res)
         return res
 
@@ -641,7 +640,7 @@ class OrderController(http.Controller):
         res = {'state': 201, 'message': ''}
         try:
             logging.info('last_mile_delivery_time_check kwargs:%s' % kwargs)
-            all_bl_ids_in_request = kwargs['bl_ids']
+            all_bl_ids_in_request = kwargs.get('bl_ids', [])
             logging.info(f"all_bl_ids_in_request: {all_bl_ids_in_request}")
             if all_bl_ids_in_request:
                 bl_objs = request.env['cc.bl'].sudo().search([('id', 'in', all_bl_ids_in_request)])
@@ -672,7 +671,7 @@ class OrderController(http.Controller):
         res = {'state': 201, 'message': ''}
         try:
             logging.info('last_mile_tally_time_check kwargs:%s' % kwargs)
-            all_bl_ids_in_request = kwargs['bl_ids']
+            all_bl_ids_in_request = kwargs.get('bl_ids', [])
             logging.info(f"all_bl_ids_in_request: {all_bl_ids_in_request}")
             if all_bl_ids_in_request:
                 bl_objs = request.env['cc.bl'].sudo().search([('id', 'in', all_bl_ids_in_request)])
@@ -769,7 +768,7 @@ class OrderController(http.Controller):
             current_time = request.env['common.common'].sudo().get_utc_time(datetime.now())
             operation_time = latest_pickup_record.operation_time
             time_diff = (datetime.strptime(current_time, '%Y-%m-%d %H:%M:%S') - operation_time).total_seconds() / 60
-            logging.info(f"current_time: {current_time}, pickup_time: {operation_time}, time_diff: {time_diff}")
+            logging.info(f"tally_time_check current_time: {current_time}, pickup_time: {operation_time}, time_diff: {time_diff}")
 
             # 如果时间差小于等于配置的参数，则存在风险
             if time_diff <= allowed_minutes:
@@ -830,15 +829,16 @@ class OrderController(http.Controller):
         if pickup_records:
             # 有提货记录，先提货再理货，使用提货记录，间隔时间 = 交货间隔时间 + 理货间隔时间
             latest_record = pickup_records[0]
-            allowed_minutes = tally_interval_time
+            allowed_minutes = tally_interval_time + delivery_time
         if tally_records:
-            # 没有提货记录，按理货记录，使用理货记录，间隔时间 = 交货间隔时间
+            # 有理货记录，按理货记录，使用理货记录，间隔时间 = 交货间隔时间
             latest_record = tally_records[0]
-            allowed_minutes += delivery_time
+            allowed_minutes = delivery_time
         if latest_record:
             current_time = request.env['common.common'].sudo().get_utc_time(datetime.now())
             operation_time = latest_record.operation_time
             time_diff = (datetime.strptime(current_time, '%Y-%m-%d %H:%M:%S') - operation_time).total_seconds() / 60
+            logging.info(f"delivery_time_check current_time: {current_time}, operation_time: {operation_time}, time_diff: {time_diff}")
             # 如果时间差小于等于配置的参数，则存在风险
             if time_diff <= allowed_minutes:
                 if pallet_name: