Merge branch 'master' of C:\pycharmprojects\autotest-airtest-web with conflicts.

data/b5_spd3_core_business_flow/message10

 低值配送单号:
-  distrBillId1: PSh0347202407050063
-  distrBillId2: PSh0347202407050063
+  distrBillId1: PSh0347202406120038
+  distrBillId2: PSh0347202406120038
 高值配送单号:
-  distrBillId1: PSh0347202407050064
-  distrBillId2: PSh0347202407050064
+  distrBillId1: PSh0347202406120039
+  distrBillId2: PSh0347202406120039
 试剂配送单号:
-  distrBillId1: PSh0347202407050065
-  distrBillId2: PSh0347202407050065
+  distrBillId1: PSh0347202406120040
+  distrBillId2: PSh0347202406120040

data/b5_spd3_core_business_flow/message11

 采购计划单号高值:
-  orderNo1: PLAN2024070531447
-  orderNo2: PLAN2024070531447
+  orderNo1: PLAN2024061228325
+  orderNo2: PLAN2024061228325

data/b5_spd3_core_business_flow/message12

 采购计划单号试剂:
-  orderNo1: PLAN2024070531449
-  orderNo2: PLAN2024070531449
+  orderNo1: PLAN2024061228326
+  orderNo2: PLAN2024061228326

data/b5_spd3_core_business_flow/message13

@@ -3,27 +3,27 @@
   - &id001
     - id:
       hosId: h0347
-      branchId: h0347-3729
+      branchId: h0347-3667
       deptId:
       taskType: 1
-      sourceOrgId: p1e31d
-      sourceOrgName: 国药集团公司GxzLS
-      sourceOrderNo: PSh0347202407050065
+      sourceOrgId: p1e28e
+      sourceOrgName: 国药集团公司2u7a4
+      sourceOrderNo: PSh0347202406120040
       billMode: '66'
       stockKind:
       purMode:
-      sourceId: PSh0347202407050065
+      sourceId: PSh0347202406120040
       sourceDetailId:
       sourceType: PSD
       sourceTypeName: 配送单
       sourceVersion: 1
-      planOrderNo: PLAN2024070531449
-      purOrderNo: CG2024070520656
-      recOrgId: 232328e5ceb44b799efba96c512618bf
+      planOrderNo: PLAN2024061228326
+      purOrderNo: CG2024061218570
+      recOrgId: a463883417d44685862ebc9eb9c62990
       recOrgName: 二级检验科002
-      billRelationJson: '{"buyBillId":"Bh03472024070500093","planBillId":"Ph034720240705028094","planOrderNo":"PLAN2024070531449","buyOrderNo":"BUY2024070505892","purOrderNo":"CG2024070520656","purBillId":"Ch034720240705000091","purBillDate":"2024-07-05
-        12:24:49","distrBillId":"PSh0347202407050065","distrOrderNo":"PSh0347202407050065"}'
-      taskDate: '2024-07-05 12:25:21'
+      billRelationJson: '{"buyBillId":"Bh03472024061200044","planBillId":"Ph034720240612024971","planOrderNo":"PLAN2024061228326","buyOrderNo":"BUY2024061204965","purOrderNo":"CG2024061218570","purBillId":"Ch034720240612000094","purBillDate":"2024-06-12
+        13:52:51","distrBillId":"PSh0347202406120040","distrOrderNo":"PSh0347202406120040"}'
+      taskDate: '2024-06-12 13:53:11'
       taskDateStart:
       taskDateEnd:
       billModeList:

data/b5_spd3_core_business_flow/message14

@@ -3,17 +3,17 @@
   - &id001
     - purMode: 60
       unitName: 100支/100
-      hosGoodsId: h034700004463
+      hosGoodsId: h034700004076
       mdmGoodsCode:
