Skip to content
GitLab
Commit c12c8fb9 authored by xiao-hesheng's avatar xiao-hesheng
Browse files

脚本优化

parent a9ff7f93
Hide whitespace changes
Inline Side-by-side
air_case/b5_spd3_core_business_flow/a_b3流程十请领业务流_二级库向边仓.air/a_b3流程十请领业务流_二级库向边仓.py
View file @ c12c8fb9
......@@ -330,7 +330,7 @@ def main():
approval_center()
check_buyWayText()#验证出库渠道是否为边仓
commonFuc().check_text_exist_result_text('succees', 'succees')
print('==========================流程十结束==============================')
except:
commonFuc().check_text_exist_result_text('error', 'succees')
air_case/b5_spd3_core_business_flow/a_b4流程十一请领业务流_二级库向直送.air/a_b4流程十一请领业务流_二级库向直送.py
View file @ c12c8fb9
......@@ -843,5 +843,6 @@ def main():
second_dept_one_key_in()
second_dept_one_key_in()
commonFuc().check_text_exist_result_text('succees', 'succees')
print('==========================流程十一结束==============================')
except:
commonFuc().check_text_exist_result_text('error', '1')
air_case/b5_spd3_core_business_flow/execute.air/execute.py
View file @ c12c8fb9
......@@ -178,4 +178,4 @@ def flow21():
# commonFuc().check_text_exist_result_text('succees', 'succees')
# except:
# commonFuc().check_text_exist_result_text('error', 'succees')
# flow8()
\ No newline at end of file
flow1()
\ No newline at end of file
data/a2_mdm3_ea/message
View file @ c12c8fb9
企业信息:
e_id: CR202407050338
cname: 国药集团公司GxzLS
e_id: CR202407050355
cname: 国药集团公司Kp9af
data/a3_mdm3_hs/message
View file @ c12c8fb9
医院信息:
h_id: 湖南省人民医院nSOQy
h_name: 湖南省人民医院nSOQy
h_id: 湖南省人民医院8Hkj&
h_name: 湖南省人民医院8Hkj&
data/b5_spd3_core_business_flow/message10
View file @ c12c8fb9
低值配送单号:
distrBillId1: PSh0347202407050026
distrBillId2: PSh0347202407050026
distrBillId1: PSh0347202407050063
distrBillId2: PSh0347202407050063
高值配送单号:
distrBillId1: PSh0347202407050027
distrBillId2: PSh0347202407050027
distrBillId1: PSh0347202407050064
distrBillId2: PSh0347202407050064
试剂配送单号:
distrBillId1: PSh0347202407050028
distrBillId2: PSh0347202407050028
高值跟台配送单号:
distrBillId1: PSh0347202407050029
distrBillId2: PSh0347202407050029
distrBillId1: PSh0347202407050065
distrBillId2: PSh0347202407050065
data/b5_spd3_core_business_flow/message11
View file @ c12c8fb9
采购计划单号高值:
orderNo1: PLAN2024070531411
orderNo2: PLAN2024070531411
orderNo1: PLAN2024070531447
orderNo2: PLAN2024070531447
data/b5_spd3_core_business_flow/message12
View file @ c12c8fb9
采购计划单号试剂:
orderNo1: PLAN2024070531412
orderNo2: PLAN2024070531412
orderNo1: PLAN2024070531449
orderNo2: PLAN2024070531449
data/b5_spd3_core_business_flow/message13
View file @ c12c8fb9
......@@ -8,28 +8,29 @@
taskType: 1
sourceOrgId: p1e31d
sourceOrgName: 国药集团公司GxzLS
sourceOrderNo: PSh0347202407050029
billMode: '25'
sourceOrderNo: PSh0347202407050065
billMode: '66'
stockKind:
purMode:
sourceId: PSh0347202407050029
sourceId: PSh0347202407050065
sourceDetailId:
sourceType: PSD
sourceTypeName: 配送单
sourceVersion: 1
planOrderNo: SSSQ202407050327
purOrderNo: SSTZ202407050303
planOrderNo: PLAN2024070531449
purOrderNo: CG2024070520656
recOrgId: 232328e5ceb44b799efba96c512618bf
recOrgName: 二级检验科002
billRelationJson: '{"operationApplyOrderNo":"SSSQ202407050327","operationNoticeBillId":"Nh034720240705000002","distrBillId":"PSh0347202407050029","operationNoticeOrderNo":"SSTZ202407050303","distrOrderNo":"PSh0347202407050029","operationApplyBillId":"Oh034720240705000002"}'
taskDate: '2024-07-05 10:38:38'
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'
taskDateStart:
taskDateEnd:
billModeList:
viewIdList:
supplierFlag: false
supplierFlag: true
tbStatus: 20
remark:
remark: ''
pdaFlag:
list_b:
- *id001
......
data/b5_spd3_core_business_flow/message14
View file @ c12c8fb9
验收单详情信息:
list_a:
- &id001
- purMode: 20
unitName: 1支
hosGoodsId: h034700004461
- purMode: 60
unitName: 100支/100
hosGoodsId: h034700004463
mdmGoodsCode:
spdGoodsCode: '11661414'
goodsCode: '00004461'
goodsName: 高值牙钻机rY4w$
spdGoodsCode: '11661416'
goodsCode: '00004463'
goodsName: 新型冠状病毒检测试剂a7oLM
goodsGg: G-31891
mfrsId:
mfrsName: 德国歌德公司 Geuder AG
......@@ -16,27 +16,27 @@
goodsDi: '01123456789012'
miCode:
miDjmc:
certificateCode:
certificateCode: ''
rfidFlag: 0
pkgDefId:
pkgDefName:
pkgDefQty: 1.0
batchCode: '2222'
pkgDefName: '100'
pkgDefQty: 100.0
batchCode: '4444'
expdtDate: '2025-01-11'
productDate: '2024-07-05'
provName: 国药集团公司GxzLS
provId:
viewId: '03839283'
viewId: '03839319'
verifyFlag: 0
hasSterilize: 0
id: '03839283'
id: '03839319'
detailRelationJson:
extInfo: '{"ygptCode":"","transCond":"","storageCond":"","erpCode":""}'
extInfo: '{"goodsGg":"G-31891","goodsCode":"00004463","purMode":60,"goodsName":"新型冠状病毒检测试剂a7oLM","ygptCode":"","transCond":"","storageCond":"","erpCode":"11661416","ybDefId":""}'
recTemperature: 20
recHumidity: 30
distrPrice: 99.9999
distrPkgQty: 1.0
distrQty: 1.0
distrQty: 100.0
price: 99.9999
checkQty: 0.0
checkPkgQty: 0
......@@ -44,7 +44,7 @@
initQty:
totalQty:
rowNum:
settlement: 3
settlement: 1
hdiBarcodeList:
detailId:
pkgCode:
......
data/b5_spd3_core_business_flow/message15
View file @ c12c8fb9
验收单号:
CHECK_NO1: CHECKh03472024070500034
CHECK_NO2: CHECKh03472024070500034
CHECK_NO1: CHECKh03472024070500070
CHECK_NO2: CHECKh03472024070500070
data/b5_spd3_core_business_flow/message21
View file @ c12c8fb9
......@@ -16,7 +16,7 @@
pkgDefName: '100'
pkgDefQty: 100.0
pkgQty:
qty: 200.0
qty: 1400.0
goodsImg: []
pkgDefId: fdfa9805e01946bba3c5b8bd487a6dc7
buyPkgQty:
......@@ -34,14 +34,14 @@
targetStockName: 东土城路院区)Gl$!中心库房
purchaseFlag: 1
tempFlag: 0
grantWay: 1
grantWay: 3
deptGoodsStatus:
codingType: 0
purModeText: 检验试剂
goodsGeneralName: 检测试剂
provName: 国药集团公司GxzLS
noRecPkgQty: 1.0
noRecQty: 100.0
noRecPkgQty: 2.0
noRecQty: 200.0
autoUnpack: 0
consumeQty:
consumePkgQty:
......
data/b5_spd3_core_business_flow/message7
View file @ c12c8fb9
采购计划单号:
orderNo1: PLAN2024070531410
orderNo2: PLAN2024070531410
orderNo1: PLAN2024070531448
orderNo2: PLAN2024070531448
data/b5_spd3_core_business_flow/message8
View file @ c12c8fb9
配送订单信息:
list_a:
- &id001
- id: Nh034720240705000002
orderNo: SSTZ202407050303
sourceOrderNo: SSSQ202407050327
hosId: h0347
hosName: 邹城市人民医院(test)
branchName: 东土城路院区)Gl$!
recDeptName: 二级检验科002
operName: 血管扩张术
operDate: '2024-07-06'
operDoctor: 李*
patientName: 张*
status: 10
statusText: 待确认
- id: Ch034720240705000091
lastModified: '2024-07-05 12:24:49'
version: 0
patientInHosId: '123456'
surDeptName: ''
remark: 自动化测试
createUserName: 自动化测试pwnfB
distPriority: 0
distPriorityText:
distId:
distNo:
hosVersion: 3
createTime: '2024-07-05 10:37:52'
sumQty:
sumAmount:
operationPkg: 0
createTime: '2024-07-05 12:24:49'
createUser: h0347_UID-051395
lastModifiedUser:
orderNo: CG2024070520656
billMode: '66'
recType: HDI
hosId: h0347
branchId: h0347-3729
deptId:
deptName:
recOrgId: 232328e5ceb44b799efba96c512618bf
recOrgName: 二级检验科002
areaCode:
areaName:
billExpdtDate:
sourceId: Ph034720240705028094
sourceType:
inSettlement:
recUser:
recPhone:
recAddr: 自动化测试
provId: p1e31d
provName: 国药集团公司GxzLS
subProvId: ''
subProvName: ''
recDeptId: 232328e5ceb44b799efba96c512618bf
subSendFlag:
exeProvId: p1e31d
exeProvName: 国药集团公司GxzLS
billRelationJson:
extInfo:
barcodeFlag: 1
pkgFlag:
remark: ''
priority:
closeStatus: 0
closeDate:
upStatus:
tbStatus: 30
hosVersion: 3
billType: CGD
hosName: 邹城市人民医院(test)
branchName: 东土城路院区)Gl$!
sumQty: 100.0
sumPkgQty: 1.0
sumAmount: '9999.9900'
planOrderNo: PLAN2024070531449
list_b:
- *id001
list_c:
......
data/b5_spd3_core_business_flow/message9
View file @ c12c8fb9
配送订单详细信息:
list_a:
- &id001
id: Nh034720240705000002
orderNo: SSTZ202407050303
sourceOrderNo: SSSQ202407050327
hosId: h0347
hosName: 邹城市人民医院(test)
branchName: 东土城路院区)Gl$!
recDeptName: 二级检验科002
operName: 血管扩张术
operDate: '2024-07-06'
operDoctor: 李*
patientName: 张*
status: 20
statusText: 待配送
version: 1
patientInHosId: '123456'
surDeptName: ''
remark: 自动化测试
createUserName: 自动化测试pwnfB
distPriority: 0
distPriorityText: 否
distId:
distNo:
hosVersion: 3
createTime: '2024-07-05 10:37:52'
sumQty: 1
sumAmount: '99.9999'
operationPkg: 0
provId: p1e31d
provName: 国药集团公司GxzLS
subProvId: ''
subProvName: ''
recDeptId: 232328e5ceb44b799efba96c512618bf
list_b:
- *id001
list_c:
- *id001
配送订单详细信息2:
list_a:
- &id001
- id: h034720240705000002
hosGoodsId: h034700004461
goodsNum: 1
- id: d47eda7d43ed425891b15c22811baadc
lastModified:
version:
createTime:
createUser:
lastModifiedUser:
pid: Ch034720240705000091
orderNo: CG2024070520656
sourceId: a2498f4f92d0443f83addbf792b4624f
hosGoodsId: h034700004463
mdmGoodsCode: '11661416'
goodsCode: '00004463'
purMode: 60
price: '99.9999'
inSettlement: 3
inSettlementText: 消耗结算
goodsName: 高值牙钻机rY4w$
goodsSpec: G-31891
goodsCode: '00004461'
goodsMfrsId: mfrs-11229
goodsMfrsName: 德国歌德公司 Geuder AG
supplyId: 1bbd4f2de4ee40b2a90b1138d7722393
pkgDefId: fdfa9805e01946bba3c5b8bd487a6dc7
pkgDefName: '100'
pkgDefQty: 100.0
pkgQty: 1.0
qty: 100.0
conPkgQty: 1.0
conQty: 100.0
checkPkgQty: 0.0
checkQty: 0.0
distrPkgQty: 0.0
distrQty: 0.0
notSendQty: 0.0
notSendPkgQty: 0.0
inSettlement: 1
closeType: 1
detailRelationJson: '{"planBillId":"Ph034720240705028094","buyDetailId":"Bh034720240705000930001","planDetailId":"a2498f4f92d0443f83addbf792b4624f"}'
extInfo: '{"goodsGg":"G-31891","goodsCode":"00004463","purMode":60,"goodsName":"新型冠状病毒检测试剂a7oLM"}'
remark:
tbStatus:
hosVersion:
unit: 支
subProvId: p1e31d
subProvName: 国药集团公司GxzLS
totalAmount: '99.9999'
spdGoodsCode: '11661414'
barCodeMng: 2
erpCode: '11661414'
goodsName: 新型冠状病毒检测试剂a7oLM
mfrsId: mfrs-11229
mfrsName: 德国歌德公司 Geuder AG
goodsGg: G-31891
mdmGoodsSpecCode: '11661416'
erpCode: '11661416'
made: 德国
goodsDi: '01123456789012'
miDjmc:
miGoodsGg:
miGoodsXh:
miCode:
miTwentyCode:
miTwentysevenCode: ''
miKindCode:
purchaseContent:
purchaseUnit:
buyContent:
buyUnit:
transferRatio:
extend:
hitCode: '12'
hitPrice: 99.9999
barCodeMng: '2'
rfidFlag:
goodsRegCert: ''
transCond: ''
storageCond: ''
diType:
diUse: '01123456789012'
multiChargeFlag: 0
useFrequency: 1
chargeUnit:
hitCode: '12'
hitPrice: '99.999900'
diUse:
goodsDi: '01123456789012'
amount: '9999.9900'
unitName: 100支/100
subProvId: p1e31d
subProvName: 国药集团公司GxzLS
subPrice: 99.9999
replPkgQty: 1.0
replQty: 100.0
ybDefId:
logicId:
provGoodsId:
sendFlag:
curQry:
list_b:
- *id001
list_c:
......
main1/main_text.py
View file @ c12c8fb9
......@@ -86,6 +86,7 @@ def main_text():
def flow8():
from execute import flow11
flow11()
tkinter.messagebox.showinfo('流程十一执行完毕','流程十一执行完毕')
# sys.exit(0)
def flow9():
from execute import flow12
......@@ -118,6 +119,7 @@ def main_text():
def flow16():
from execute import flow19
flow19()
tkinter.messagebox.showinfo('流程十六执行完毕')
# sys.exit(0)
def flow17():
from execute import flow20
......
report/summary.html
View file @ c12c8fb9
......@@ -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分18秒</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/r_b6科室管理_科室人员查询_按科室查询人员_设置科室负责人/log.html' target='_blank'>r_b6科室管理_科室人员查询_按科室查询人员_设置科室负责人</a></td>
<td class="fail">失败</td>
<td class="details-col-elapsed">2.788</td>
<td class="details-col-elapsed"><a href='../log/execute/log.html' target='_blank'>execute</a></td>
<td class="success">成功</td>
<td class="details-col-elapsed">18.756</td>
<td class="details-col-elapsed">xiaohesheng</td>
</tr>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment