流程二脚本提交

air_case/b6_spd3_core_business_flow_database_check/a_a4_流程四_基础模块设置_数据库验证.air/a_a4_流程四_基础模块设置_数据库验证.py

@@ -466,16 +466,17 @@ def check_dept_leader():
 def check_StockArea():
     print('检查新增的库区数据')
     branch_id = get_branch_id()
+    stock_name = get_branch_name() + "中心库房"
+    stock_id = get_stockId_fromdb(stock_name)
     for i in range(4):
-        sql1 = "select * from mcms_stock_shelf order by shelf_code desc LIMIT 1 OFFSET %s;" % (
-            i)
+        sql1 = "select * from mcms_stock_shelf where  stock_id ='%s' order by shelf_code desc LIMIT 1 OFFSET %s;" % (
+            stock_id,i)
         actual = check_mcms_pur_sql(sql1)
         print('actual', actual)
         id = get_id(
-            "select id from mcms_stock_shelf order by shelf_code desc LIMIT 1 OFFSET %s;" % (i))
+            "select id from mcms_stock_shelf  where stock_id ='%s' order by shelf_code desc LIMIT 1 OFFSET %s;" % (stock_id,i))
         dept_name = FileUtils().r_info8("b2_herp3_bs", "所有科室name", 'message6')['deptid1']
-        stock_name = get_branch_name() + "中心库房"
-        stock_id = get_stockId_fromdb(stock_name)
+
         shelf_code = get_stockAreaId_new_fromDb(dept_name, 1)
         shelf_no="自动化测试"
         create_time = get_create_time("select create_time from mcms_stock_shelf where id='%s';" % id)

data/b2_herp3_bs/message

 院区新增:
-  branch_id: h0347-3766
-  branch_name: 东土城路院区Tr0*&
+  branch_id: h0347-3769
+  branch_name: 东土城路院区OiMGv
 科室信息:
-  dept2_id: ada56899acf048d8bf2173b34cd29ece
+  dept2_id: 834b177bda914214b5d447bc8e666b93
   dept2_name: 二级检验科002

data/b2_herp3_bs/message3

 用户名信息:
-  username1: 自动化测试DTfIQ
-  username2: 自动化测试DTfIQ
+  username1: 自动化测试beszx
+  username2: 自动化测试beszx

data/b2_herp3_bs/message4

 一级科室信息:
-  dept1_id: 8dbbd8d215ae489792079befc60ab904
+  dept1_id: 9d59244d8044496c8fc591fb6c4f91eb
   dept1_name: 设备科001

data/b2_herp3_bs/message6

 所有科室id:
-  deptid1: 8dbbd8d215ae489792079befc60ab904
-  deptid2: ada56899acf048d8bf2173b34cd29ece
-  deptid3: 868255a47d62495b9ec6c70c9c70ab8d
-  deptid4: 8d37bfa8c8584fe897659cdfe436e8d3
+  deptid1: 104f2221d2d84b24964925b7c1502a62
+  deptid2: ba1eecfc37564ba99e4abf45837f229a
+  deptid3: 79788dd3488a4612af42120208fb80c7
+  deptid4: 160930dc572a4cc58fa6505d7e7d287e
 所有科室name:
   deptid1: 设备科001
   deptid2: 二级检验科002

data/b2_herp3_bs/message7

 shelfinfo:
-  shelfid: 7e2d4d3dc3094d5baf949c0b2c413f99
-  shelfCode: areah03472662
+  shelfid: ab5560c1d9df4ebdaff41b6482d6be16
+  shelfCode: areah03472670
   areaName: 自动化测试

report/summary.html

@@ -75,9 +75,9 @@ setInterval(updateTime, 1000); // 每秒更新一次时间
         </tr>
 
         <tr width="600">
-            <td class='details-col-elapsed'>5</td>
-            <td class='details-col-elapsed'>5</td>
-            <td class='details-col-elapsed'>0分3秒</td>
+            <td class='details-col-elapsed'>1</td>
+            <td class='details-col-elapsed'>1</td>
+            <td class='details-col-elapsed'>0分9秒</td>
             <td class="details-col-elapsed">100.0%</td>
         </tr>
     </table>
@@ -93,37 +93,9 @@ setInterval(updateTime, 1000); // 每秒更新一次时间
         </tr>
         
         <tr width="600">
-            <td class="details-col-elapsed"><a href='../log/医院注册_正常注册_私立医院/log.html' target='_blank'>医院注册_正常注册_私立医院</a></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">0.349</td>
-            <td class="details-col-elapsed">xiaohesheng</td>
-        </tr>
-        
-        <tr width="600">
-            <td class="details-col-elapsed"><a href='../log/医院注册_注册时医院已存在/log.html' target='_blank'>医院注册_注册时医院已存在</a></td>
-            <td class="success">成功</td>
-            <td class="details-col-elapsed">0.443</td>
-            <td class="details-col-elapsed">xiaohesheng</td>
-        </tr>
-        
-        <tr width="600">
-            <td class="details-col-elapsed"><a href='../log/医院注册正常注册公立医院/log.html' target='_blank'>医院注册正常注册公立医院</a></td>
-            <td class="success">成功</td>
-            <td class="details-col-elapsed">0.327</td>
-            <td class="details-col-elapsed">xiaohesheng</td>
-        </tr>
-        
-        <tr width="600">
-            <td class="details-col-elapsed"><a href='../log/注册医院审核通过/log.html' target='_blank'>注册医院审核通过</a></td>
-            <td class="success">成功</td>
-            <td class="details-col-elapsed">1.543</td>
-            <td class="details-col-elapsed">xiaohesheng</td>
-        </tr>
-        
-        <tr width="600">
-            <td class="details-col-elapsed"><a href='../log/注册医院审核驳回/log.html' target='_blank'>注册医院审核驳回</a></td>
-            <td class="success">成功</td>
-            <td class="details-col-elapsed">1.077</td>
+            <td class="details-col-elapsed">8.989</td>
             <td class="details-col-elapsed">xiaohesheng</td>
         </tr>