From 19a66d2c819fb49356117b115d8ae0968ad63232 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=83=A1=E5=B0=A7?= Date: Fri, 21 Mar 2025 16:44:49 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=B1=8F=E8=94=BD=E7=89=A9=E6=B5=81?= =?UTF-8?q?=E4=B8=8B=E5=8D=95=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_bf_connect/models/jd_eclp.py | 21 +++++++++++---------- sf_bf_connect/views/view.xml | 5 +++-- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/sf_bf_connect/models/jd_eclp.py b/sf_bf_connect/models/jd_eclp.py index aa27736c..43b8424c 100644 --- a/sf_bf_connect/models/jd_eclp.py +++ b/sf_bf_connect/models/jd_eclp.py @@ -50,16 +50,17 @@ class JdEclp(models.Model): logistics_way = fields.Selection([('自提', '自提'), ('到付', '到付'), ('在线支付', '在线支付')], string='物流方式', readonly=True) - def button_validate(self): - """ - 重写出库方法,获取物流面单 - """ - res = super(JdEclp, self).button_validate() - if self.check_out == 'OUT': - if self.logistics_way != '自提' and self.logistics_way: - if self.logistics_status != '2': - raise ValidationError('非自提订单,必须先下物流单,并获取物流面单后才可出库!') - return res + # 暂时屏蔽非自提必须走物流单的逻辑 + # def button_validate(self): + # """ + # 重写出库方法,获取物流面单 + # """ + # res = super(JdEclp, self).button_validate() + # if self.check_out == 'OUT': + # if self.logistics_way != '自提' and self.logistics_way: + # if self.logistics_status != '2': + # raise ValidationError('非自提订单,必须先下物流单,并获取物流面单后才可出库!') + # return res @api.depends('name') diff --git a/sf_bf_connect/views/view.xml b/sf_bf_connect/views/view.xml index f4245343..c40c36ca 100644 --- a/sf_bf_connect/views/view.xml +++ b/sf_bf_connect/views/view.xml @@ -32,10 +32,11 @@ -