Skip to content
GitLab
Commit 34636834 authored by 肖 和生's avatar 肖 和生
Browse files

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

parents 5b360f7b 742138aa
Hide whitespace changes
Inline Side-by-side
air_case/b5_spd3_core_business_flow/a_b5流程十二请领业务流_二级库向二级库.air/a_b5流程十二请领业务流_二级库向二级库.py
View file @ 34636834
......@@ -442,6 +442,8 @@ def main():
second_dept_one_key_in(5)
second_dept_one_key_in(5)
commonFuc().check_text_exist_result_text('succees', 'succees')
print('================流程十二执行完毕===================')
except:
commonFuc().check_text_exist_result_text('error', '1')
main()
\ No newline at end of file
air_case/b5_spd3_core_business_flow/a_b6流程十三请领业务流_三级库向二级库.air/a_b6流程十三请领业务流_三级库向二级库.py
View file @ 34636834
......@@ -358,6 +358,8 @@ def main():
second_dept_one_key_in(3)
second_dept_one_key_in(3)
commonFuc().check_text_exist_result_text('succees', 'succees')
print('================流程十三执行完毕===================')
except:
commonFuc().check_text_exist_result_text('error ', '1')
main()
\ No newline at end of file
air_case/b5_spd3_core_business_flow/a_b7流程十四退库业务_消耗退库.air/a_b7流程十四退库业务_消耗退库.py
View file @ 34636834
......@@ -588,6 +588,7 @@ def main():
second_dept_consume_Out_Stock(3) # 试剂消耗出库
second_dept_consume_in_Stock(3) # 试剂消耗退回入库
commonFuc().check_text_exist_result_text('SUCCESS', 'SUCCESS')
print('================流程十四执行完毕===================')
except:
commonFuc().check_text_exist_result_text('error', 'SUCCESS')
main()
\ No newline at end of file
air_case/b5_spd3_core_business_flow/a_b8流程十五退库业务_三级库向二级库退库.air/a_b8流程十五退库业务_三级库向二级库退库.py
View file @ 34636834
......@@ -432,6 +432,8 @@ def main():
second_dept_one_key_in(2)
second_dept_one_key_in(2)
commonFuc().check_text_exist_result_text('succees', 'succees')
print('================流程十五执行完毕===================')
except:
commonFuc().check_text_exist_result_text('error', '1')
main()
\ No newline at end of file
air_case/b5_spd3_core_business_flow/a_b9流程十六退库业务_二级库向一级库退库.air/a_b9流程十六退库业务_二级库向一级库退库.py
View file @ 34636834
......@@ -569,6 +569,8 @@ def main():
putaway()#中心库上架
# ===============上面调通了================================
commonFuc().check_text_exist_result_text('succees', 'succees')
print('================流程十六执行完毕===================')
except:
commonFuc().check_text_exist_result_text('error', '1')
main()
\ No newline at end of file
air_case/b5_spd3_core_business_flow/a_c0流程十七退货业务_中心库退供应商.air/a_c0流程十七退货业务_中心库退供应商.py
View file @ 34636834
......@@ -633,6 +633,8 @@ def main():
second_center_Stock_return_Out(1) #低值耗材退货出库
second_center_Stock_return_Out(3) #试剂耗材退货出库
commonFuc().check_text_exist_result_text('succees', 'succees')
print('================流程十七执行完毕===================')
except:
commonFuc().check_text_exist_result_text('error', '1')
main()
\ No newline at end of file
air_case/b5_spd3_core_business_flow/a_c1流程十八中心库业务_拆包功能.air/a_c1流程十八中心库业务_拆包功能.py
View file @ 34636834
......@@ -198,7 +198,9 @@ def center_Stock_unpack(type): # 扫码发放(高值不能扫码发放)
# # # # 发送请求
result = commonFuc().http_post(url, request_body, headers)
print('result', result)
code = commonFuc().analysis_json('code', result)
if code == 1010:
commonFuc().check_text_exist_result_text('error', 'succees')
elif type == 3:
print('试剂产品扫码发放')
module = "b5_spd3_core_business_flow"
......@@ -362,6 +364,9 @@ def center_Stock_unpack(type): # 扫码发放(高值不能扫码发放)
# # # # 发送请求
result = commonFuc().http_post(url, request_body, headers)
print('result', result)
code=commonFuc().analysis_json('code',result)
if code==1010:
commonFuc().check_text_exist_result_text('error', 'succees')
def main():
try:
......@@ -369,6 +374,8 @@ def main():
center_Stock_unpack(1) # 低值耗材扫码发放
center_Stock_unpack(3) # 试剂耗材扫码发放
commonFuc().check_text_exist_result_text('succees', 'succees')
print('================流程十八执行完毕===================')
except:
commonFuc().check_text_exist_result_text('error', '1')
main()
\ No newline at end of file
data/b5_spd3_core_business_flow/message16
View file @ 34636834
......@@ -7,13 +7,13 @@
createTime:
createUser: h0347_UID-051395
lastModifiedUser:
billMode: '16'
billMode: '66'
recType:
stockKind:
purMode:
sourceId: CHECKh03472024070500029
sourceType: PSD
sourceVersion: 0
sourceId: DRh034720240705000171
sourceType: CK_TK
sourceVersion: 1
batchList:
billRelationJson:
hosId: h0347
......@@ -21,18 +21,18 @@
deptName:
branchId: h0347-3729
branchName:
taskType: 1
sourceOrgId: p1e31d
sourceOrgName: 国药集团公司GxzLS
sourceOrderNo: YS240705029
taskSourceNo: PSh0347202407050026
areaCode: areah03472634
areaName: 自动化测试
taskType: 2
sourceOrgId: 232328e5ceb44b799efba96c512618bf
sourceOrgName: 二级检验科002
sourceOrderNo: DN20240705000171
taskSourceNo: DN20240705000171
areaCode:
areaName:
goodsName:
goodsGg:
startDate:
endDate:
taskDate: '2024-07-05 10:19:37'
taskDate: '2024-07-05 15:48:53'
pkgTaskId:
pkgFlag:
remark: ''
......
data/b5_spd3_core_business_flow/message17
View file @ 34636834
验收单库存详情信息:
list_a:
- &id001
- id: CHECKh034720240705000290001
- id: DRh0347202407050001710001
lastModified:
version:
createTime:
createUser:
lastModifiedUser:
rowIdx:
purMode: 10
purMode: 60
unitName: 100支/100
pid: CHECKh03472024070500029
hosGoodsId: h034700004462
batchCode: '333'
pid: DRh034720240705000171
hosGoodsId: h034700004463
batchCode: '4444'
expdtDate: '2025-01-11'
productDate: '2024-07-05'
batchPrice: 99.9999
settlement: 1
batchType: 20
srcBatchId: '03839280'
batchType: 40
srcBatchId: Ph034724070500050
srcBatchPrice: 99.9999
shelfCode: areah03472634-2-01-01
shelfKind:
barcodeId: UT240705000213
barcodeId: UT240705000418
subBarcodeId:
qty: 10000.0
pkgQty: 100
distrId: PSh0347202407050026
distrDetailId: '03839280'
pkgDefQty: 100.0
pkgDefName: '100'
viewId: h0347000044623332025-01-11100支/100
qty: 100.0
pkgQty: 1
distrId: PSh0347202407050038
distrDetailId: '03839292'
pkgDefQty:
pkgDefName:
viewId: h03470000446344442025-01-11100支/100
codingType:
batchFlag:
hasSterilize: 0
......@@ -38,53 +38,60 @@
sterilizePassQty:
sterilizeRejectQty:
orderNo:
sourceDetailId: '03839280'
mdmGoodsCode: '11661415'
goodsCode: '00004462'
tbStatus: 1
billMode: '16'
hosId: h0347
branchId: h0347-3729
purBillId: Ch034720240705000055
sourceDetailId: PICKh03472407050093660001
mdmGoodsCode: '11661416'
goodsCode: '00004463'
tbStatus:
billMode:
hosId:
branchId:
purBillId: Ch034720240705000064
provId: p1e31d
provName: 国药集团公司GxzLS
subSendFlag: 10
exeProvId: p1e31d
exeProvName: 国药集团公司GxzLS
purDetailId: e35ec319b7fa458e96c1051ef8b5e4f9
goodsName: 一次性注射器_低值C2g9i
provName:
subProvId: p1e31d
purDetailId:
goodsName: 新型冠状病毒检测试剂a7oLM
goodsGg: G-31891
mfrsId: mfrs-11229
mfrsName: 德国歌德公司 Geuder AG
made: 德国
unit: 支
purPrice: 99.9999
pkgDefId: db284f5e13594188b4aa09a5832293ec
supplyId: bec1283b1f3440539ef0962c6e9d92d4
subProvId: p1e31d
subProvName: 国药集团公司GxzLS
subPrice: 99.9999
distrPrice: 99.9999
distrPkgQty: 100.0
distrQty: 10000.0
sourceBatchId: Ph034724070500050
targetBatchId: Ph034724070500050
pkgDefId:
certificateCode: ''
productCertCode:
detailRelationJson:
extInfo:
psiPrice: 99.9999
ext:
goodsGg: G-31891
goodsCode: '00004462'
purMode: 10
goodsName: 一次性注射器_低值C2g9i
goodsCode: '00004463'
purMode: 60
goodsName: 新型冠状病毒检测试剂a7oLM
ygptCode: ''
transCond: ''
storageCond: ''
erpCode: '11661415'
erpCode: '11661416'
ybDefId: ''
purTaskId:
multiChargeFlag:
contractId: ''
normalContractId: ''
fcatId: ''
fcatName: ''
goodsKindId: ''
goodsKindName: ''
miTwentysevenCode: ''
focus_control: '0'
focus_control_type:
rtnQty:
hisChargeNo:
trustMrfsName:
pkgCodeSee:
chargeFlag:
stockKind: CK_TK
sourceDeptId: 232328e5ceb44b799efba96c512618bf
targetDeptId: d5e1acc8708f47a7b152e103204ee4cb
ableDelFlag:
pickType: KS_TK
list_b:
- *id001
list_c:
......
data/b5_spd3_core_business_flow/message18
View file @ 34636834
条码信息:
list_a:
- &id001
id: UT240705000413
snCode: UT240705000413
ssccCode: '010839000187076426'
pkgCodeSee: 010112345678901210333112407051725011121UT240705000413
hosGoodsId: h034700004462
hosGoodsCode: '00004462'
goodsCode: '00004462'
goodsName: 一次性注射器_低值C2g9i
id: UT240705000318
snCode: UT240705000318
ssccCode: '010839000187066823'
pkgCodeSee: 0101123456789012104444112407051725011121UT240705000318
hosGoodsId: h034700004463
hosGoodsCode: '00004463'
goodsCode: '00004463'
goodsName: 新型冠状病毒检测试剂a7oLM
goodsSpec: G-31891
goodsMfrsName: 德国歌德公司 Geuder AG
unit: 支
purMode: 10
batchCode: '333'
purMode: 60
batchCode: '4444'
productDate: '2024-07-05'
expdtDate: '2025-01-11'
pkgDefName: '100'
pkgDefQty: 100.0
stockId: 6898e3a36c3c4b36bf1ea0648b26cba4
stockName: 二级检验科002库房
areaName: 默认库区
areaCode: areah03472631
stockId: 9b3e40528eff4ed1bf4ee12b587e00d0
stockName: 东土城路院区)Gl$!中心库房
areaName: 自动化测试
areaCode: areah03472634
lockStatus: 0
unitName: 100支/100
shelfCode: areah03472631-A-01-01
shelfNo: A01-A-01-01
pkgDefId: db284f5e13594188b4aa09a5832293ec
extInfo: '{"pkgDefId": "db284f5e13594188b4aa09a5832293ec", "pkgDefQty": 100, "purBillId":
"CG2024070520624", "pkgDefName": "100", "distrBillId": "PSh0347202407050030",
"inStockTime": "2024-07-05 11:21:50", "distrDetailId": "03839284", "certificateCode":
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":
""}'
bottleId:
pkgType: '16'
pkgType: '66'
miDjmc: ''
miCode: ''
transferRatio: 1.0
......@@ -41,13 +41,13 @@
shelfKindName: 普通货位
provName: 国药集团公司GxzLS
provId: p1e31d
inStockDate: '2024-07-05 11:21:50'
inStockDate:
mfrCode:
made: 德国
price:
barName: 100支/100
purModeText: 低值耗材
codeType: 16
purModeText: 检验试剂
codeType: 66
list_b:
- *id001
list_c:
......
main1/main_text.py
View file @ 34636834
......@@ -86,24 +86,22 @@ def main_text():
def flow8():
from execute import flow11
flow11()
tkinter.messagebox.showinfo('流程十一执行完毕','流程十一执行完毕')
print('流程十一执行完毕','流程十一执行完毕')
# sys.exit(0)
def flow9():
from execute import flow12
flow12()
tkinter.messagebox.showinfo('流程十二执行完毕','流程十二执行完毕')
print('流程十二执行完毕','流程十二执行完毕')
# sys.exit(0)
def flow10():
from execute import flow13
flow13()
tkinter.messagebox.showinfo('流程十三执行完毕','流程十三执行完毕')
print('流程十三执行完毕','流程十三执行完毕')
# sys.exit(0)
def flow11():
from execute import flow14
flow14()
tkinter.messagebox.showinfo('flow14执行完毕','flow14执行完毕')
print('流程十四执行完毕','flow14执行完毕')
# sys.exit(0)
def flow12():
from execute import flow15
......@@ -120,6 +118,7 @@ def main_text():
def flow15():
from execute import flow18
flow18()
tkinter.messagebox.showinfo('流程十五执行完毕')
# sys.exit(0)
def flow16():
from execute import flow19
......@@ -129,10 +128,12 @@ def main_text():
def flow17():
from execute import flow20
flow20()
tkinter.messagebox.showinfo('流程十七执行完毕')
# sys.exit(0)
def flow18():
from execute import flow21
flow21()
tkinter.messagebox.showinfo('流程十八执行完毕')
# sys.exit(0)
def flow0():
execute_command("python runner_test.py tag id2302-23 debug mdm3")
......
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