-      spdGoodsCode: '11661416'
-      goodsCode: '00004463'
-      goodsName: 新型冠状病毒检测试剂a7oLM
+      spdGoodsCode: '11661024'
+      goodsCode: '00004076'
+      goodsName: 新型冠状病毒检测试剂DJUhI
       goodsGg: G-31891
       mfrsId:
       mfrsName: 德国歌德公司 Geuder AG
       made:
       unit: 支
-      goodsDi: '01123456789012'
+      goodsDi:
       miCode:
       miDjmc:
       certificateCode: ''
@@ -22,16 +22,16 @@
       pkgDefName: '100'
       pkgDefQty: 100.0
       batchCode: '4444'
-      expdtDate: '2025-01-11'
-      productDate: '2024-07-05'
-      provName: 国药集团公司GxzLS
+      expdtDate: '2024-12-19'
+      productDate: '2024-06-12'
+      provName: 国药集团公司2u7a4
       provId:
-      viewId: '03839319'
+      viewId: '03838404'
       verifyFlag: 0
       hasSterilize: 0
-      id: '03839319'
+      id: '03838404'
       detailRelationJson:
-      extInfo: '{"goodsGg":"G-31891","goodsCode":"00004463","purMode":60,"goodsName":"新型冠状病毒检测试剂a7oLM","ygptCode":"","transCond":"","storageCond":"","erpCode":"11661416","ybDefId":""}'
+      extInfo: '{"goodsGg":"G-31891","goodsCode":"00004076","purMode":60,"goodsName":"新型冠状病毒检测试剂DJUhI","ygptCode":"","transCond":"","storageCond":"","erpCode":"11661024","ybDefId":""}'
       recTemperature: 20
       recHumidity: 30
       distrPrice: 99.9999
@@ -56,8 +56,6 @@
       multiChargeFlag: 0
       useFrequency: 1
       codingType: 0
-      limitMessage:
-      autoUnpack: 0
   list_b:
   - *id001
   list_c:

data/b5_spd3_core_business_flow/message15

 验收单号:
-  CHECK_NO1: CHECKh03472024070500070
-  CHECK_NO2: CHECKh03472024070500070
+  CHECK_NO1: CHECKh03472024061200031
+  CHECK_NO2: CHECKh03472024061200031

data/b5_spd3_core_business_flow/message18

 条码信息:
   list_a:
   - &id001
-    id: UT240705000315
-    snCode: UT240705000315
-    ssccCode: '010839000187066526'
-    pkgCodeSee: 0101123456789012104444112407051725011121UT240705000315
-    hosGoodsId: h034700004463
-    hosGoodsCode: '00004463'
-    goodsCode: '00004463'
-    goodsName: 新型冠状病毒检测试剂a7oLM
+    id: UT240612000803
+    snCode: UT240612000803
+    ssccCode: '010839000184006228'
+    pkgCodeSee: 013667000004075010333112406121724121921UT240612000803
+    hosGoodsId: h034700004075
+    hosGoodsCode: '00004075'
+    goodsCode: '00004075'
+    goodsName: 一次性注射器_低值xaYjQ
     goodsSpec: G-31891
     goodsMfrsName: 德国歌德公司 Geuder AG
     unit: 支
-    purMode: 60
-    batchCode: '4444'
-    productDate: '2024-07-05'
-    expdtDate: '2025-01-11'
+    purMode: 10
+    batchCode: '333'
+    productDate: '2024-06-12'
+    expdtDate: '2024-12-19'
     pkgDefName: '100'
     pkgDefQty: 100.0
-    stockId: 9b3e40528eff4ed1bf4ee12b587e00d0
-    stockName: 东土城路院区)Gl$!中心库房
-    areaName: 自动化测试
-    areaCode: areah03472634
+    stockId: 2579f302b2c3440eb9cf2b52d1e44378
+    stockName: 三级检测组003库房
+    areaName: 默认库区
+    areaCode: areah03472290
     lockStatus: 0
     unitName: 100支/100
