From a4166410ba9940e143f539b4d1c15d29a3c88130 Mon Sep 17 00:00:00 2001 From: tangxuan <2233783319@qq.com> Date: Mon, 3 Apr 2023 14:55:59 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=B0=E9=87=8D=E6=9D=A1=E4=BB=B6=E5=88=A4?= =?UTF-8?q?=E6=96=AD=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/drug/views.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/apps/drug/views.py b/apps/drug/views.py index 62d6181..1f83b57 100644 --- a/apps/drug/views.py +++ b/apps/drug/views.py @@ -60,9 +60,8 @@ def drug_collect(): data = Utils.false_return(msg="药剂已为空瓶") elif str(drug_entity.func_type) != str(func_type): data = Utils.false_return(msg="试剂不属于这里当前管理") - elif drug_entity.remain == '' or drug_entity.remain == None or not drug_entity: - if str(func_type) != "3": - data = Utils.false_return(msg="试剂未称重,请先称重!") + elif str(func_type) != "3" and (drug_entity.remain == '' or drug_entity.remain == None or not drug_entity): + data = Utils.false_return(msg="试剂未称重,请先称重!") else: customer_id = drug_entity.customer_id client_id = drug_entity.client_id