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

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

@@ -165,7 +165,10 @@ def BuyCarSubmit():
     print('请领车查询=================', url)
     deptid3 = FileUtils().r_info8("b2_herp3_bs", "所有科室id", 'message6')['deptid3']
     deptname3 = FileUtils().r_info8("b2_herp3_bs", "所有科室name", 'message6')['deptid3']
-    areaCode = get_stockAreaId_new(deptid3, deptname3, 3)
+    # areaCode = get_stockAreaId_new(deptid3, deptname3, 3)
+    areaCode = process_tuple(get_id(
+        "select shelf_code from mcms_stock_shelf where address='三级检测组003'and shelf_name='默认库区'order by create_time desc LIMIT 1;"))
+
     request_body = commonFuc().get_business_data(module, "payload43", areaCode, get_hosid(), deptid3)
 
     print('请领车查询', 'request_body', request_body)

data/b2_herp3_bs/data

@@ -284,7 +284,6 @@ json_headers2: {
 "payload46": {"queryObject": {"goodsName": "","goodsMfrsName": "","purModes": [],"hosId": "h0347","branchId": "%s","grantRule": 1,"goodsSpec": "xhs"},"pageNum": 1, "pageSize": 50}
 "payload47": {"branchGoodsIds": ["%s"],"hosGoodsIds": ["%s"],"grantRule": 2,"branchId": "%s"}
 "payload47_2": {"branchGoodsIds": ["%s"],"hosGoodsIds": ["%s"],"grantRule": 3,"branchId": "%s"}
-"payload47_3": {"branchGoodsIds": ["%s"],"hosGoodsIds": ["%s"],"grantRule": 1,"branchId": "%s"}
 
 "payload48": {"branchGoodsIds": ["%s"],"hosGoodsIds": ["%s"],"grantRule": 3,"branchId": "%s"}
 "payload49": {"queryObject": {"goodsName": "","provName": "","purModes": [],"hosId": "h0347","settleType": 1,"goodsSpec": "" },"pageNum": 1,"pageSize": 100}

data/b2_herp3_bs/message

 院区新增:
-  branch_id: h0347-3745
-  branch_name: 东土城路院区&BvGU
+  branch_id: h0347-3742
+  branch_name: 东土城路院区2pj378
 科室信息:
-  dept2_id: e6a7862c7b3d49a69ab93979a8f32710
+  dept2_id: ac8dfc2ae28d4c3d9e7e0599a8860d06
   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'>1</td>
-            <td class='details-col-elapsed'>0分8秒</td>
-            <td class="details-col-elapsed">100.0%</td>
+            <td class='details-col-elapsed'>0</td>
+            <td class='details-col-elapsed'>0分12秒</td>
+            <td class="details-col-elapsed">0.0%</td>
         </tr>
     </table>
 
@@ -93,9 +93,9 @@ setInterval(updateTime, 1000); // 每秒更新一次时间
         </tr>
         
         <tr width="600">
-            <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.277</td>
+            <td class="details-col-elapsed"><a href='../log/r_d0库房管理_库区设置_人员管理_添加人员_查询人员/log.html' target='_blank'>r_d0库房管理_库区设置_人员管理_添加人员_查询人员</a></td>
+            <td class="fail">失败</td>
+            <td class="details-col-elapsed">12.4</td>
             <td class="details-col-elapsed">xiaohesheng</td>
         </tr>