-    shelfCode: areah03472634-2-01-01
-    shelfNo: 自动化测试-2-01-01
-    pkgDefId: fdfa9805e01946bba3c5b8bd487a6dc7
-    extInfo: '{"pkgDefId": "fdfa9805e01946bba3c5b8bd487a6dc7", "pkgDefQty": 100, "purBillId":
-      "CG2024070520622", "pkgDefName": "100", "distrBillId": "PSh0347202407050028",
-      "inStockTime": "2024-07-05 10:20:42", "distrDetailId": "03839282", "certificateCode":
+    shelfCode: areah03472290-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":
       ""}'
     bottleId:
-    pkgType: '66'
+    pkgType: '16'
     miDjmc: ''
     miCode: ''
     transferRatio: 1.0
     qty: 1
     shelfKind: 0
     shelfKindName: 普通货位
-    provName: 国药集团公司GxzLS
-    provId: p1e31d
-    inStockDate:
+    provName: 国药集团公司2u7a4
+    provId: p1e28e
+    inStockDate: '2024-06-12 13:40:56'
     mfrCode:
     made: 德国
     price:
     barName: 100支/100
-    purModeText: 检验试剂
-    codeType: 66
+    purModeText: 低值耗材
+    codeType: 16
   list_b:
   - *id001
   list_c:

data/b5_spd3_core_business_flow/message21

 二级库请领产品信息:
   list_a:
   - &id001
-    - hosGoodsId: h034700004463
+    - hosGoodsId: h034700004076
       purMode: 60
       grantRule:
       id:
-      goodsName: 新型冠状病毒检测试剂a7oLM
+      goodsName: 新型冠状病毒检测试剂DJUhI
       goodsSpec: G-31891
-      mdmGoodsCode: '11661416'
-      goodsCode: '00004463'
+      mdmGoodsCode: '11661024'
+      goodsCode: '00004076'
       unit: 支
       goodsMfrsName: 德国歌德公司 Geuder AG
       miDjmc: ''
@@ -16,22 +16,22 @@
       pkgDefName: '100'
       pkgDefQty: 100.0
       pkgQty:
-      qty: 1400.0
+      qty: 400.0
       goodsImg: []
-      pkgDefId: fdfa9805e01946bba3c5b8bd487a6dc7
+      pkgDefId: 0d3db4404bcb46b9b80830502f069b4f
       buyPkgQty:
       unitName: 100支/100
       price: 99.9999
       hosId:
       branchId:
-      deptId: 232328e5ceb44b799efba96c512618bf
+      deptId: a463883417d44685862ebc9eb9c62990
       deptName:
       areaCode:
       areaName:
-      targetDeptId: d5e1acc8708f47a7b152e103204ee4cb
+      targetDeptId: 42d415ddd37444858d61aa923d936b16
       targetDeptName: 设备科001
-      targetStockId: 9b3e40528eff4ed1bf4ee12b587e00d0
-      targetStockName: 东土城路院区)Gl$!中心库房
+      targetStockId: 61b06063d63c43848a1bac7f3a3debb4
+      targetStockName: 东土城路院区!uON*中心库房
       purchaseFlag: 1
       tempFlag: 0
       grantWay: 3
@@ -39,10 +39,10 @@
       codingType: 0
       purModeText: 检验试剂
       goodsGeneralName: 检测试剂
-      provName: 国药集团公司GxzLS
-      noRecPkgQty: 2.0
-      noRecQty: 200.0
-      autoUnpack: 0
+      provName: 国药集团公司2u7a4
+      noRecPkgQty: 1.0
+      noRecQty: 100.0
+      autoUnpack:
       consumeQty:
       consumePkgQty:
   list_b:

data/b5_spd3_core_business_flow/message22

 库区信息:
   list_a:
   - &id001
