优化提单状态同步日志的操作时间

ccs_connect_tiktok/models/cc_bill_loading.py

@@ -693,7 +693,6 @@ class CcBl(models.Model):
                         before_node_obj = node_obj[0].get_before_node()
                         # 理货或尾程交接之前没有生成的节点
                         for before_node in before_node_obj:
-                            print('before_node:%s' % before_node.name)
                             before_minutes = before_node.calculate_total_interval(node_obj[0])
                             # 准备批量更新数据
                             update_data = []
@@ -742,7 +741,6 @@ class CcBl(models.Model):
                         state_node_dict = {node.name: node for node in all_state_nodes}
                         next_minutes = int(self.env['ir.config_parameter'].sudo().get_param('next_minutes', default=20))
                         for index, node in enumerate(node_obj):
-                            print('node:%s' % node.name)
                             update_data = []
                             for package in all_ship_package_obj:
                                 if package.state.name in state_node_dict:
@@ -779,10 +777,6 @@ class CcBl(models.Model):
 
                                 self.env.cr.execute(sql)
                                 self._cr.commit()  # 提交事务
-                                # # 更新提单的未同步小包数量
-                                # sql = """UPDATE cc_bl AS bl SET unsync_package_count = ( SELECT COUNT(*) FROM cc_ship_package sp WHERE sp.bl_id = bl.id AND sp.is_sync = false) WHERE bl.id = %s """
-                                # self.env.cr.execute(sql, (item.id,))
-                                # self._cr.commit()  # 提交事务
                                 self.try_callback_track(max_retries=2, ship_package_ids=ship_package_ids)
                     return True
 

ccs_connect_tiktok/models/cc_node.py

@@ -72,7 +72,7 @@ class CCNode(models.Model):
         """
         total_interval = 0
         predecessor_nodes = self.env['cc.node'].search(
-            [('node_type', '=', 'package'), ('is_must', '=', True), ('seq', '<=', next_node.seq),
+            [('node_type', '=', next_node.node_type), ('is_must', '=', True), ('seq', '<=', next_node.seq),
              ('seq', '>', self.seq)])
         for node in predecessor_nodes:
             total_interval += node.interval_minutes