Accept Merge Request #145: (feature/优化NC下发 -> develop)

Merge Request: NC下发测试成功,请求合并

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/145?initial=true
This commit is contained in:
马广威
2023-02-27 14:57:30 +08:00
16 changed files with 344 additions and 82 deletions

View File

@@ -1,11 +1,11 @@
from odoo import api, fields, models, SUPERUSER_ID, _
from odoo.exceptions import ValidationError
from datetime import datetime
import jionlp as jio
import cpca
import logging
from odoo.exceptions import UserError
import requests
import base64
import requests
from datetime import datetime
from odoo.exceptions import UserError
from odoo.exceptions import ValidationError
from odoo import api, fields, models, SUPERUSER_ID, _
_logger = logging.getLogger(__name__)
@@ -37,17 +37,16 @@ class JdEclp(models.Model):
def query_bill_pdf(self):
self.bill = self.env['ir.attachment'].sudo().search([('name', '=', self.carrier_tracking_ref)])
@api.depends('origin')
def _truck_info(self):
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 = jio.parse_location(raw_addres)['province']
self.receiverCityName = jio.parse_location(raw_addres)['city']
self.receiverCountyName = jio.parse_location(raw_addres)['county']
self.receiverTownName = jio.parse_location(raw_addres)['detail']
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
def create_order(self):
@@ -91,12 +90,10 @@ class JdEclp(models.Model):
# _logger.info('调用成功2', response.json()['result']['wbNo'])
self.carrier_tracking_ref = response.json()['result']['wbNo']
# else:
# raise UserError("选择京东物流才能下单呦")
def get_bill(self):
json1 = {
'params': {
'no': self.origin,
@@ -127,6 +124,3 @@ class JdEclp(models.Model):
_logger.info(attachment)
# _logger.info(attachment.datas)
# _logger.info(attachment.datas_fname)