-    - id: 2aeb6b71864042b8aece41d819c70542
-      lastModified: '2024-07-05 11:09:29'
-      version: 4
-      createTime: '2024-07-05 10:13:37'
-      createUser: h0347_UID-051395
-      lastModifiedUser: h0347_UID-051395
-      stockId: 6898e3a36c3c4b36bf1ea0648b26cba4
-      shelfCode: areah03472631
+    - id: 686b6c94878e4ca8b0d7d4ad62f051a4
+      lastModified: '2024-06-12 13:55:55'
+      version: 6
+      createTime: '2024-06-12 07:04:53'
+      createUser: h0347_UID-051328
+      lastModifiedUser: h0347_UID-051328
+      stockId: 2579f302b2c3440eb9cf2b52d1e44378
+      shelfCode: areah03472290
       shelfName: 默认库区
-      address: 二级检验科002
+      address: 三级检测组003
       shelfType:
       stockType: 0
       defaultFlag: 1
@@ -18,13 +18,13 @@
       parentId:
       levelCode:
       tbStatus: 1
-      linkman: h0347_UID-051395
+      linkman: h0347_UID-051328
       recPhone: None
       delFlag: 0
       shelfNo: A01
       shelfKind: 0
       hosId:
-      deptId: 232328e5ceb44b799efba96c512618bf
+      deptId: f7dc795546bf4722982f8b7c5632e83f
       areaCode:
       areaName:
       stockName:

data/b5_spd3_core_business_flow/message8

 配送订单信息:
   list_a:
   - &id001
-    - id: Ch034720240705000091
-      lastModified: '2024-07-05 12:24:49'
+    - id: Ch034720240611000083
+      lastModified: '2024-06-11 07:41:54'
       version: 0
-      createTime: '2024-07-05 12:24:49'
-      createUser: h0347_UID-051395
+      createTime: '2024-06-11 07:41:54'
+      createUser: h0347_UID-051326
       lastModifiedUser:
-      orderNo: CG2024070520656
+      orderNo: CG2024061118455
       billMode: '66'
       recType: HDI
       hosId: h0347
-      branchId: h0347-3729
+      branchId: h0347-3665
       deptId:
       deptName:
-      recOrgId: 232328e5ceb44b799efba96c512618bf
+      recOrgId: 38197ff974f8454bbb30b8f18b9de57b
       recOrgName: 二级检验科002
       areaCode:
       areaName:
       billExpdtDate:
-      sourceId: Ph034720240705028094
+      sourceId: Ph034720240611024455
       sourceType:
       inSettlement:
       recUser:
       recPhone:
-      recAddr: 自动化测试
-      provId: p1e31d
-      provName: 国药集团公司GxzLS
+      recAddr: 二级检验科002
+      provId: p1e28a
+      provName: 国药集团公司5AaDk
       subSendFlag:
-      exeProvId: p1e31d
-      exeProvName: 国药集团公司GxzLS
+      exeProvId: p1e28a
+      exeProvName: 国药集团公司5AaDk
       billRelationJson:
       extInfo:
       barcodeFlag: 1
@@ -43,11 +43,11 @@
       hosVersion: 3
       billType: CGD
       hosName: 邹城市人民医院(test)
-      branchName: 东土城路院区)Gl$!
+      branchName: 东土城路院区vfAtR
       sumQty: 100.0
       sumPkgQty: 1.0
       sumAmount: '9999.9900'
-      planOrderNo: PLAN2024070531449
+      planOrderNo: PLAN2024061127810
   list_b:
   - *id001
   list_c:

data/b5_spd3_core_business_flow/message9

 配送订单详细信息:
   list_a:
   - &id001
-    - id: d47eda7d43ed425891b15c22811baadc
+    - id: a38494d5170249cd896afad59af04490
       lastModified:
       version:
       createTime:
       createUser:
       lastModifiedUser:
