From bebbaa2a5eb8ab40f23982eae1a5301022563a0e Mon Sep 17 00:00:00 2001
From: mgw <1392924357@qq.com>
Date: Tue, 28 Feb 2023 18:02:21 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9python=E5=9C=B0=E5=9D=80?=
 =?UTF-8?q?=E8=A7=A3=E6=9E=90=E5=8C=85=E6=88=90=E5=8A=9F?=
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/__init__.py |  2 +-
 sf_bf_connect/models/jd_eclp.py  | 47 ++++++++++++++++++++++++++------
 sf_bf_connect/views/view.xml     | 23 ++++++++--------
 4 files changed, 54 insertions(+), 22 deletions(-)

diff --git a/sf_bf_connect/__manifest__.py b/sf_bf_connect/__manifest__.py
index af572074..bcec62fa 100644
--- a/sf_bf_connect/__manifest__.py
+++ b/sf_bf_connect/__manifest__.py
@@ -13,8 +13,8 @@
     'depends': ['sf_base', 'sf_sale', 'sf_dlm'],
     'data': [
         'views/res_partner_view.xml',
-        # 'views/view.xml',
-        # 'report/bill_report.xml',
+        'views/view.xml',
+        'report/bill_report.xml',
     ],
     'demo': [
     ],
diff --git a/sf_bf_connect/models/__init__.py b/sf_bf_connect/models/__init__.py
index 43a269e9..21f9d732 100644
--- a/sf_bf_connect/models/__init__.py
+++ b/sf_bf_connect/models/__init__.py
@@ -1,5 +1,5 @@
 from . import http
 from . import models
 from . import process_status
-# from . import jd_eclp
+from . import jd_eclp
 
diff --git a/sf_bf_connect/models/jd_eclp.py b/sf_bf_connect/models/jd_eclp.py
index e4c769bb..3e938bfd 100644
--- a/sf_bf_connect/models/jd_eclp.py
+++ b/sf_bf_connect/models/jd_eclp.py
@@ -14,6 +14,14 @@ class JdEclp(models.Model):
     _inherit = 'stock.picking'
 
     senderNickName = fields.Char(string='寄件工厂简称', required=True, default='MW')
+
+    # receiverName = fields.Char(string='收件人姓名')
+    # receiverMobile = fields.Char(string='收件人电话')
+    # receiverProvinceName = fields.Char(string='收件人省')
+    # receiverCityName = fields.Char(string='收件人市')
+    # receiverCountyName = fields.Char(string='收件人县')
+    # receiverTownName = fields.Char(string='收件人详细地址')
+
     receiverName = fields.Char(string='收件人姓名', compute='_truck_info')
     receiverMobile = fields.Char(string='收件人电话', compute='_truck_info')
     receiverProvinceName = fields.Char(string='收件人省', compute='_truck_info')
@@ -39,15 +47,38 @@ class JdEclp(models.Model):
 
     @api.depends('origin')
     def _truck_info(self):
+        # if 'S' in self.origin:
+        # if self.receiverName and self.receiverMobile and self.receiverProvinceName and self.receiverCityName and self.receiverCountyName and self.receiverTownName:
         sale_order_id = self.env['sale.order'].search([('name', '=', self.origin)])
