Merge remote-tracking branch 'origin/master'

# Conflicts:
#	air_case/b5_spd3_core_business_flow/a_a1_流程一外网企业注册审批.air/a_a1_流程一外网企业注册审批.py
#	air_case/b5_spd3_core_business_flow/a_b8流程十五退库业务_三级库向二级库退库.air/a_b8流程十五退库业务_三级库向二级库退库.py
#	data/b5_spd3_core_business_flow/message18
#	report/summary.html

air_case/b5_spd3_core_business_flow/a_a1_流程一外网企业注册审批.air/a_a1_流程一外网企业注册审批.py

@@ -32,5 +32,4 @@ def main():
         print('=================流程一结束=================')
     except:
         commonFuc().check_text_exist_result_text('error', 'succees')
-
 # main()
\ No newline at end of file

air_case/b5_spd3_core_business_flow/execute.air/execute.py

@@ -178,4 +178,3 @@ def flow21():
 #     commonFuc().check_text_exist_result_text('succees', 'succees')
 # except:
 #     commonFuc().check_text_exist_result_text('error', 'succees')
-flow1()
\ No newline at end of file

data/a2_mdm3_ea/message

 企业信息:
-  e_id: CR202407050355
-  cname: 国药集团公司Kp9af
+  e_id: CR202407050389
+  cname: 国药集团公司u9Dtn

data/a3_mdm3_hs/message

 医院信息:
-  h_id: 湖南省人民医院8Hkj&
-  h_name: 湖南省人民医院8Hkj&
+  h_id: 湖南省人民医院IMFSr
+  h_name: 湖南省人民医院IMFSr

data/b2_herp3_bs/message6

@@ -3,8 +3,10 @@
   deptid2: 232328e5ceb44b799efba96c512618bf
   deptid3: eefab2fb6d6e423da8e3df5e433a01a5
   deptid4: 6cea679813db435099a2a3c0bcf1de0e
+  deptid5: feca3d1dcffb49ddba9052d401e60d8f
 所有科室name:
   deptid1: 设备科001
   deptid2: 二级检验科002
   deptid3: 三级检测组003
   deptid4: 科室004
+  deptid5: 二级科室005

data/b5_spd3_core_business_flow/message18

 条码信息:
   list_a:
   - &id001
-    id: UT240612000803
-    snCode: UT240612000803
-    ssccCode: '010839000184006228'
-    pkgCodeSee: 013667000004075010333112406121724121921UT240612000803
-    hosGoodsId: h034700004075
-    hosGoodsCode: '00004075'
-    goodsCode: '00004075'
-    goodsName: 一次性注射器_低值xaYjQ
+    id: UT240705000413
+    snCode: UT240705000413
+    ssccCode: '010839000187076426'
+    pkgCodeSee: 010112345678901210333112407051725011121UT240705000413
+    hosGoodsId: h034700004462
+    hosGoodsCode: '00004462'
+    goodsCode: '00004462'
+    goodsName: 一次性注射器_低值C2g9i
     goodsSpec: G-31891
     goodsMfrsName: 德国歌德公司 Geuder AG
     unit: 支
     purMode: 10
     batchCode: '333'
-    productDate: '2024-06-12'
-    expdtDate: '2024-12-19'
+    productDate: '2024-07-05'
+    expdtDate: '2025-01-11'
     pkgDefName: '100'
     pkgDefQty: 100.0
-    stockId: 2579f302b2c3440eb9cf2b52d1e44378
-    stockName: 三级检测组003库房
+    stockId: 6898e3a36c3c4b36bf1ea0648b26cba4
+    stockName: 二级检验科002库房
     areaName: 默认库区
-    areaCode: areah03472290
+    areaCode: areah03472631
     lockStatus: 0
     unitName: 100支/100
-    shelfCode: areah03472290-A-01-01
+    shelfCode: areah03472631-A-01-01
     shelfNo: A01-A-01-01
-    pkgDefId: 192b76e92d77496294bb16d04feeecc4
-    extInfo: '{"pkgDefId": "192b76e92d77496294bb16d04feeecc4", "pkgDefQty": 100, "purBillId":
-      "CG2024061218549", "pkgDefName": "100", "distrBillId": "PSh0347202406120018",
-      "inStockTime": "2024-06-12 13:40:57", "distrDetailId": "03838382", "certificateCode":
+    pkgDefId: db284f5e13594188b4aa09a5832293ec
+    extInfo: '{"pkgDefId": "db284f5e13594188b4aa09a5832293ec", "pkgDefQty": 100, "purBillId":
+      "CG2024070520624", "pkgDefName": "100", "distrBillId": "PSh0347202407050030",
+      "inStockTime": "2024-07-05 11:21:50", "distrDetailId": "03839284", "certificateCode":
       ""}'
     bottleId:
     pkgType: '16'
@@ -39,9 +39,9 @@
     qty: 1
     shelfKind: 0
     shelfKindName: 普通货位
-    provName: 国药集团公司2u7a4
-    provId: p1e28e
-    inStockDate: '2024-06-12 13:40:56'
+    provName: 国药集团公司GxzLS
+    provId: p1e31d
+    inStockDate: '2024-07-05 11:21:50'
     mfrCode:
     made: 德国
     price:

main1/main_text.py

@@ -91,14 +91,19 @@ def main_text():
     def flow9():
         from execute import flow12
         flow12()
+        tkinter.messagebox.showinfo('流程十二执行完毕','流程十二执行完毕')
         # sys.exit(0)
     def flow10():
         from execute import flow13
         flow13()
+        tkinter.messagebox.showinfo('流程十三执行完毕','流程十三执行完毕')
+
         # sys.exit(0)
     def flow11():
         from execute import flow14
         flow14()
+        tkinter.messagebox.showinfo('flow14执行完毕','flow14执行完毕')
+
         # sys.exit(0)
     def flow12():
         from execute import flow15

report/summary.html

@@ -75,9 +75,9 @@ setInterval(updateTime, 1000); // 每秒更新一次时间
         </tr>
 
         <tr width="600">
-            <td class='details-col-elapsed'>1</td>
-            <td class='details-col-elapsed'>1</td>
-            <td class='details-col-elapsed'>2分34秒</td>
+            <td class='details-col-elapsed'>5</td>
+            <td class='details-col-elapsed'>5</td>
+            <td class='details-col-elapsed'>0分4秒</td>
             <td class="details-col-elapsed">100.0%</td>
         </tr>
     </table>
@@ -93,9 +93,37 @@ setInterval(updateTime, 1000); // 每秒更新一次时间
         </tr>
         
         <tr width="600">
-            <td class="details-col-elapsed"><a href='../log/a_b6流程十三请领业务流_三级库向二级库/log.html' target='_blank'>a_b6流程十三请领业务流_三级库向二级库</a></td>
+            <td class="details-col-elapsed"><a href='../log/医院注册_正常注册_私立医院/log.html' target='_blank'>医院注册_正常注册_私立医院</a></td>
             <td class="success">成功</td>
-            <td class="details-col-elapsed">154.164</td>
+            <td class="details-col-elapsed">0.287</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.326</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.241</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">2.341</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.283</td>
             <td class="details-col-elapsed">xiaohesheng</td>
         </tr>