Merge remote-tracking branch 'remotes/origin/master' into core_flow

common/db/sql/sql_del_branch_info.py

@@ -477,16 +477,16 @@ 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']
-        # 条码
-        # 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)
-        # 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)
-        # cursor.execute(sql2)
-        # cursor.execute(sql3)
-        # cursor.execute("commit;")
+        # 包库存
+        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)
+        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)
+        cursor.execute(sql2)
+        cursor.execute(sql3)
+        cursor.execute("commit;")
         # 批次
         sql = "delete from mcms_hos_batch where branch_id='%s';" % branch_id
         cursor.execute(sql)

data/b6_spd3_core_business_flow_database_check/data

@@ -487,4 +487,30 @@
 #库房数据
 "check_mcms_stock_info0": '{"id": "%s", "hos_id": "%s", "pid": "%s", "branch_id": "%s", "stock_code": "%s", "stock_name": "三级检测组003库房", "stock_fzr": None, "stock_phone": "12401003250", "dept_id": "%s", "stock_level": "3", "short_pinyin": "sjjcz003", "address": "三级检测组003", "mgr_type": 1, "remark": None, "version": 1, "lock_flag": None, "create_user": "%s", "create_time": %s, "last_modified": %s, "last_modified_user": "%s", "del_flag": 0, "ordinal": 99999999}'
 "check_mcms_stock_info1": '{"id": "%s", "hos_id": "%s", "pid": "%s", "branch_id": "%s", "stock_code": "%s", "stock_name": "二级检验科002库房", "stock_fzr": None, "stock_phone": "13401003250", "dept_id": "%s", "stock_level": "2", "short_pinyin": "ejjyk002", "address": "二级检验科002", "mgr_type": 1, "remark": None, "version": 1, "lock_flag": None, "create_user": "%s", "create_time": %s, "last_modified": %s, "last_modified_user": "%s", "del_flag": 0, "ordinal": 99999999}'
-"check_mcms_stock_info2": '{"id": "%s", "hos_id": "%s", "pid": "%s", "branch_id": "%s", "stock_code": "%s", "stock_name": "东土城路院区wSIoT中心库房", "stock_fzr": None, "stock_phone": "13401003250", "dept_id": "%s", "stock_level": "1", "short_pinyin": "sbk001", "address": "设备科001", "mgr_type": 1, "remark": None, "version": 0, "lock_flag": None, "create_user": "%s", "create_time": %s, "last_modified": %s, "last_modified_user": "%s", "del_flag": 0, "ordinal": 99999999}'
+"check_mcms_stock_info2": '{"id": "%s", "hos_id": "%s", "pid": "%s", "branch_id": "%s", "stock_code": "%s", "stock_name": "%s中心库房", "stock_fzr": None, "stock_phone": "13401003250", "dept_id": "%s", "stock_level": "1", "short_pinyin": "sbk001", "address": "设备科001", "mgr_type": 1, "remark": None, "version": 0, "lock_flag": None, "create_user": "%s", "create_time": %s, "last_modified": %s, "last_modified_user": "%s", "del_flag": 0, "ordinal": 99999999}'
+
+#新增用户数据检查
+"check_sys_user": '{"id": "%s", "user_code": "%s", "kind": 0, "enable_flag": 1, "create_datetime": None, "create_user_id": None, "last_update_datetime": %s, "version": 0, "create_time": %s, "create_user": "%s", "last_modified": %s, "last_modified_user": "%s", "corp_id": "%s"}'
+
+#检查科室添加产品信息
+"check_mcms_dept_goods_info0": '{"id": "%s", "hos_id": "%s", "hos_name": "%s", "dept_id": "%s", "dept_name": "二级检验科002", "hos_goods_id": "%s", "stock_upper": Decimal("0.00"), "stock_lower": Decimal("0.00"), "mgr_type": None, "packet_qty": None, "pkg_def_id": None, "stock_id": None, "req_num": None, "tb_status": 1, "target_dept_id": "%s", "shelf_code": "%s-A-01-01", "grant_way": 1, "consume_mode": None, "auto_unpack": None, "limit_flag": 0, "buy_round": 0, "buy_allow": 1, "version": 0, "create_user": "%s", "create_time": %s, "last_modified": %s, "last_modified_user": "%s", "branch_id": "%s", "coding_type": 0}'
+"check_mcms_dept_goods_info1": '{"id": "%s", "hos_id": "%s", "hos_name": "%s", "dept_id": "%s", "dept_name": "二级检验科002", "hos_goods_id": "%s", "stock_upper": Decimal("0.00"), "stock_lower": Decimal("0.00"), "mgr_type": None, "packet_qty": None, "pkg_def_id": None, "stock_id": None, "req_num": None, "tb_status": 1, "target_dept_id": "%s", "shelf_code": "%s-A-01-01", "grant_way": 1, "consume_mode": None, "auto_unpack": None, "limit_flag": 0, "buy_round": 0, "buy_allow": 1, "version": 0, "create_user": "%s", "create_time": %s, "last_modified": %s, "last_modified_user": "%s", "branch_id": "%s", "coding_type": 0}'
+
+"check_mcms_dept_goods_info2": '{"id": "%s", "hos_id": "%s", "hos_name": "%s", "dept_id": "%s", "dept_name": "二级检验科002", "hos_goods_id": "%s", "stock_upper": Decimal("0.00"), "stock_lower": Decimal("0.00"), "mgr_type": None, "packet_qty": Decimal("100.00"), "pkg_def_id": "%s", "stock_id": None, "req_num": None, "tb_status": 1, "target_dept_id": "%s", "shelf_code": "%s-A-01-01", "grant_way": 1, "consume_mode": None, "auto_unpack": 0, "limit_flag": 0, "buy_round": 0, "buy_allow": 1, "version": 0, "create_user": "%s", "create_time": %s, "last_modified": %s, "last_modified_user": "%s", "branch_id": "%s", "coding_type": 0}'
+
+"check_mcms_dept_goods_info3": '{"id": "%s", "hos_id": "%s", "hos_name": "%s", "dept_id": "%s", "dept_name": "二级检验科002", "hos_goods_id": "%s", "stock_upper": Decimal("0.00"), "stock_lower": Decimal("0.00"), "mgr_type": None, "packet_qty": Decimal("100.00"), "pkg_def_id": "%s", "stock_id": None, "req_num": None, "tb_status": 1, "target_dept_id": "%s", "shelf_code": "%s-A-01-01", "grant_way": 1, "consume_mode": None, "auto_unpack": 0, "limit_flag": 0, "buy_round": 0, "buy_allow": 1, "version": 0, "create_user": "%s", "create_time": %s, "last_modified": %s, "last_modified_user": "%s", "branch_id": "%s", "coding_type": 0}'
+"check_mcms_dept_goods_info4": '{"id": "%s", "hos_id": "%s", "hos_name": "%s", "dept_id": "%s", "dept_name": "二级检验科002", "hos_goods_id": "%s", "stock_upper": Decimal("0.00"), "stock_lower": Decimal("0.00"), "mgr_type": None, "packet_qty": None, "pkg_def_id": None, "stock_id": None, "req_num": None, "tb_status": 1, "target_dept_id": "%s", "shelf_code": "%s-A-01-01", "grant_way": 1, "consume_mode": None, "auto_unpack": None, "limit_flag": 0, "buy_round": 0, "buy_allow": 1, "version": 0, "create_user": "%s", "create_time": %s, "last_modified": %s, "last_modified_user": "%s", "branch_id": "%s", "coding_type": 0}'
+#用户授权数据
+"check_sys_user_mgr_range_info0": '{"id": "%s", "user_id": "%s", "corp_id": "%s", "mgr_range_id": "%s", "mgr_range_name": "%s", "default_flag": 1, "project_code": "herp", "mgr_branch_id": "%s", "mgr_branch_name": "%s", "mgr_range_kind": 0, "version": 0, "create_user": "%s", "create_time": %s, "last_modified_user": "%s", "last_modified": %s, "ext_str1": "%s", "ext_str2": None, "ext_str3": None}'
+"check_sys_user_mgr_range_info1": '{"id": "%s", "user_id": "%s", "corp_id": "%s", "mgr_range_id": "%s", "mgr_range_name": "%s", "default_flag": 0, "project_code": "herp", "mgr_branch_id": "%s", "mgr_branch_name": "%s", "mgr_range_kind": 0, "version": 0, "create_user": "%s", "create_time": %s, "last_modified_user": "%s", "last_modified": %s, "ext_str1": "%s", "ext_str2": None, "ext_str3": None}'
+"check_sys_user_mgr_range_info2": '{"id": "%s", "user_id": "%s", "corp_id": "%s", "mgr_range_id": "%s", "mgr_range_name": "%s", "default_flag": 0, "project_code": "herp", "mgr_branch_id": "%s", "mgr_branch_name": "%s", "mgr_range_kind": 0, "version": 0, "create_user": "%s", "create_time": %s, "last_modified_user": "%s", "last_modified": %s, "ext_str1": "%s", "ext_str2": None, "ext_str3": None}'
+"check_sys_user_mgr_range_info3": '{"id": "%s", "user_id": "%s", "corp_id": "%s", "mgr_range_id": "%s", "mgr_range_name": "%s", "default_flag": 0, "project_code": "herp", "mgr_branch_id": "%s", "mgr_branch_name": "%s", "mgr_range_kind": 0, "version": 0, "create_user": "%s", "create_time": %s, "last_modified_user": "%s", "last_modified": %s, "ext_str1": "%s", "ext_str2": None, "ext_str3": None}'
+
+#检查部门负责人数据
+"check_dept_leader": '{"id": "%s", "pid": "%s", "code": "%s", "self_code": None, "corp_id": "%s", "branch_id": "%s", "corp_kind": "1", "ename": "设备科001", "cname": "设备科001", "dept_level": 1, "dept_type": "1", "ext1": None, "ext2": None, "ext3": None, "ext4": None, "ext5": None, "dept_cate": 1, "dept_kind": 1, "ordinal": None, "short_pinyin": "sbk001", "address": "设备科001", "contact_way": "13401003250", "scm_code": None, "erp_code": "001", "remark": None, "node_kind": None, "flag": "1", "last_update_datetime": %s, "version": 3, "create_time": %s, "create_user": "%s", "last_modified_user": "%s", "last_modified": %s, "user_leader_id": "%s"}'
+
+#检查库区数据
+"check_mcms_stock_shelf0": '{"id": "%s", "stock_id": "%s", "shelf_code": "%s-2-02-02", "shelf_no": "%s-2-02-02", "shelf_name": None, "shelf_type": None, "stock_type": 1, "default_flag": 0, "special_flag": None, "parent_id": "%s", "linkman": None, "rec_phone": None, "level_code": None, "tb_status": 1, "shelf_kind": 0, "create_user": "%s", "create_time": %s, "last_modified": %s, "last_modified_user": "%s", "version": 0, "del_flag": 0, "address": None}'
+"check_mcms_stock_shelf1": '{"id": "%s", "stock_id": "%s", "shelf_code": "%s-2-02-02", "shelf_no": "%s-2-02-02", "shelf_name": None, "shelf_type": None, "stock_type": 1, "default_flag": 0, "special_flag": None, "parent_id": "%s", "linkman": None, "rec_phone": None, "level_code": None, "tb_status": 1, "shelf_kind": 0, "create_user": "%s", "create_time": %s, "last_modified": %s, "last_modified_user": "%s", "version": 0, "del_flag": 0, "address": None}'
+"check_mcms_stock_shelf2": '{"id": "%s", "stock_id": "%s", "shelf_code": "%s-2-02-02", "shelf_no": "%s-2-02-02", "shelf_name": None, "shelf_type": None, "stock_type": 1, "default_flag": 0, "special_flag": None, "parent_id": "%s", "linkman": None, "rec_phone": None, "level_code": None, "tb_status": 1, "shelf_kind": 0, "create_user": "%s", "create_time": %s, "last_modified": %s, "last_modified_user": "%s", "version": 0, "del_flag": 0, "address": None}'
+"check_mcms_stock_shelf3": '{"id": "%s", "stock_id": "%s", "shelf_code": "%s-2-02-02", "shelf_no": "%s-2-02-02", "shelf_name": None, "shelf_type": None, "stock_type": 1, "default_flag": 0, "special_flag": None, "parent_id": "%s", "linkman": None, "rec_phone": None, "level_code": None, "tb_status": 1, "shelf_kind": 0, "create_user": "%s", "create_time": %s, "last_modified": %s, "last_modified_user": "%s", "version": 0, "del_flag": 0, "address": None}'
\ No newline at end of file