-      pid: Ch034720240705000091
-      orderNo: CG2024070520656
-      sourceId: a2498f4f92d0443f83addbf792b4624f
-      hosGoodsId: h034700004463
-      mdmGoodsCode: '11661416'
-      goodsCode: '00004463'
+      pid: Ch034720240612000094
+      orderNo: CG2024061218570
+      sourceId: 68b9212a6b5748d6842b19530597b361
+      hosGoodsId: h034700004076
+      mdmGoodsCode: '11661024'
+      goodsCode: '00004076'
       purMode: 60
       price: '99.9999'
-      supplyId: 1bbd4f2de4ee40b2a90b1138d7722393
-      pkgDefId: fdfa9805e01946bba3c5b8bd487a6dc7
+      supplyId: fb24a8a2210a4be1863137639166f56f
+      pkgDefId: 0d3db4404bcb46b9b80830502f069b4f
       pkgDefName: '100'
       pkgDefQty: 100.0
       pkgQty: 1.0
@@ -31,20 +31,20 @@
       notSendPkgQty: 0.0
       inSettlement: 1
       closeType: 1
-      detailRelationJson: '{"planBillId":"Ph034720240705028094","buyDetailId":"Bh034720240705000930001","planDetailId":"a2498f4f92d0443f83addbf792b4624f"}'
-      extInfo: '{"goodsGg":"G-31891","goodsCode":"00004463","purMode":60,"goodsName":"新型冠状病毒检测试剂a7oLM"}'
+      detailRelationJson: '{"planBillId":"Ph034720240612024971","buyDetailId":"Bh034720240612000440001","planDetailId":"68b9212a6b5748d6842b19530597b361"}'
+      extInfo: '{"goodsGg":"G-31891","goodsCode":"00004076","purMode":60,"goodsName":"新型冠状病毒检测试剂DJUhI"}'
       remark:
       tbStatus:
       hosVersion:
       unit: 支
-      goodsName: 新型冠状病毒检测试剂a7oLM
+      goodsName: 新型冠状病毒检测试剂DJUhI
       mfrsId: mfrs-11229
       mfrsName: 德国歌德公司 Geuder AG
       goodsGg: G-31891
-      mdmGoodsSpecCode: '11661416'
-      erpCode: '11661416'
+      mdmGoodsSpecCode: '11661024'
+      erpCode: '11661024'
       made: 德国
-      goodsDi: '01123456789012'
+      goodsDi:
       miDjmc:
       miGoodsGg:
       miGoodsXh:
@@ -65,15 +65,15 @@
       goodsRegCert: ''
       transCond: ''
       storageCond: ''
-      diType:
-      diUse: '01123456789012'
+      diType: gs1
+      diUse: '36670000040760'
       multiChargeFlag: 0
       useFrequency: 1
       chargeUnit:
       amount: '9999.9900'
       unitName: 100支/100
-      subProvId: p1e31d
-      subProvName: 国药集团公司GxzLS
+      subProvId: p1e28e
+      subProvName: 国药集团公司2u7a4
       subPrice: 99.9999
       replPkgQty: 1.0
       replQty: 100.0

geckodriver.log

