Commit 728d918d authored by 肖 和生's avatar 肖 和生
Browse files

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

parents 0b0840ab 341aca50
......@@ -3,36 +3,37 @@
- &id001
- id:
hosId: h0347
branchId: h0347-3753
branchId: h0347-3783
deptId:
taskType: 1
sourceOrgId: p1e4bc
sourceOrgName: 国药集团公司M@n&X
sourceOrderNo: PSh0347202411010076
billMode: '25'
sourceOrgId: p1e509
sourceOrgName: 国药集团公司NHDet
sourceOrderNo: PSh0347202411070011
billMode: '66'
stockKind:
purMode:
sourceId: PSh0347202411010076
sourceId: PSh0347202411070011
sourceDetailId:
sourceType: PSD
sourceTypeName: 配送单
sourceVersion: 1
planOrderNo: SSSQ202411010374
purOrderNo: SSTZ202411010341
recOrgId: 4e47f180e69f4fb88a79fc4b2d211635
recOrgName: 二级检验科002
billRelationJson: '{"operationApplyOrderNo":"SSSQ202411010374","operationNoticeBillId":"Nh034720241101000005","distrBillId":"PSh0347202411010076","operationNoticeOrderNo":"SSTZ202411010341","distrOrderNo":"PSh0347202411010076","operationApplyBillId":"Oh034720241101000005"}'
taskDate: '2024-11-01 14:51:01'
planOrderNo: PLAN2024110734457
purOrderNo: CG2024110719709
recOrgId: 4cca3c17b3bf4caa9d6181f671798822
recOrgName: 设备科001
billRelationJson: '{"planBillId":"Ph034720241107031102","planOrderNo":"PLAN2024110734457","purOrderNo":"CG2024110719709","purBillId":"Ch034720241107000038","purBillDate":"2024-11-07
10:02:51","distrBillId":"PSh0347202411070011","distrOrderNo":"PSh0347202411070011"}'
taskDate: '2024-11-07 10:03:50'
taskDateStart:
taskDateEnd:
billModeList:
viewIdList:
supplierFlag: false
tbStatus: 20
remark:
remark: ''
pdaFlag:
areaCode:
areaCodeName:
areaCode: areah03472733
areaCodeName: 自动化测试
list_b:
- *id001
list_c:
......
验收单详情信息:
list_a:
- &id001
- purMode: 20
unitName: 1
hosGoodsId: h034700005760
- purMode: 60
unitName: 100支/100
hosGoodsId: h034700005895
mdmGoodsCode:
spdGoodsCode: '11662822'
goodsCode: '00005760'
goodsName: 高值牙钻机$5zt4
spdGoodsCode: '11662957'
goodsCode: '00005895'
goodsName: 新型冠状病毒检测试剂g#fPr
goodsGg: G-31891
mfrsId:
mfrsName: 德国歌德公司 Geuder AG
......@@ -16,22 +16,22 @@
goodsDi: '01123456789012'
miCode:
miDjmc:
certificateCode:
certificateCode: ''
rfidFlag: 0
pkgDefId:
pkgDefName:
pkgDefQty: 1.0
batchCode: '2222'
expdtDate: '2025-05-10'
productDate: '2024-11-01'
provName: 国药集团公司M@n&X
pkgDefName: '100'
pkgDefQty: 100.0
batchCode: '4444'
expdtDate: '2025-05-16'
productDate: '2024-11-07'
provName: 国药集团公司NHDet
provId:
viewId: '03843765'
viewId: '03843891'
verifyFlag: 0
hasSterilize: 0
id: '03843765'
id: '03843891'
detailRelationJson:
extInfo: '{"ygptCode":"","transCond":"","storageCond":"","erpCode":""}'
extInfo: '{"goodsGg":"G-31891","goodsCode":"00005895","purMode":60,"goodsName":"新型冠状病毒检测试剂g#fPr","ygptCode":"","transCond":"","storageCond":"","erpCode":"11662957","ybDefId":""}'
recTemperature: 20
recHumidity: 30
temperature:
......@@ -41,8 +41,8 @@
sterilizationDate:
sterilizationEndDate:
distrPrice: 99.9999
distrPkgQty: 1.0
distrQty: 1.0
distrPkgQty: 100.0
distrQty: 10000.0
price: 99.9999
checkQty: 0.0
checkPkgQty: 0
......@@ -50,7 +50,7 @@
initQty:
totalQty:
rowNum:
settlement: 3
settlement: 1
hdiBarcodeList:
detailId:
pkgCode:
......@@ -61,9 +61,9 @@
trustMrfsName:
multiChargeFlag: 0
useFrequency: 1
codingType: 0
codingType:
limitMessage:
autoUnpack: 0
autoUnpack:
orderNo:
expireType: 0
remark:
......
验收单号:
CHECK_NO1: CHECKh03472024110100072
CHECK_NO2: CHECKh03472024110100072
CHECK_NO1: CHECKh03472024110700005
CHECK_NO2: CHECKh03472024110700005
......@@ -5,34 +5,34 @@
lastModified:
version:
createTime:
createUser: h0347_UID-051410
createUser: h0347_UID-051440
lastModifiedUser:
billMode: '66'
billMode: '16'
recType:
stockKind:
purMode:
sourceId: DRh034720241101000139
sourceType: CK_TK
sourceVersion: 1
sourceId: CHECKh03472024110700003
sourceType: PSD
sourceVersion: 0
batchList:
billRelationJson:
hosId: h0347
deptId: e336188c385b4a06ab5faf019ace76d1
deptId: 4cca3c17b3bf4caa9d6181f671798822
deptName:
branchId: h0347-3753
branchId: h0347-3783
branchName:
taskType: 2
sourceOrgId: 4e47f180e69f4fb88a79fc4b2d211635
sourceOrgName: 二级检验科002
sourceOrderNo: DN20241101000139
taskSourceNo: DN20241101000139
areaCode:
areaName:
taskType: 1
sourceOrgId: p1e509
sourceOrgName: 国药集团公司NHDet
sourceOrderNo: YS241107003
taskSourceNo: PSh0347202411070009
areaCode: areah03472733
areaName: 自动化测试
goodsName:
goodsGg:
startDate:
endDate:
taskDate: '2024-11-01 12:04:46'
taskDate: '2024-11-07 10:05:40'
pkgTaskId:
pkgFlag:
remark: ''
......
验收单库存详情信息:
list_a:
- &id001
- id: DRh0347202411010001390001
- id: CHECKh034720241107000030001
lastModified:
version:
createTime:
createUser:
lastModifiedUser:
rowIdx:
purMode: 60
purMode: 10
unitName: 100支/100
pid: DRh034720241101000139
hosGoodsId: h034700005762
batchCode: '4444'
expdtDate: '2025-05-10'
productDate: '2024-11-01'
pid: CHECKh03472024110700003
hosGoodsId: h034700005894
batchCode: '333'
expdtDate: '2025-05-16'
productDate: '2024-11-07'
batchPrice: 99.9999
settlement: 1
batchType: 40
srcBatchId: Ph034724110100025
batchType: 20
srcBatchId: '03843889'
srcBatchPrice: 99.9999
shelfCode: areah03472600-2-01-01
shelfCode: areah03472733-2-01-01
shelfKind:
barcodeId: UT241101000516
barcodeId: UT241107000202
subBarcodeId:
qty: 100.0
pkgQty: 1
distrId: PSh0347202411010030
distrDetailId: '03843719'
pkgDefQty:
pkgDefName:
viewId: h03470000576244442025-05-10100支/100
qty: 10000.0
pkgQty: 100
distrId: PSh0347202411070009
distrDetailId: '03843889'
pkgDefQty: 100.0
pkgDefName: '100'
viewId: h0347000058943332025-05-16100支/100
codingType:
batchFlag:
hasSterilize: 0
......@@ -40,67 +40,53 @@
expireType: 0
remark:
orderNo:
sourceDetailId: PICKh03472411010080660001
mdmGoodsCode: '11662824'
goodsCode: '00005762'
tbStatus:
billMode:
hosId:
branchId:
purBillId: Ch034720241101000057
provId: p1e4bc
provName:
subProvId: p1e4bc
purDetailId:
goodsName: 新型冠状病毒检测试剂pF3wb
sourceDetailId: '03843889'
mdmGoodsCode: '11662956'
goodsCode: '00005894'
tbStatus: 1
billMode: '16'
hosId: h0347
branchId: h0347-3783
purBillId: Ch034720241107000036
provId: p1e509
provName: 国药集团公司NHDet
subSendFlag: 10
exeProvId: p1e509
exeProvName: 国药集团公司NHDet
purDetailId: a0976dd70dc04425876f3ff3cd011b21
goodsName: 一次性注射器_低值muQJ*
goodsGg: G-31891
mfrsId: mfrs-11229
mfrsName: 德国歌德公司 Geuder AG
made: 德国
unit:
sourceBatchId: Ph034724110100025
targetBatchId: Ph034724110100025
pkgDefId:
purPrice: 99.9999
pkgDefId: 5f10737566984c9ebaf33bcd73559a0f
supplyId: 5832213ed1ec4204ab43c887609392d0
subProvId: p1e509
subProvName: 国药集团公司NHDet
subPrice: 99.9999
distrPrice: 99.9999
distrPkgQty: 100.0
distrQty: 10000.0
certificateCode: ''
productCertCode:
detailRelationJson:
extInfo:
psiPrice: 99.9999
ext:
goodsGg: G-31891
goodsCode: '00005762'
purMode: 60
goodsName: 新型冠状病毒检测试剂pF3wb
goodsCode: '00005894'
purMode: 10
goodsName: 一次性注射器_低值muQJ*
ygptCode: ''
transCond: ''
storageCond: ''
erpCode: '11662824'
erpCode: '11662956'
ybDefId: ''
contractId: ''
normalContractId: ''
normalDetailId: ''
fcatId: ''
fcatName: ''
goodsKindId: ''
goodsKindName: ''
miTwentysevenCode: ''
chargeFlag: 1
focus_control: '0'
focus_control_type:
rtnQty:
hisChargeNo:
purTaskId:
multiChargeFlag:
trustMrfsName:
pkgCodeSee:
chargeFlag:
stockKind: CK_TK
sourceDeptId: 4e47f180e69f4fb88a79fc4b2d211635
targetDeptId: e336188c385b4a06ab5faf019ace76d1
ableDelFlag:
pickType: KS_TK
recTemperature:
recHumidity:
jfCode:
inHosBatchId: Ph034724110100025
distrNo: PSh0347202411010030
list_b:
- *id001
list_c:
......
产品审核信息:
MSPid: MSP2411050023_1
MSPid: MSP2411070018_1
hosId: h0347
hosGoodsId: h034700005851
provGoodsid: provGood-99223162
goodsAuditBillId: MSP2411050023
targetId: MSP2411050023_1
hosGoodsId: h034700005894
provGoodsid: provGood-99223206
goodsAuditBillId: MSP2411070018
targetId: MSP2411070018_1
产品审核信息:
MSPid: MSP2411050024_1
MSPid: MSP2411070019_1
hosId: h0347
hosGoodsId: h034700005852
provGoodsid: provGood-99223163
goodsAuditBillId: MSP2411050024
targetId: MSP2411050024_1
hosGoodsId: h034700005895
provGoodsid: provGood-99223207
goodsAuditBillId: MSP2411070019
targetId: MSP2411070019_1
产品审核信息:
MSPid: MSP2411050025_1
MSPid: MSP2411070020_1
hosId: h0347
hosGoodsId: h034700005853
provGoodsid: provGood-99223164
goodsAuditBillId: MSP2411050025
targetId: MSP2411050025_1
hosGoodsId: h034700005896
provGoodsid: provGood-99223208
goodsAuditBillId: MSP2411070020
targetId: MSP2411070020_1
产品审核信息:
MSPid: MSP2411050026_1
MSPid: MSP2411070021_1
hosId: h0347
hosGoodsId: h034700005854
provGoodsid: provGood-99223165
goodsAuditBillId: MSP2411050026
targetId: MSP2411050026_1
hosGoodsId: h034700005897
provGoodsid: provGood-99223209
goodsAuditBillId: MSP2411070021
targetId: MSP2411070021_1
产品包装信息:
unitPackageid1: a02ba5c949994d9fbaf0c9c9f8d1fe1a
unitPackageid2: a02ba5c949994d9fbaf0c9c9f8d1fe1a
unitPackageid1: 312bfbfe7842460b84520fc5bc9c70cb
unitPackageid2: 312bfbfe7842460b84520fc5bc9c70cb
采购计划单号:
orderNo1: PLAN2024110130550
orderNo2: PLAN2024110130550
orderNo1: PLAN2024110734455
orderNo2: PLAN2024110734455
配送订单信息:
list_a:
- &id001
- id: Nh034720241101000005
orderNo: SSTZ202411010341
sourceOrderNo: SSSQ202411010374
hosId: h0347
hosName: 邹城市人民医院(test)
branchName: 二级检验科002
recDeptName: 血管扩张术
operName: Oh034720241101000005
operDate: '2024-11-02'
operDoctor: 李*
patientName: 张*
status: 10
statusText: 待确认
- id: Ch034720241107000038
lastModified: '2024-11-07 10:02:51'
version: 0
patientInHosId: '123456'
surDeptName: ''
remark: 自动化测试
createUserName: 自动化测试v&gPa
distPriority: 0
distPriorityText:
distId:
distNo:
createTime: '2024-11-07 10:02:51'
createUser: h0347_UID-051440
lastModifiedUser:
orderNo: CG2024110719709
billMode: '66'
recType: YND
hosId: h0347
branchId: h0347-3783
deptId:
deptName:
recOrgId: 4cca3c17b3bf4caa9d6181f671798822
recOrgName: 设备科001
areaCode:
areaName:
billExpdtDate:
sourceId: Ph034720241107031102
sourceType:
inSettlement:
recUser:
recPhone:
recAddr: 自动化测试
provId: p1e509
provName: 国药集团公司NHDet
subSendFlag:
exeProvId: p1e509
exeProvName: 国药集团公司NHDet
billRelationJson:
extInfo:
barcodeFlag: 1
pkgFlag:
remark: ''
priority:
closeStatus: 0
closeDate:
upStatus:
tbStatus: 30
hosVersion: 3
createTime: '2024-11-01 14:50:27'
sumQty:
sumAmount:
operationPkg: 0
provId: p1e4bc
provName: 国药集团公司M@n&X
subProvId: ''
subProvName: ''
recDeptId: 4e47f180e69f4fb88a79fc4b2d211635
sourceBillId: 东土城路院区sp$9*
billType: CGD
hosName: 邹城市人民医院(test)
branchName: 东土城路院区#!H7P
sumQty: 10000.0
sumPkgQty: 100.0
sumAmount: '999999.0000'
sumReplQty: 0.0
planOrderNo: PLAN2024110734457
replBillNo:
list_b:
- *id001
list_c:
......
配送订单详细信息:
list_a:
- &id001
id: Nh034720241101000005
orderNo: SSTZ202411010341
sourceOrderNo: SSSQ202411010374
hosId: h0347
hosName: 邹城市人民医院(test)
branchName: 二级检验科002
recDeptName: 血管扩张术
operName: Oh034720241101000005
operDate: '2024-11-02'
operDoctor: 李*
patientName: 张*
status: 20
statusText: 待配送
version: 1
patientInHosId: '123456'
surDeptName: ''
remark: 自动化测试
createUserName: 自动化测试v&gPa
distPriority: 0
distPriorityText:
distId:
distNo:
hosVersion: 3
createTime: '2024-11-01 14:50:27'
sumQty: 1
sumAmount: '99.9999'
operationPkg: 0
provId: p1e4bc
provName: 国药集团公司M@n&X
subProvId: ''
subProvName: ''
recDeptId: 4e47f180e69f4fb88a79fc4b2d211635
sourceBillId: 东土城路院区sp$9*
list_b:
- *id001
list_c:
- *id001
配送订单详细信息2:
list_a:
- &id001
- id: h034720241101000005
hosGoodsId: h034700005760
goodsNum: 1
- id: 44865e173b4e4cf4b832a9afb3ad2d11
lastModified:
version:
createTime:
createUser:
lastModifiedUser:
pid: Ch034720241107000038
orderNo: CG2024110719709
sourceId: e16e3f029bc84d6bb70d999dd624da16
hosGoodsId: h034700005895
mdmGoodsCode: '11662957'
goodsCode: '00005895'
purMode: 60
price: '99.9999'
inSettlement: 3
inSettlementText: 消耗结算
goodsName: 高值牙钻机$5zt4
goodsSpec: G-31891
goodsCode: '00005760'
goodsMfrsId: mfrs-11229
goodsMfrsName: 德国歌德公司 Geuder AG
supplyId: 87308dd6c775455fa283b62e8ee30e12
pkgDefId: 312bfbfe7842460b84520fc5bc9c70cb
pkgDefName: '100'
pkgDefQty: 100.0
pkgQty: 100.0
qty: 10000.0
conPkgQty: 100.0
conQty: 10000.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":"Ph034720241107031102","planDetailId":"e16e3f029bc84d6bb70d999dd624da16"}'
extInfo: '{"goodsGg":"G-31891","goodsCode":"00005895","purMode":60,"goodsName":"新型冠状病毒检测试剂g#fPr"}'
remark:
tbStatus:
hosVersion:
unit:
subProvId: p1e4bc
subProvName: 国药集团公司M@n&X
totalAmount: '99.9999'
spdGoodsCode: '11662822'
barCodeMng: 2
erpCode: '11662822'
goodsName: 新型冠状病毒检测试剂g#fPr
mfrsId: mfrs-11229
mfrsName: 德国歌德公司 Geuder AG
goodsGg: G-31891
mdmGoodsSpecCode: '11662957'
erpCode: '11662957'
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: gs1
diUse: '37830000058950'
multiChargeFlag: 0
useFrequency: 1
chargeUnit:
hitCode: '12'
hitPrice: '99.999900'
diUse:
goodsDi: '01123456789012'
amount: '999999.0000'
unitName: 100支/100
subProvId: p1e509
subProvName: 国药集团公司NHDet
subPrice: 99.9999
replPkgQty: 100.0
replQty: 10000.0
ybDefId:
logicId:
provGoodsId:
sendFlag:
curQry:
list_b:
- *id001
list_c:
......
......@@ -320,11 +320,12 @@ def main_text():
else:
for i in branch_id_list:
button_clicked(i)
messagebox.showinfo("提示信息", "数据删除完毕")
def button_clicked(branch_id):
result = confirm()
if result == True:
result1 = confirm1()
if result1 == True:
# result = confirm()
# if result == True:
# result1 = confirm1()
# if result1 == True:
print(branch_id)
delData().Delete_goods_change_info()
delData().Delete_probeInfo_other(3, branch_id)
......@@ -433,7 +434,7 @@ def main_text():
column=2)
Button(root, text='删除5天前\n产品数据', anchor='center', width=8, height=3, command=del_goods_info).grid(row=6,
column=4)
Button(root, text='一键删除其他\n院区数据', anchor='center', width=8, height=3, command=del_other_branch_info).grid(row=6,
Button(root, text='一键删除\n其他\n院区数据', anchor='center', width=8, height=3, command=del_other_branch_info).grid(row=6,
column=6)
Button(root, text='退 出', anchor='center', width=8, height=2, command=exit).grid(row=5, column=10)
......
......@@ -75,8 +75,8 @@ setInterval(updateTime, 1000); // 每秒更新一次时间
</tr>
<tr width="600">
<td class='details-col-elapsed'>5</td>
<td class='details-col-elapsed'>5</td>
<td class='details-col-elapsed'>8</td>
<td class='details-col-elapsed'>8</td>
<td class='details-col-elapsed'>0分3秒</td>
<td class="details-col-elapsed">100.0%</td>
</tr>
......@@ -93,37 +93,58 @@ setInterval(updateTime, 1000); // 每秒更新一次时间
</tr>
<tr width="600">
<td class="details-col-elapsed"><a href='../log/医院注册_正常注册_私立医院/log.html' target='_blank'>医院注册_正常注册_私立医院</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">0.349</td>
<td class="details-col-elapsed">0.574</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="details-col-elapsed"><a href='../log/外网企业注册-器械注册人-所有输入项填写/log.html' target='_blank'>外网企业注册-器械注册人-所有输入项填写</a></td>
<td class="success">成功</td>
<td class="details-col-elapsed">0.443</td>
<td class="details-col-elapsed">0.475</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="details-col-elapsed"><a href='../log/外网企业注册-器械注册人-有附件/log.html' target='_blank'>外网企业注册-器械注册人-有附件</a></td>
<td class="success">成功</td>
<td class="details-col-elapsed">0.327</td>
<td class="details-col-elapsed">0.421</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="details-col-elapsed"><a href='../log/外网企业注册-器械注册人/log.html' target='_blank'>外网企业注册-器械注册人</a></td>
<td class="success">成功</td>
<td class="details-col-elapsed">1.543</td>
<td class="details-col-elapsed">0.399</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="details-col-elapsed"><a href='../log/外网企业注册提交接口_正常注册/log.html' target='_blank'>外网企业注册提交接口_正常注册</a></td>
<td class="success">成功</td>
<td class="details-col-elapsed">1.077</td>
<td class="details-col-elapsed">0.379</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.488</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.464</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.401</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