数据库验证流程十一脚本编写

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

@@ -139,19 +139,19 @@ def second_dept_Request(hosGoodsId, type):
     print('添加到请领车', 'request_body', request_body)
     result = commonFuc().http_post(url, request_body, headers)
     print('添加到请领车,result', result)
-    return token
+
     # 添加到请领车=============================================
 
 
-def BuyCarSubmit(token):
+def BuyCarSubmit():
     module = "b5_spd3_core_business_flow"
     # # # 登录获取用户id等信息，使用创建的用户登录===========开始
-    # info = FileUtils().r_info8('b2_herp3_bs', "用户名信息", 'message3')
-    # username = info['username1']
-    # password = commonFuc().get_business_data("b2_herp3_bs", "password")
-    # print('username,password', username, password)
-    # # # 获取token和projectCode
-    # token, projectCode, uxid, corpId, info = login(username, password, 2)
+    info = FileUtils().r_info8('b2_herp3_bs', "用户名信息", 'message3')
+    username = info['username1']
+    password = commonFuc().get_business_data("b2_herp3_bs", "password")
+    print('username,password', username, password)
+    # # 获取token和projectCode
+    token, projectCode, uxid, corpId, info = login(username, password, 2)
     # # 登录获取用户id等信息，使用创建的用户登录============结束
     # 我要请领_手工请领_列表查询===========================
     headers = commonFuc().get_business_data(module, "json_headers2",
@@ -163,7 +163,7 @@ def BuyCarSubmit(token):
     print('请领车查询=================', url)
     deptid2 = FileUtils().r_info8("b2_herp3_bs", "所有科室id", 'message6')['deptid5']
     deptname2 = FileUtils().r_info8("b2_herp3_bs", "所有科室name", 'message6')['deptid5']
-    areaCode = get_stockAreaId_new(deptid2, deptname2, 2)
+    areaCode = get_stockAreaId_new_fromDb(deptname2, 2)
     request_body = commonFuc().get_business_data(module, "payload43", areaCode, get_hosid(), deptid2)
 
     print('请领车查询', 'request_body', request_body)
@@ -448,8 +448,8 @@ def main():
         # # # 高值
         second_dept_Request(FileUtils().r_info8("b5_spd3_core_business_flow", "产品审核信息", 'message1')['hosGoodsId'], 2)
         # # # 试剂
-        token=second_dept_Request(FileUtils().r_info8("b5_spd3_core_business_flow", "产品审核信息", 'message3')['hosGoodsId'], 3)
-        BuyCarSubmit(token)  # 请领车提交
+        second_dept_Request(FileUtils().r_info8("b5_spd3_core_business_flow", "产品审核信息", 'message3')['hosGoodsId'], 3)
+        BuyCarSubmit()  # 请领车提交
         for i in range(6):  # 三个单据共审批6次
             approval_center()
         updateUserLoginDefaultRange(get_listUserMgrRangePage1(2))  # 设置登录账号默认权限是二级库

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

@@ -344,7 +344,11 @@ def main():
         set_dept_lead_new(FileUtils().r_info8('b2_herp3_bs', '所有科室id', 'message6')["deptid3"])  # 设置二级科室负责人
         get_stockAreaId_new(FileUtils().r_info8("b2_herp3_bs", "所有科室id", 'message6')['deptid3'],
                             FileUtils().r_info8("b2_herp3_bs", "所有科室name", 'message6')['deptid3'], 3)
-        set_stockShelf_Linkman()  # 设置库区联系人
+        deptName3 = FileUtils().r_info8("b2_herp3_bs", "所有科室name", 'message6')['deptid3']
+        # 设置库区联系人
+        set_stockShelf_Linkman(FileUtils().r_info8('b2_herp3_bs', '所有科室id', 'message6')["deptid3"],
+                               get_stockAreaId2_new_fromDb(deptName3, 2))  # 设置库区联系人
+
         #三级科室产品分配
         dept_goods_distribute(FileUtils().r_info8("b2_herp3_bs", "所有科室id", 'message6')['deptid3'])
 

data/b2_herp3_bs/message

 院区新增:
-  branch_id: h0347-3754
-  branch_name: 东土城路院区)2Fs3
+  branch_id: h0347-3755
+  branch_name: 东土城路院区7R4&E
 科室信息:
-  dept2_id: b03e85ab45a24d1282eb7692dd2ad9d5
+  dept2_id: b12c7c6ca56e4b46b418b319cbadbea5
   dept2_name: 二级检验科002

report/summary.html

@@ -76,9 +76,9 @@ setInterval(updateTime, 1000); // 每秒更新一次时间
 
         <tr width="600">
             <td class='details-col-elapsed'>1</td>
-            <td class='details-col-elapsed'>0</td>
-            <td class='details-col-elapsed'>0分2秒</td>
-            <td class="details-col-elapsed">0.0%</td>
+            <td class='details-col-elapsed'>1</td>
+            <td class='details-col-elapsed'>0分8秒</td>
+            <td class="details-col-elapsed">100.0%</td>
         </tr>
     </table>
 
@@ -93,9 +93,9 @@ setInterval(updateTime, 1000); // 每秒更新一次时间
         </tr>
         
         <tr width="600">
-            <td class="details-col-elapsed"><a href='../log/a_b4流程十一请领业务流_二级库向直送_数据库验证/log.html' target='_blank'>a_b4流程十一请领业务流_二级库向直送_数据库验证</a></td>
-            <td class="fail">失败</td>
-            <td class="details-col-elapsed">2.192</td>
+            <td class="details-col-elapsed"><a href='../log/r_b8库房管理_库区设置_同步库房信息/log.html' target='_blank'>r_b8库房管理_库区设置_同步库房信息</a></td>
+            <td class="success">成功</td>
+            <td class="details-col-elapsed">8.451</td>
             <td class="details-col-elapsed">xiaohesheng</td>
         </tr>