Merge branch develop into feature/增加一键合并下发功能,修正合并下发逻辑

This commit is contained in:
马广威
2023-04-24 14:33:44 +08:00
1075 changed files with 245703 additions and 5606 deletions

View File

@@ -1,4 +1,4 @@
import cpca
#import cpca
import logging
import base64
import requests
@@ -37,7 +37,7 @@ class JdEclp(models.Model):
deliveryType = fields.Selection([('6', '特快零担'), ('25', '特快重货')], string='运输类型', default='25')
# bill = fields.Char(string='物流面单')
bill = fields.Many2one('ir.attachment', string='物流面单', compute='query_bill_pdf')
# bill = fields.Many2one('ir.attachment', string='物流面单', compute='query_bill_pdf')
# bill_show = fields.Binary(string='物流面单展示', readonly=True, related='self.bill.datas')
bill_show = fields.Binary(string='物流面单展示', readonly=True)