From 54912f15b91f8894f25969709f27e9d6e778f6e2 Mon Sep 17 00:00:00 2001
From: mgw <1392924357@qq.com>
Date: Mon, 27 Nov 2023 12:17:57 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=89=A9=E6=B5=81=E4=B8=8B?=
 =?UTF-8?q?=E5=8D=95=E7=AD=89=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_bf_connect/__manifest__.py   |  4 +--
 sf_bf_connect/models/jd_eclp.py | 13 ++++++----
 sf_bf_connect/views/view.xml    | 43 +++++++++++++++++----------------
 3 files changed, 32 insertions(+), 28 deletions(-)

diff --git a/sf_bf_connect/__manifest__.py b/sf_bf_connect/__manifest__.py
index 46ca09f8..ce938272 100644
--- a/sf_bf_connect/__manifest__.py
+++ b/sf_bf_connect/__manifest__.py
@@ -10,10 +10,10 @@
     """,
     'category': 'sf',
     'website': 'https://www.sf.cs.jikimo.com',
-    'depends': ['sf_base'],
+    'depends': ['sf_base', 'delivery'],
     'data': [
         'views/res_partner_view.xml',
-        # 'views/view.xml',
+        'views/view.xml',
         'report/bill_report.xml',
     ],
     'demo': [
diff --git a/sf_bf_connect/models/jd_eclp.py b/sf_bf_connect/models/jd_eclp.py
index dfcb20f8..493e739f 100644
--- a/sf_bf_connect/models/jd_eclp.py
+++ b/sf_bf_connect/models/jd_eclp.py
@@ -83,6 +83,7 @@ class JdEclp(models.Model):
         # sale_order_id = self.env['sale.order'].search([('name', '=', self.origin)])
 
         # if self.carrier_id == '京东物流':
+        config = self.env['res.config.settings'].get_values()
         createTime = str(datetime.now())
         json1 = {
             'params': {
@@ -106,7 +107,7 @@ class JdEclp(models.Model):
             },
         }
         _logger.info('准备调接口1')
-        url1 = 'https://bfm.cs.jikimo.com/api/create/jd/order'
+        url1 = config['bfm_url'] + '/api/create/jd/order'
         requests.post(url1, json=json1, data=None)
         _logger.info('调用成功1')
         _logger.info('准备调接口2')
@@ -115,7 +116,7 @@ class JdEclp(models.Model):
                 'orderNo': self.origin,
             },
         }
-        url2 = 'https://bfm.cs.jikimo.com/api/get/jd/no'
+        url2 = config['bfm_url'] + '/api/get/jd/no'
         response = requests.post(url2, json=json2, data=None)
         # _logger.info('调用成功2', response.json()['result']['wbNo'])
         self.carrier_tracking_ref = response.json()['result']['wbNo']
@@ -124,12 +125,16 @@ class JdEclp(models.Model):
         #     raise UserError("选择京东物流才能下单呦")
 
     def get_bill(self):
+        """
+        获取物流面单
+        """
+        config = self.env['res.config.settings'].get_values()
         json1 = {
             'params': {
                 'no': self.origin,
             },
         }
-        url1 = 'https://bfm.cs.jikimo.com/api/create/jd/bill'
+        url1 = config['bfm_url'] + '/api/create/jd/bill'
         response = requests.post(url1, json=json1, data=None)
         # _logger.info('调用成功2', response.json())
 
@@ -152,5 +157,3 @@ class JdEclp(models.Model):
             # 'model_name': 'stock.picking',
         })
         _logger.info(attachment)
-        # _logger.info(attachment.datas)
-        # _logger.info(attachment.datas_fname)
diff --git a/sf_bf_connect/views/view.xml b/sf_bf_connect/views/view.xml
index ec6dc394..a8236456 100644
--- a/sf_bf_connect/views/view.xml
+++ b/sf_bf_connect/views/view.xml
@@ -1,5 +1,18 @@
 <?xml version="1.0"?>
 <odoo>
+
+    <record id="custom_view_picking_form" model="ir.ui.view">
+        <field name="name">物流</field>
+        <field name="model">stock.picking</field>
+        <field name="inherit_id" ref="stock.view_picking_form"/>
+        <field name="arch" type="xml">
+            <xpath expr="//form//header" position="inside">
+                <button string="京东物流下单" name="create_order" type="object" confirm="是否确认物流下单" class="btn-primary"/>
+                <button string="获取物流面单" name="get_bill" type="object" confirm="是否获取物流面单" class="btn-primary"/>
+            </xpath>
+        </field>
+    </record>
+
     <record id="tracking_view" model="ir.ui.view">
         <field name="name">tracking</field>
         <field name="model">stock.picking</field>
@@ -21,31 +34,19 @@
                 <field name="grossWeight"/>
                 <field name="grossVolume"/>
                 <field name="pickupBeginTime"/>
-                <field name="bill"/>
-
+                <field name="bill_show"/>
             </xpath>
             <xpath expr="//group//field[@name='group_id']" position="after">
                 <field name="bill_show" widget="pdf_viewer"/>
-
             </xpath>
-            <xpath expr="//group[@name='other_infos']" position="after">
-<!--                <group>-->
-                    <div>
-                        <button string="京东物流下单" name="create_order" type="object" confirm="是否确认物流下单" class="btn-primary"/>
-                    </div>
-
-<!--                </group>-->
-<!--                <group>-->
-                    <div>
-                        <button string="获取物流面单" name="get_bill" type="object" confirm="是否获取物流面单" class="btn-primary"/>
-
-                    </div>
-
-<!--                </group>-->
-
-            </xpath>
-
-
+<!--             <xpath expr="//group[@name='other_infos']" position="after"> -->
+<!--                 <div> -->
+<!--                     <button string="京东物流下单" name="create_order" type="object" confirm="是否确认物流下单" class="btn-primary"/> -->
+<!--                 </div> -->
+<!--                 <div> -->
+<!--                     <button string="获取物流面单" name="get_bill" type="object" confirm="是否获取物流面单" class="btn-primary"/> -->
+<!--                 </div> -->
+<!--             </xpath> -->
         </field>
     </record>
 </odoo>
\ No newline at end of file