尾程快递理货，交货接口增加大包信息和小包信息

ccs_base/models/cc_last_mile_provider.py

@@ -63,6 +63,9 @@ class CCLastMileProvider(models.Model):
         base_url = self.env['ir.config_parameter'].sudo().get_param('web.base.url')
         return {
             'provider_name': self.name,  # 尾程快递名称
+            "abbreviation": self.abbreviation or '',  # 简称
             'placement_area': self.placement_area or '',  # 摆放区域
+            'tape_color_value': self.tape_color_value or '',  # 胶带色值
+            'matching_value': self.matching_value or '',  # 匹配值
             'logo': "%s/web/image/%s/%s/logo" % (base_url, self._name, self.id) if self.logo else '',  # 快递logo
         }

ccs_connect_tiktok/controllers/order_controller.py

@@ -336,8 +336,7 @@ class OrderController(http.Controller):
         res = {'state': 201, 'message': ''}
         try:
             logging.info('last_mile_tally kwargs:%s' % kwargs)
-            lang = 'zh_CN' if pda_lang == 'zh' else 'en_US'  # 语言
-            return self._get_last_mile_grouped('unprocessed_goods', lang)
+            return self._get_last_mile_grouped('unprocessed_goods', pda_lang)
         except Exception as e:
             exceptions_msg_dic = {
                 'en': 'System parsing error, the reason for the error is %s' % e,
@@ -359,8 +358,8 @@ class OrderController(http.Controller):
         res = {'state': 201, 'message': ''}
         try:
             logging.info('last_mile_delivery kwargs:%s' % kwargs)
-            lang = 'zh_CN' if pda_lang == 'zh' else 'en_US'  # 语言
-            return self._get_last_mile_grouped('checked_goods', lang)
+
+            return self._get_last_mile_grouped('checked_goods', pda_lang)
         except Exception as e:
             exceptions_msg_dic = {
                 'en': 'System parsing error, the reason for the error is %s' % e,
@@ -372,7 +371,8 @@ class OrderController(http.Controller):
         logging.info('last_mile_delivery res:%s' % res)
         return res
 
-    def _get_last_mile_grouped(self, tally_state, lang):
+    def _get_last_mile_grouped(self, tally_state, pda_lang):
+        lang = 'zh_CN' if pda_lang == 'zh' else 'en_US'  # 语言
         # 1. 查所有清关中提单
         bls = request.env['cc.bl'].sudo().search([('state', '=', 'ccing')])
         # 2. 查所有大包
@@ -392,12 +392,13 @@ class OrderController(http.Controller):
             if key not in group_dict:
                 group_dict[key] = provider.search_pro_info()  # 查询快递信息
                 group_dict[key]['count'] = 0
-                group_dict[key]['big_packages'] = []
+                group_dict[key]['big_package_arr'] = []
+                group_dict[key]['ship_package_arr'] = []
             group_dict[key]['count'] += 1
-            group_dict[key]['big_packages'].append({
-                'big_package_no': pkg.big_package_no or '',  # 大包号
-                'provider_name': provider.name or '',  # 尾程快递名称
-                'tape_color_value': provider.tape_color_value,  # 色值
-            })
+            group_dict[key]['big_package_arr'].append(pkg.search_big_package_info(pda_lang=pda_lang, type=tally_state))
+            print('pkg.ship_package_ids:%s' %pkg.ship_package_ids)
+            group_dict[key]['ship_package_arr'].extend(
+                [ship_package_item.search_ship_package_info(pda_lang=pda_lang) for ship_package_item in
+                 pkg.ship_package_ids])
         # 4. 返回
         return {'provider_info_arr': list(group_dict.values()), 'state': 200}