5.自动改变关务提单状态，并生成同步日志，推送TK

ccs_base/views/cc_node_view.xml

@@ -13,6 +13,7 @@
                 <field optional="show" name="desc" string="Node Description"/>
                 <field optional="show" name="next_code_ids" widget="many2many_tags" options="{'no_create':True}"/>
                 <field optional="show" name="tally_state"/>
+                <field optional="show" name="package_state"/>
                 <field optional="show" name="is_must" string="Is Must Node"/>
                 <field optional="show" name="is_done" string="Is Done Node"/>
                 <field optional="show" name="is_default" string="Is Current Node"/>

ccs_connect_tiktok/models/cc_bill_loading_new.py

@@ -287,7 +287,7 @@ class CcBl(models.Model):
         responses = asyncio.run(perform_requests())
         for response_item in responses:
             response_data = response_item[0]
-            logging.info('response_data response:%s' % response_data)
+            logging.info('response_data:%s' % response_data)
             data = response_item[1]
             package_id = response_item[2]
             package_order = self.env['cc.ship.package'].sudo().browse(package_id)

ccs_connect_tiktok/models/cc_bill_loading_old.py

@@ -287,7 +287,7 @@ class CcBl(models.Model):
         responses = asyncio.run(perform_requests())
         for response_item in responses:
             response_data = response_item[0]
-            logging.info('response_data response:%s' % response_data)
+            logging.info('response_data:%s' % response_data)
             data = response_item[1]
             package_id = response_item[2]
             package_order = self.env['cc.ship.package'].sudo().browse(package_id)

ccs_connect_tiktok/models/cc_node.py

@@ -12,6 +12,49 @@ class CCNode(models.Model):
     interval_minutes = fields.Integer('Predecessor Node Interval (Minutes)', default=20,
                                       help='Default interval time between predecessor nodes in minutes.')  # 前序节点间隔时间，默认20分钟
 
+    def get_before_node(self, node_type='package'):
+        """
+        获取当前状态的前序节点
+        """
+        # 前序节点 该节点之前没有生成的节点
+        before_node_obj = self.env['cc.node'].sudo().search([
+            ('node_type', '=', node_type), ('is_must', '=', True), ('seq', '<', self.seq)],
+            order='seq asc')
+        return before_node_obj
+
+    def is_before_node(self, target_state):
+        """
+        判断当前状态是否在目标状态之前
+        
+        Args:
+            target_state: 目标状态代码
+            
+        Returns:
+            bool: 如果当前状态在目标状态之前返回True，否则返回False
+        """
+        if not target_state:
+            return False
+
+        # 获取所有状态的顺序映射
+        states_seq = dict(
+            self.search([]).sorted('seq').mapped(lambda r: (r.tk_code, r.seq))
+        )
+
+        # 获取当前状态的序号
+        current_code = self.tk_code
+        current_seq = states_seq.get(current_code)
+
+        # 获取目标状态的序号
+        target_code = target_state.tk_code if isinstance(target_state, models.Model) else target_state
+        target_seq = states_seq.get(target_code)
+
+        # 如果任一状态不存在，返回False
+        if current_seq is None or target_seq is None:
+            return False
+
+        # 比较序号判断先后顺序
+        return current_seq < target_seq
+
     def is_next_code(self, current_state_obj, next_state_id):
         """
         判断更新的节点是否是 小包状态的下级节点

ccs_connect_tiktok/models/tt_api.py

@@ -51,7 +51,7 @@ class TT(models.Model):
         timestamp = int(time.time())
         sign = self.generate_sign(timestamp, push_data)
         response = self.get_response(url, sign, timestamp, push_data)
-        logging.info('callback_track response:%s'  % response)
+        # logging.info('callback_track response:%s'  % response)
         return response
 
     def package_invoice_query(self, push_data):
@@ -126,7 +126,7 @@ class TT(models.Model):
             'app_key': app_key
         }
         request_url = tt_url + url
-        logging.info('request_url: %s' % request_url)
+        # logging.info('request_url: %s' % request_url)
         # logging.info('request_data: %s' % parameter)
         for i in range(3):  # 尝试最多3次
             try:
@@ -150,7 +150,7 @@ class TT(models.Model):
         timestamp = int(time.time())
         sign = self.generate_sign(timestamp, push_data)
         response = await self.async_get_response(session, url, sign, timestamp, push_data)
-        logging.info('callback_track response:%s' % response)
+        # logging.info('callback_track response:%s' % response)
         return response, push_data, package_id
 
     async def async_callback_track(self, session, data, package_id):
@@ -164,7 +164,7 @@ class TT(models.Model):
         timestamp = int(time.time())
         sign = self.generate_sign(timestamp, push_data)
         response = await self.async_get_response(session, url, sign, timestamp, push_data)
-        logging.info('bl_callback_track response:%s' % response)
+        # logging.info('bl_callback_track response:%s' % response)
         return response, push_data, package_id
 
     async def async_bl_callback_track(self, session, data, bl_id):

ccs_connect_tiktok/views/cc_bl_view.xml

@@ -24,14 +24,16 @@
             <field name="model">cc.bl</field>
             <field name="inherit_id" ref="ccs_base.form_cc_bl_view"/>
             <field name="arch" type="xml">
-                <!--                # header之间增加一个按钮,调用自定义的方法-->
-                <header position="inside">
+                <button name="%(ccs_base.action_batch_input_ship_package_wizard)d" position="after">
                     <button name="callback_track" string="Sync Package Status" type="object"/>
+                </button>
+                <button name="%(ccs_base.action_batch_input_bl_status_wizard)d" position="before">
                     <button name="batch_action_sync" string="Sync CC Attachment" type="object"/>
+                </button>
+                <button name="%(ccs_base.action_batch_input_bl_status_wizard)d" position="after">
                     <!--增加同步提单状态的按钮-->
                     <button name="callback_track_bl" string="Sync Bill Of Loading Status" type="object"/>
-                </header>
-
+                </button>
                 <button name="action_show_ship_package" position="replace">
 
                     <button name="action_show_ship_package" type="object"

ccs_connect_tiktok/wizard/batch_input_ship_package_statu_wizard.py

@@ -163,4 +163,5 @@ class BatchInputShipPackageStatusWizard(models.TransientModel):
                     self.update_status.name or ''))
             # 如果提单有小包变成了清关开始，提单状态变为清关中;如果提单所有小包的清关节点变成“是完成节点”，则该提单状态变成已完成
             bl_obj.change_state_by_ship_package()
+            bl_obj.change_customs_state_by_ship_package(self.update_status)#根据小包状态更新提单关务状态
         return obj