-1691384174643	geckodriver	INFO	Listening on 127.0.0.1:60395
-1691384177063	mozrunner::runner	INFO	Running command: "D:\\Program Files (x86)\\Mozilla Firefox\\firefox.exe" "--marionette" "-foreground" "-no-remote" "-profile" "C:\\Users\\ADMINI~1\\AppData\\Local\\Temp\\rust_mozprofilekzunjD"
-console.warn: services.settings: Ignoring preference override of remote settings server
-console.warn: services.settings: Allow by setting MOZ_REMOTE_SETTINGS_DEVTOOLS=1 in the environment
-1691384177326	Marionette	INFO	Marionette enabled
-Dynamically enable window occlusion 0
-console.error: "Warning: unrecognized command line flag" "-foreground"
-1691384177391	Marionette	INFO	Listening on port 60405
-1691384177764	RemoteAgent	WARN	TLS certificate errors will be ignored for this session
-[GFX1-]: Failed to create a D3D11 content device: 0x887a0031
-[Parent 13764, IPC I/O Parent] WARNING: DuplicateHandle failed for handle 0 in TransferHandles: file /builds/worker/checkouts/gecko/ipc/chromium/src/chrome/common/ipc_channel_win.cc:621
-[GPU 15232, IPC I/O Child] WARNING: pipe error: 232: file /builds/worker/checkouts/gecko/ipc/chromium/src/chrome/common/ipc_channel_win.cc:443
-1691384189508	Marionette	INFO	Stopped listening on port 60405
-Dynamically enable window occlusion 1
-[Parent 13764, IPC I/O Parent] WARNING: DuplicateHandle failed for handle 0 in TransferHandles: file /builds/worker/checkouts/gecko/ipc/chromium/src/chrome/common/ipc_channel_win.cc:621
-[GPU 15232, IPC I/O Child] WARNING: pipe error: 232: file /builds/worker/checkouts/gecko/ipc/chromium/src/chrome/common/ipc_channel_win.cc:443
-[Parent 13764, IPC I/O Parent] WARNING: DuplicateHandle failed for handle 0 in TransferHandles: file /builds/worker/checkouts/gecko/ipc/chromium/src/chrome/common/ipc_channel_win.cc:621
-[GPU 15232, IPC I/O Child] WARNING: pipe error: 232: file /builds/worker/checkouts/gecko/ipc/chromium/src/chrome/common/ipc_channel_win.cc:443
-JavaScript error: chrome://remote/content/marionette/cert.sys.mjs, line 51: NS_ERROR_NOT_AVAILABLE: Component returned failure code: 0x80040111 (NS_ERROR_NOT_AVAILABLE) [nsICertOverrideService.setDisableAllSecurityChecksAndLetAttackersInterceptMyData]
-[Parent 13764, IPC I/O Parent] WARNING: DuplicateHandle failed for handle 0 in TransferHandles: file /builds/worker/checkouts/gecko/ipc/chromium/src/chrome/common/ipc_channel_win.cc:621
-[GPU 15232, IPC I/O Child] WARNING: pipe error: 232: file /builds/worker/checkouts/gecko/ipc/chromium/src/chrome/common/ipc_channel_win.cc:443
-[Parent 13764, IPC I/O Parent] WARNING: DuplicateHandle failed for handle 0 in TransferHandles: file /builds/worker/checkouts/gecko/ipc/chromium/src/chrome/common/ipc_channel_win.cc:621
-[GPU 15232, IPC I/O Child] WARNING: pipe error: 232: file /builds/worker/checkouts/gecko/ipc/chromium/src/chrome/common/ipc_channel_win.cc:443
-[Parent 13764, IPC I/O Parent] WARNING: DuplicateHandle failed for handle 0 in TransferHandles: file /builds/worker/checkouts/gecko/ipc/chromium/src/chrome/common/ipc_channel_win.cc:621
-[GPU 15232, IPC I/O Child] WARNING: pipe error: 232: file /builds/worker/checkouts/gecko/ipc/chromium/src/chrome/common/ipc_channel_win.cc:443

report/summary.html

@@ -77,7 +77,7 @@ 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分18秒</td>
+            <td class='details-col-elapsed'>2分34秒</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/execute/log.html' target='_blank'>execute</a></td>
+            <td class="details-col-elapsed"><a href='../log/a_b6流程十三请领业务流_三级库向二级库/log.html' target='_blank'>a_b6流程十三请领业务流_三级库向二级库</a></td>
             <td class="success">成功</td>
-            <td class="details-col-elapsed">18.756</td>
+            <td class="details-col-elapsed">154.164</td>
             <td class="details-col-elapsed">xiaohesheng</td>
         </tr>