From c07803d3cfdc8b12fda3a2c781040618afdbfc90 Mon Sep 17 00:00:00 2001 From: mgw <1392924357@qq.com> Date: Mon, 13 Feb 2023 08:50:37 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=AC=E4=B8=9C=E7=89=A9?= =?UTF-8?q?=E6=B5=81=E7=9A=84=E9=85=8D=E7=BD=AE=E9=A1=B9=E7=9B=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_bf_connect/__manifest__.py | 3 +- sf_bf_connect/models/jd_eclp.py | 82 ++++++++++++++++++------- sf_bf_connect/views/view.xml | 43 +++++++++++++ sf_machine_connect/models/ftp_client.py | 2 +- 4 files changed, 107 insertions(+), 23 deletions(-) create mode 100644 sf_bf_connect/views/view.xml diff --git a/sf_bf_connect/__manifest__.py b/sf_bf_connect/__manifest__.py index fe5a9559..6b893476 100644 --- a/sf_bf_connect/__manifest__.py +++ b/sf_bf_connect/__manifest__.py @@ -12,7 +12,8 @@ 'website': 'https://www.sf.cs.jikimo.com', 'depends': ['sf_base', 'sf_sale', 'sf_dlm'], 'data': [ - 'views/res_partner_view.xml' + 'views/res_partner_view.xml', + 'views/view.xml', ], 'demo': [ ], diff --git a/sf_bf_connect/models/jd_eclp.py b/sf_bf_connect/models/jd_eclp.py index 2eb3d812..e101df6d 100644 --- a/sf_bf_connect/models/jd_eclp.py +++ b/sf_bf_connect/models/jd_eclp.py @@ -12,31 +12,71 @@ _logger = logging.getLogger(__name__) class JdEclp(models.Model): _inherit = 'stock.picking' - def create_order(self): + senderNickName = fields.Char(string='寄件工厂简称', required=True, default='MW') + receiverName = fields.Char(string='收件人姓名', compute='_truck_info') + receiverMobile = fields.Char(string='收件人电话', compute='_truck_info') + receiverProvinceName = fields.Char(string='收件人省', compute='_truck_info') + receiverCityName = fields.Char(string='收件人市', compute='_truck_info') + receiverCountyName = fields.Char(string='收件人县', compute='_truck_info') + receiverTownName = fields.Char(string='收件人详细地址', compute='_truck_info') + receiverCompany = fields.Char(string='收货人公司', required=True) + remark = fields.Char(string='物流面单备注') + grossWeight = fields.Char(string='总重量', required=True) + grossVolume = fields.Char(string='总体积') + expressItemName = fields.Char(string='货物名称', required=True, default='非标工件') + pickupBeginTime = fields.Char(string='期望取件时间') + deliveryType = fields.Selection([('6', '特快零担'), ('25', '特快重货')], string='运输类型', default='25') + + @api.depends('origin') + def _truck_info(self): sale_order_id = self.env['sale.order'].search([('name', '=', self.origin)]) - raw_addres = self.address_of_delivery + 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.receiverMobile = sale_order_id.telephone_of_delivery + + def create_order(self): + # sale_order_id = self.env['sale.order'].search([('name', '=', self.origin)]) + + if self.carrier_id == '京东物流': + createTime = str(datetime.now()) + json1 = { + 'params': { + 'orderNo': self.origin, + 'senderNickName': self.senderNickName, + 'receiverName': self.receiverName, + 'receiverMobile': self.receiverMobile, + 'receiverProvinceName': self.receiverProvinceName, + 'receiverCityName': self.receiverCityName, + 'receiverCountyName': self.receiverCountyName, + 'receiverTownName': self.receiverTownName, + 'remark': self.remark, + 'grossWeight': self.grossWeight, + 'grossVolume': self.grossVolume, + 'createTime': createTime, + 'createUser': self.user_id, + 'expressItemName': self.expressItemName, + 'pickupBeginTime': self.pickupBeginTime, + 'deliveryType': self.deliveryType, + 'receiverCompany': self.receiverCompany, + }, + } + url1 = 'https://bfm.cs.jikimo.com/api/create/jd/order' + requests.post(url1, json=json1, data=None) + + else: + raise UserError("选择京东物流才能下单呦") + + def get_bill(self): + json1 = { 'params': { - 'orderNo': self.origin, - 'senderNickName': self., - 'receiverName': self.person_of_delivery, - 'receiverMobile': self.telephone_of_delivery, - 'receiverProvinceName': jio.parse_location(raw_addres)['province'], - 'receiverCityName': jio.parse_location(raw_addres)['city'], - 'receiverCountyName': jio.parse_location(raw_addres)['county'], - 'receiverTownName': jio.parse_location(raw_addres)['detail'], - 'remark': self., - 'grossWeight': self., - 'grossVolume': self., - 'createTime': self., - 'createUser': self., - 'expressItemName': self., - 'pickupBeginTime': self., - 'deliveryType': self., - 'receiverCompany': self., + 'no': self.origin, }, } url1 = 'https://bfm.cs.jikimo.com/api/create/jd/order' requests.post(url1, json=json1, data=None) - - diff --git a/sf_bf_connect/views/view.xml b/sf_bf_connect/views/view.xml new file mode 100644 index 00000000..2661e972 --- /dev/null +++ b/sf_bf_connect/views/view.xml @@ -0,0 +1,43 @@ + + + + tracking + stock.picking + + + + + + + + + + + + + + + + + + + +
+
+ + + +
+
+ + + + + + + + + \ No newline at end of file diff --git a/sf_machine_connect/models/ftp_client.py b/sf_machine_connect/models/ftp_client.py index 3ef02905..40c7ca3c 100644 --- a/sf_machine_connect/models/ftp_client.py +++ b/sf_machine_connect/models/ftp_client.py @@ -207,7 +207,7 @@ class WorkCenterBarcode(models.Model): machine_tool_name = fields.Char(string='机床名称', default='未知机床', compute='_run_info', readonly=True) machine_tool_type_id = fields.Char(string='机床型号', default='未知型号', compute='_run_info', readonly=True) machine_tool_status = fields.Boolean(string='在线状态', compute='_run_info', readonly=True) - machine_tool_run_status = fields.Selection([('0', '关机中'), ('1', '加工中'), ('2', '加工中'), ('3', '等待中')], + machine_tool_run_status = fields.Selection([('0', '关机中'), ('1', '加工中'), ('2', '加工中'), ('3', '加工中')], string='运行状态', compute='_run_info', readonly=True, default='0') machine_tool_timestamp = fields.Datetime('时间戳', compute='_run_info', readonly=True) machine_tool_time_on = fields.Char('总在线时长', compute='_run_info', readonly=True)