diff --git a/sf_bf_connect/controllers/controllers.py b/sf_bf_connect/controllers/controllers.py index 6a6aedbc..306f36f2 100644 --- a/sf_bf_connect/controllers/controllers.py +++ b/sf_bf_connect/controllers/controllers.py @@ -119,3 +119,30 @@ class Sf_Bf_Connect(http.Controller): res['status'] = -1 res['message'] = '工厂创建销售订单和产品失败,请联系管理员' return json.JSONEncoder().encode(res) + + +class jdElcp(http.Controller): + + @http.route('/api/jd_create/order', type='http', auth='none', methods=['GET', 'POST'], csrf=False, + cors="*") + def get_jd_order(self, **kw): + """ + 回调函数:拿到京东返回的下单数据 + """ + logging.info('get_jd_bill================:%s', kw) + aa = request.env['stock.picking'].sudo().search([('origin', '=', kw['orderNo'])]) + aa.carrier_tracking_ref = kw['wbNo'] + logging.info('get_jd_order================:%s' % + aa.carrier_tracking_ref) + + @http.route('/api/jd_create/bill', type='http', auth='none', methods=['GET', 'POST'], csrf=False, + cors="*") + def get_jd_bill(self, **kw): + """ + 回调函数:拿到京东返回的快递面单 + """ + logging.info('get_jd_bill================:%s', kw) + aa = request.env['stock.picking'].sudo().search([('origin', '=', kw['orderNo'])]) + aa.bill_url = kw['bill'] + logging.info('get_jd_bill================:%s' % + aa.bill_url) diff --git a/sf_bf_connect/models/jd_eclp.py b/sf_bf_connect/models/jd_eclp.py index e101df6d..44679c3b 100644 --- a/sf_bf_connect/models/jd_eclp.py +++ b/sf_bf_connect/models/jd_eclp.py @@ -26,6 +26,7 @@ class JdEclp(models.Model): expressItemName = fields.Char(string='货物名称', required=True, default='非标工件') pickupBeginTime = fields.Char(string='期望取件时间') deliveryType = fields.Selection([('6', '特快零担'), ('25', '特快重货')], string='运输类型', default='25') + bill = fields.Char(string='快递面单') @api.depends('origin') def _truck_info(self): @@ -42,34 +43,37 @@ class JdEclp(models.Model): 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) + # 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, + }, + } + _logger.info('准备调接口') + url1 = 'https://bfm.cs.jikimo.com/api/create/jd/order' + requests.post(url1, json=json1, data=None) + _logger.info('调用成功') - else: - raise UserError("选择京东物流才能下单呦") + + # else: + # raise UserError("选择京东物流才能下单呦") def get_bill(self): @@ -78,5 +82,5 @@ class JdEclp(models.Model): 'no': self.origin, }, } - url1 = 'https://bfm.cs.jikimo.com/api/create/jd/order' + url1 = 'https://bfm.cs.jikimo.com/api/api/create/jd/bill' requests.post(url1, json=json1, data=None) diff --git a/sf_bf_connect/views/view.xml b/sf_bf_connect/views/view.xml index 2661e972..31bf9ffa 100644 --- a/sf_bf_connect/views/view.xml +++ b/sf_bf_connect/views/view.xml @@ -17,8 +17,10 @@ + +