diff --git a/sf_bf_connect/controllers/controllers.py b/sf_bf_connect/controllers/controllers.py index 306f36f2..cf027993 100644 --- a/sf_bf_connect/controllers/controllers.py +++ b/sf_bf_connect/controllers/controllers.py @@ -129,11 +129,11 @@ class jdElcp(http.Controller): """ 回调函数:拿到京东返回的下单数据 """ - 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) + logging.info('get_jd_order================:%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="*") diff --git a/sf_bf_connect/models/jd_eclp.py b/sf_bf_connect/models/jd_eclp.py index 44679c3b..276ac14a 100644 --- a/sf_bf_connect/models/jd_eclp.py +++ b/sf_bf_connect/models/jd_eclp.py @@ -20,9 +20,9 @@ class JdEclp(models.Model): 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='总体积') + remark = fields.Char(string='物流面单备注', default='无') + grossWeight = fields.Char(string='总重量', required=True, default=0) + grossVolume = fields.Char(string='总体积', default=0) expressItemName = fields.Char(string='货物名称', required=True, default='非标工件') pickupBeginTime = fields.Char(string='期望取件时间') deliveryType = fields.Selection([('6', '特快零担'), ('25', '特快重货')], string='运输类型', default='25') @@ -59,17 +59,27 @@ class JdEclp(models.Model): 'grossWeight': self.grossWeight, 'grossVolume': self.grossVolume, 'createTime': createTime, - 'createUser': self.user_id, + # 'createUser': self.user_id, 'expressItemName': self.expressItemName, 'pickupBeginTime': self.pickupBeginTime, 'deliveryType': self.deliveryType, 'receiverCompany': self.receiverCompany, }, } - _logger.info('准备调接口') + _logger.info('准备调接口1') url1 = 'https://bfm.cs.jikimo.com/api/create/jd/order' requests.post(url1, json=json1, data=None) - _logger.info('调用成功') + _logger.info('调用成功1') + _logger.info('准备调接口2') + json2 = { + 'params': { + 'orderNo': self.origin, + }, + } + url2 = 'https://bfm.cs.jikimo.com/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'] # else: