diff --git a/common/db/sql/sql_del_branch_info.py b/common/db/sql/sql_del_branch_info.py index b49ba918188c96b11c7fe9381129aadca95705ca..2b402db184b6bfe8f111e498b5bd3b1df856a854 100644 --- a/common/db/sql/sql_del_branch_info.py +++ b/common/db/sql/sql_del_branch_info.py @@ -313,10 +313,13 @@ class delData(object): hosGoodsId1 = FileUtils().r_info8("b5_spd3_core_business_flow", "产品审核信息", 'message1')['hosGoodsId'] hosGoodsId2 = FileUtils().r_info8("b5_spd3_core_business_flow", "产品审核信息", 'message2')['hosGoodsId'] hosGoodsId3 = FileUtils().r_info8("b5_spd3_core_business_flow", "产品审核信息", 'message3')['hosGoodsId'] + # + info = FileUtils().r_info8('b2_herp3_bs', "用户名信息", 'message3') + username = info['username1'] # 条码 sql1 = "delete from mcms_pkg where branch_id='%s';" % branch_id - sql2 = "delete from mcms_pkg_batch where hos_goods_id in('%s','%s','%s');" % ( - hosGoodsId1, hosGoodsId2, hosGoodsId3) + sql2 = "delete from mcms_pkg_batch where hos_goods_id in('%s','%s','%s') and create_user !=(select id from sys_user where user_code='%s');" % ( + hosGoodsId1, hosGoodsId2, hosGoodsId3,username) sql3 = "delete from hdi_barcode where branch_id='%s';" % branch_id # sql4 = "delete from cabinet_epc_info where branch_id=%s" % branch_id cursor.execute(sql1) diff --git a/report/summary.html b/report/summary.html index 20b703e08987e8ca05d54f59655d9d4a67db9954..30f65f7b4ca901c123cfda307d06ebbaa344c843 100644 --- a/report/summary.html +++ b/report/summary.html @@ -75,10 +75,10 @@ setInterval(updateTime, 1000); // 每秒更新一次时间