From 2bb510a1e474deb6bd7bae72008020df52d60870 Mon Sep 17 00:00:00 2001 From: "apan_youxiang@163.com" Date: Thu, 8 Sep 2022 14:19:51 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=99=A8=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/drug_template/views.py | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/apps/drug_template/views.py b/apps/drug_template/views.py index 7c49a34..f9c3bac 100644 --- a/apps/drug_template/views.py +++ b/apps/drug_template/views.py @@ -99,22 +99,16 @@ def bind_tmp_input_db(): customer_id=customer_id, drug_info=drug_info, user_info=user_info ) - # finds = [ - # "name", "cas_number", "english_name", "purity", "manufacturer", "distributor", - # "production_date", "shelf_life", "net_weight_unit", "net_weight", "tp", "price", - # "place", "expiration_date" - # ] - # key_dict = {} - # for i in finds: - # key_dict[i] = drug_info.get(i) + # 预估质量 + remain_num = drug_info.get("remain") + if not remain_num: + remain_num = drug_info.get("total") new_dict = { "medicament_id": Utils.UUID(), "variety_id": drug_variety.variety_id, "bar_code": bar_code, "customer_id": customer_id, "client_id": client_id, - # "expiration_date": datetime.datetime.strptime(drug_info.get('production_date'), "%Y-%m-%d") + datetime.timedelta( - # days=drug_info.get("shelf_life")).strftime("%Y-%m-%d %H:%M:%S"), "inventory_warning_value":10, "shelf_life_warning_value":10, "use_days_warning_value":10, @@ -122,7 +116,8 @@ def bind_tmp_input_db(): "put_in_date": Utils.get_str_datetime(), "put_in_user_id": user_info.user_id, "put_in_user_name": user_info.real_name, - "status":1 + "status":1, + "remain":remain_num } finds_list = dir(EntityMedicament()) for i in finds_list: