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

air_case/b5_spd3_core_business_flow/a_b5流程十二请领业务流_二级库向二级库.air/a_b5流程十二请领业务流_二级库向二级库.py

@@ -419,6 +419,7 @@ def pick_execute():
 # 复核===================================
 def main():
     try:
+        # ================暂时注释======================
         add_dept2()  # 新增一个二级科室
         add_new_deptinfo()  # 写入科室信息到文件中
         grants_user_new()  # 新增授权
@@ -438,7 +439,7 @@ def main():
         currentDeptId = FileUtils().r_info8("b2_herp3_bs", "所有科室id", 'message6')['deptid5']
         targetDeptId = FileUtils().r_info8("b2_herp3_bs", "所有科室id", 'message6')['deptid2']
         edit_goods_target(currentDeptId, targetDeptId)
-
+        #================暂时注释=========================
         updateUserLoginDefaultRange(get_listUserMgrRangePage1(5))  # 设置登录账号默认权限是新二级库
         # # # 低值
         second_dept_Request(FileUtils().r_info8("b5_spd3_core_business_flow", "产品审核信息", 'message2')['hosGoodsId'], 1)

air_case/public1/public1/public1.py

@@ -5,6 +5,7 @@ from airtest.core.helper import using
 from air_case.b1_herp3_login.登录内网系统.登录内网系统 import login_system
 from common.common_func import commonFuc
 from common.db.sql.sql_del_branch_info import delData
+from common.db.sql.sql_tools import get_id, process_tuple
 from common.fileUtls import FileUtils
 import json
 import time
@@ -461,7 +462,8 @@ def set_dept_user(dept_id, deptName, type=1):
 
     # ====获取库区id===== 开始==========
 
-    stockAreaId = get_stockAreaId(dept_id, stockId)
+    # stockAreaId = get_stockAreaId(dept_id, stockId)
+    stockAreaId=process_tuple(get_id("select id from mcms_stock_shelf  where address='%s' and del_flag=0 order by CREATE_TIME desc LIMIT 1;"%(deptName)))
     print(stockAreaId)
     # ====获取库区id===== 结束==========
     # dept_query_all()
@@ -491,13 +493,14 @@ def set_dept_user(dept_id, deptName, type=1):
     headers = commonFuc().get_business_data(module, "json_headers2",
                                             commonFuc().get_business_data(module, "json_contentType"), token,
                                             commonFuc().get_business_data(module, "X-APP-CODE"))
-    url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module, "basic_stockUser_page_url")
-    request_body = commonFuc().get_business_data(module, "payload65_3", dept_id, stockAreaId, get_hosid())
-    print('查询库区是否已经存在人员', request_body)
-    result = commonFuc().http_post(url, request_body, headers)
-    print('查询库区是否已经存在人员', result)
-    userCode = commonFuc().analysis_json('userCode',
-                                         commonFuc().analysis_json('data', commonFuc().analysis_json('data', result)))
+    # url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module, "basic_stockUser_page_url")
+    # request_body = commonFuc().get_business_data(module, "payload65_3", dept_id, stockAreaId, get_hosid())
+    # print('查询库区是否已经存在人员', request_body)
+    # result = commonFuc().http_post(url, request_body, headers)
+    # print('查询库区是否已经存在人员', result)
+    # userCode = commonFuc().analysis_json('userCode',
+    #                                      commonFuc().analysis_json('data', commonFuc().analysis_json('data', result)))
+    userCode=delData().del_mcms_stock_user(username1,dept_id)
     # print('userCode',userCode)
     if userCode != username1:
         # 查询库区是否已经存在人员，不需要重复添加===============

common/db/sql/sql_del_branch_info.py

@@ -786,6 +786,18 @@ class delData(object):
         # print(results)
         s = ''.join(map(str, results))
         return s
+    def del_mcms_stock_user(self,user_code,dept_id):
+        # 内网的
+        connection = pymysql.connect(host="10.17.65.108", user="root", password="Cmic.2023", database="spd3_herp_test2",
+                                     charset="utf8")
+        cursor = connection.cursor()
+        # 删除库区用户
+        sql1 = "delete from  mcms_stock_user where user_code='%s' and dept_id='%s';"%(user_code,dept_id)
+        cursor.execute(sql1)
+        cursor.execute("commit;")
+        print('库区人员信息删除成功 ')
+        cursor.close()
+
 # delData().Delete_branch_by_id()
 # delData().Delete_goods_change_info()
 # delData().Delete_sys_config()