Merge branch 'develop' of https://e.coding.net/yizuo/hh_ccs/hh_ccs into develop

ccs_base/controllers/export_bl_and_package_xlsx.py

@@ -31,7 +31,7 @@ class ExportBlAndPackageXlsx(http.Controller):
             if good_ids:
                 for good_item in good_ids:
                     good_index += 1
-                    sheet1.write(good_index, 0, package_item.logistic_order_no or '')  # 物流订单号 CUSTOMS PROVIDER ORDER ID
+                    sheet1.write(good_index, 0, package_item.logistic_order_no or '')  # 物流订单号 ITEM ID
                     sheet1.write(good_index, 1, package_item.big_package_id.big_package_no or '')  # 小包商品对应的大包号 BIG BAG NO
                     sheet1.write(good_index, 2, package_item.tracking_no or '')  # 小包追踪号 TRACKING  NO
                     sheet1.write(good_index, 3, package_item.customer_ref or '')  # CUSTOMER REF
@@ -68,6 +68,10 @@ class ExportBlAndPackageXlsx(http.Controller):
                     sheet1.write(good_index, 34, '')  # LENGTH
                     sheet1.write(good_index, 35, '')  # WIDTH
                     sheet1.write(good_index, 36, '')  # HEIGHT
+                    sheet1.write(good_index, 37, package_item.receiver_detailed_address or '')  # Detailed Address
+                    sheet1.write(good_index, 38, package_item.next_provider_name or '')  # Last Mile Service Provider 关联的小包的下一个服务商名称
+                    sheet1.write(good_index, 39, sum(package_item.good_ids.mapped('item_total_price')))  # GOODS VALUE 小包上的所有商品的货物总价之和
+                    sheet1.write(good_index, 40, good_item.import_hs_code or '')  # HSCODE IMPORT 取商品上的进口hscode
                     if good_index == int(parcel_export_num):
                         num += 1
                         sheet1 = self.get_package_title(worksheet, font_style, num)
@@ -80,10 +84,10 @@ class ExportBlAndPackageXlsx(http.Controller):
         """
         sheet1 = worksheet.add_sheet('Sheet(%s)' % num, cell_overwrite_ok=True)
         index = 0
-        for i in range(37):
+        for i in range(41):
             sheet1.col(i).width = 500 * 11
         sheet1.col(8).width = 600 * 11
-        sheet1.write(index, 0, u'CUSTOMS PROVIDER ORDER ID', font_style)  # CUSTOMS PROVIDER ORDER ID
+        sheet1.write(index, 0, u'ITEM ID', font_style)  # ITEM ID
         sheet1.write(index, 1, u'BIG BAG NO', font_style)  # BIG BAG NO
         sheet1.write(index, 2, u'TRACKING NO', font_style)  # TRACKING NO
         sheet1.write(index, 3, u'CUSTOMER REF', font_style)  # CUSTOMER REF
@@ -120,6 +124,10 @@ class ExportBlAndPackageXlsx(http.Controller):
         sheet1.write(index, 34, u'LENGTH', font_style)  # LENGTH
         sheet1.write(index, 35, u'WIDTH', font_style)  # WIDTH
         sheet1.write(index, 36, u'HEIGHT', font_style)  # HEIGHT
+        sheet1.write(index, 37, u'Detailed Address', font_style)  # Detailed Address
+        sheet1.write(index, 38, u'Last Mile Service Provider', font_style)  # Last Mile Service Provider
+        sheet1.write(index, 39, u'GOODS VALUE', font_style)  # GOODS VALUE
+        sheet1.write(index, 40, u'HSCODE IMPORT', font_style)  # HSCODE IMPORT
         return sheet1
 
     # 运单导出包裹清关数据 每个运单导出一个文件 生成压缩包

ccs_base/views/cc_ship_package_view.xml

@@ -180,6 +180,7 @@
                                 <field name="receiver_add_1" string="ADD 1"/>
                                 <field name="receiver_add_2" string="ADD 2"/>
                                 <field name="receiver_add_3" string="ADD 3"/>
+                                <field name="receiver_detailed_address" string="Detailed Address"/>
                             </group>
                         </page>
                         <page string="Other">