-        raw_addres = sale_order_id.address_of_delivery
-        self.receiverName = sale_order_id.person_of_delivery
-        self.receiverMobile = sale_order_id.telephone_of_delivery
-        self.receiverProvinceName = cpca.transform(raw_addres).values.tolist()[0][0]
-        self.receiverCityName = cpca.transform(raw_addres).values.tolist()[0][1]
-        self.receiverCountyName = cpca.transform(raw_addres).values.tolist()[0][2]
-        self.receiverTownName = cpca.transform(raw_addres).values.tolist()[0][3]
-        # self.receiverMobile = sale_order_id.telephone_of_delivery
+            # stock_picking_type_id = self.enc['stock.picking.type'].search([('picking_type_id', '=', '')])
+            # if sale_order_id.address_of_delivery != False:
+
+
+
+        if 'OUT' in self.name:
+            raw_addres = sale_order_id.address_of_delivery.split('这是一个标志位，用来不分隔字符串')
+            # _logger.info('=================dddd====', sale_order_id.address_of_delivery)
+            # _logger.info('=================dddd====', type(sale_order_id.address_of_delivery))
+            # _logger.info('========================================', raw_addres)
+            # _logger.info('=================dddd====', self.display_name)
+            # _logger.info('=================dddd====', type(self.display_name))
+            # # _logger.info(self.receiverName, self.receiverMobile)
+            # _logger.info(1111111111111111111111111111111111111111111111)
+            self.receiverName = sale_order_id.person_of_delivery
+            self.receiverMobile = sale_order_id.telephone_of_delivery
+            self.receiverProvinceName = cpca.transform(raw_addres).values.tolist()[0][0]
+            self.receiverCityName = cpca.transform(raw_addres).values.tolist()[0][1]
+            self.receiverCountyName = cpca.transform(raw_addres).values.tolist()[0][2]
+            self.receiverTownName = cpca.transform(raw_addres).values.tolist()[0][3]
+        else:
+            self.receiverName = self.receiverName
+            self.receiverMobile = self.receiverMobile
+            self.receiverProvinceName = self.receiverProvinceName
+            self.receiverCityName = self.receiverCityName
+            self.receiverCountyName = self.receiverCountyName
+            self.receiverTownName = self.receiverTownName
+
+
 
     def create_order(self):
         # sale_order_id = self.env['sale.order'].search([('name', '=', self.origin)])
diff --git a/sf_bf_connect/views/view.xml b/sf_bf_connect/views/view.xml
index 2aec5078..ec6dc394 100644
--- a/sf_bf_connect/views/view.xml
+++ b/sf_bf_connect/views/view.xml
@@ -6,17 +6,18 @@
         <field name="inherit_id" ref="delivery.view_picking_withcarrier_out_form"/>
         <field name="arch" type="xml">
             <xpath expr="//group//field[@name='carrier_id']" position="after">
-                <field name="senderNickName"/>
-                <field name="expressItemName"/>
-                <field name="deliveryType"/>
-                <field name="receiverName"/>
-                <field name="receiverMobile"/>
-                <field name="receiverProvinceName"/>
-                <field name="receiverCityName"/>
-                <field name="receiverCountyName"/>
-                <field name="receiverTownName"/>
-                <field name="receiverCompany"/>
-                <field name="remark"/>
+<!--                 <field name="senderNickName" domain="[('self.name', 'like', '%OUT%')]"/> -->
+                <field name="senderNickName" attrs="{'invisible': [('name', 'like', '%OUT%')]}"/>
+                <field name="expressItemName" attrs="{'invisible': [('name', 'like', '%OUT%')]}"/>
+                <field name="deliveryType" attrs="{'invisible': [('name', 'like', '%OUT%')]}"/>
+                <field name="receiverName" attrs="{'invisible': [('name', 'like', '%OUT%')]}"/>
+                <field name="receiverMobile" attrs="{'invisible': [('name', 'like', '%OUT%')]}"/>
+                <field name="receiverProvinceName" attrs="{'invisible': [('name', 'like', '%OUT%')]}"/>
+                <field name="receiverCityName" attrs="{'invisible': [('name', 'like', '%OUT%')]}"/>
+                <field name="receiverCountyName" attrs="{'invisible': [('name', 'like', '%OUT%')]}"/>
+                <field name="receiverTownName" attrs="{'invisible': [('name', 'like', '%OUT%')]}"/>
+                <field name="receiverCompany" attrs="{'invisible': [('name', 'like', '%OUT%')]}"/>
+                <field name="remark" attrs="{'invisible': [('name', 'like', '%OUT%')]}"/>
                 <field name="grossWeight"/>
                 <field name="grossVolume"/>
                 <field name="pickupBeginTime"/>