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

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

# Conflicts:
#	data/b5_spd3_core_business_flow/message21
#	data/b5_spd3_core_business_flow/message22
parents 2511b620 34f308d2
Hide whitespace changes
Inline Side-by-side
air_case/b5_spd3_core_business_flow/a_b2流程九请领业务流_二级库向中心库.air/a_b2流程九请领业务流_二级库向中心库.py
View file @ 24480b19
...@@ -407,12 +407,19 @@ def main(): ...@@ -407,12 +407,19 @@ def main():
second_dept_Request(FileUtils().r_info8("b5_spd3_core_business_flow", "产品审核信息", 'message3')['hosGoodsId'], 3) second_dept_Request(FileUtils().r_info8("b5_spd3_core_business_flow", "产品审核信息", 'message3')['hosGoodsId'], 3)
BuyCarSubmit() # 请领车提交 BuyCarSubmit() # 请领车提交
for i in range(6): # 三个单据共审批6次 """
这里的审批跟审批流的设置有关
"""
for i in range(3): # 三个单据共审批3次
approval_center() approval_center()
updateUserLoginDefaultRange(get_listUserMgrRangePage(1)) #设置登录账号默认权限是中心库 updateUserLoginDefaultRange(get_listUserMgrRangePage(1)) #设置登录账号默认权限是中心库
#获取拣货单列表个数 #获取拣货单列表个数
for i in range(get_centeStock_pick_list_counts()): try:
centeStock_pick()#中心库拣货 for i in range(get_centeStock_pick_list_counts()):
centeStock_pick()#中心库拣货
except:
for i in range(3): # 三个单据共审批3次
approval_center()
#低值拣货执行 #低值拣货执行
hosGoodsId = FileUtils().r_info8("b5_spd3_core_business_flow", "产品审核信息", 'message2')['hosGoodsId'] hosGoodsId = FileUtils().r_info8("b5_spd3_core_business_flow", "产品审核信息", 'message2')['hosGoodsId']
GoodsId = hosGoodsId.replace(get_hosid(), '') GoodsId = hosGoodsId.replace(get_hosid(), '')
......
data/b5_spd3_core_business_flow/message18
View file @ 24480b19
条码信息: 条码信息:
list_a: list_a:
- &id001 - &id001
- id: UT240708000101 id: UT240708000102
lastModified: snCode: UT240708000102
version: ssccCode: '010839000187194724'
createTime: '2024-07-08 05:06:21' pkgCodeSee: 0101123456789012104444112407081725011421UT240708000102
createUser: hosGoodsId: h034700004501
lastModifiedUser: hosGoodsCode: '00004501'
snCode: UT240708000101 goodsCode: '00004501'
hosId: h0347 goodsName: 新型冠状病毒检测试剂hO3Tu
branchId: goodsSpec: G-31891
stockId: 3a4ab96db19047cc9c36e92a6cc5ea06 goodsMfrsName: 德国歌德公司 Geuder AG
areaCode: areah03472677 unit: 支
areaName: 自动化测试 purMode: 60
shelfCode: areah03472677-2-01-01 batchCode: '4444'
codeType: 66 productDate: '2024-07-08'
tagType: 0 expdtDate: '2025-01-14'
hosGoodsId: h034700004501 pkgDefName: '100'
mdmGoodsCode: '11661454' pkgDefQty: 100.0
goodsCode: '00004501' stockId: 3a4ab96db19047cc9c36e92a6cc5ea06
goodsDi: '01123456789012' stockName: 东土城路院区IjnkG中心库房
barName: 100支/100 areaName: 自动化测试
batchCode: '4444' areaCode: areah03472677
expdtDate: '2025-01-14' lockStatus: 0
productDate: '2024-07-08' unitName: 100支/100
mfrCode: shelfCode: areah03472677-2-01-01
mfrCodeSee: shelfNo: 自动化测试-2-01-01
pkgCode: "0101123456789012104444\x1D112407081725011421UT240708000101" pkgDefId: 2d4d3bd0ebe745efa73bb7123cf21f6a
pkgCodeSee: 0101123456789012104444112407081725011421UT240708000101 extInfo: '{"pkgDefId": "2d4d3bd0ebe745efa73bb7123cf21f6a", "pkgDefQty": 100, "purBillId":
ssccCode: '010839000187194625' "CG2024070820770", "pkgDefName": "100", "distrBillId": "PSh0347202407080004",
extInfo: "inStockTime": "2024-07-08 05:08:08", "distrDetailId": "03839345", "certificateCode":
outId: ""}'
tbStatus: 20 bottleId:
goodsCodeDi: pkgType: '66'
barcodeId: miDjmc: ''
ext: miCode: ''
pkgDefId: 2d4d3bd0ebe745efa73bb7123cf21f6a transferRatio: 1.0
pkgDefQty: 100 qty: 1
purBillId: CG2024070820770 shelfKind: 0
pkgDefName: '100' shelfKindName: 普通货位
distrBillId: PSh0347202407080004 provName: 国药集团公司^n1@F
inStockTime: '2024-07-08 05:08:08' provId: p1e32e
distrDetailId: '03839345' inStockDate:
certificateCode: '' mfrCode:
sourceDetailId: made: 德国
purMode: 60 price:
purModes: barName: 100支/100
price: purModeText: 检验试剂
pid: codeType: 66
goodsMfrsName: 德国歌德公司 Geuder AG
mfrsName:
goodsSpec: G-31891
unit: 支
goodsName: 新型冠状病毒检测试剂hO3Tu
pkgDefId: 2d4d3bd0ebe745efa73bb7123cf21f6a
pkgDefQty: 100
defaultPkgDefQty:
defaultQty:
defaultSurplusQty:
defaultPkgDefId:
purDetailId:
pkgDefName: '100'
printNum: 0
deptId:
deptName:
billId:
taskId:
made: 德国
provId: p1e32e
provName: 国药集团公司^n1@F
subProvId: p1e32e
subProvName: 国药集团公司^n1@F
provHosGoodsId:
sourceType:
taskDate:
sourceOrderNo:
taskType:
detailId:
branchGoodsPkgDefList:
unitName:
areaCodeList:
diType:
mdmGoodsSpecCode:
hosGoodsCode: '00004501'
supplyId:
inSettlement:
spdGoodsCode:
codeKind:
brand:
miCode:
transferRatio: 1.0
miDjmc:
tbStatusList:
purModeText:
stockName:
tbStatusText:
pkgType:
bottleId:
pkgStatus:
qty:
packUnit:
minSaleQty:
rfidFlag:
mfrCodeFlag:
scanStatus:
scanId:
multiChargeFlag:
useFrequency:
chargeUnit:
lockStatus:
remark:
hosBatchId:
settleFlag:
inStockTime:
verifyFlag:
subSendFlag: 10
list_b: list_b:
- *id001 - *id001
list_c: list_c:
......
main1/main_text.py
View file @ 24480b19
...@@ -29,7 +29,7 @@ def main_text(): ...@@ -29,7 +29,7 @@ def main_text():
window_width = root.winfo_screenwidth() window_width = root.winfo_screenwidth()
window_height = root.winfo_screenheight() window_height = root.winfo_screenheight()
# 设置窗口大小 # 设置窗口大小
root.geometry('395x280') root.geometry('800x560')
# 刷新窗口参数 # 刷新窗口参数
root.update() root.update()
# 计算窗口居中时左上角的坐标 # 计算窗口居中时左上角的坐标
...@@ -172,24 +172,24 @@ def main_text(): ...@@ -172,24 +172,24 @@ def main_text():
return result return result
# 文本显示的位置。 # 文本显示的位置。
Button(root, text='流程一', width=8, height=4,command=flow1).grid(row=2,column=0) Button(root, text='流程一\n外网企业注册审批', width=16, height=8,command=flow1).grid(row=2,column=0)
Button(root, text='流程二', anchor='center', width=8, height=4,command=flow2).grid(row=2,column=2) Button(root, text='流程二\n供货关系申请审批', anchor='center', width=16, height=8,command=flow2).grid(row=2,column=2)
Button(root, text='流程三', anchor='center', width=8, height=4,command=flow3).grid(row=2,column=4) Button(root, text='流程三\n流程三_产品导\n入和审批', anchor='center', width=16, height=8,command=flow3).grid(row=2,column=4)
Button(root, text='流程四', anchor='center', width=8, height=4,command=flow4).grid(row=2,column=6) Button(root, text='流程\n内网基础模块设置', anchor='center', width=16, height=8,command=flow4).grid(row=2,column=6)
Button(root, text='流程五', anchor='center', width=8, height=4,command=flow5).grid(row=2,column=8) Button(root, text='流程五\n中心库入库正结算\n开票', anchor='center', width=16, height=8,command=flow5).grid(row=2,column=8)
Button(root, text='流程六', anchor='center', width=8, height=4,command=flow6).grid(row=2,column=10) Button(root, text='流程六\n中心库入库负结算', anchor='center', width=16, height=8,command=flow6).grid(row=2,column=10)
Button(root, text='流程七', anchor='center', width=8, height=4,command=flow7).grid(row=3,column=0) Button(root, text='流程七\n中心库入库正负结算', anchor='center', width=16, height=8,command=flow7).grid(row=3,column=0)
Button(root, text='流程八', anchor='center', width=8, height=4,command=flow8).grid(row=3,column=2) Button(root, text='流程八\n高值跟台业务', anchor='center', width=16, height=8,command=flow8).grid(row=3,column=2)
Button(root, text='流程九', anchor='center', width=8, height=4,command=flow9).grid(row=3,column=4) Button(root, text='流程九\n请领业务二级库向\n中心库', anchor='center', width=16, height=8,command=flow9).grid(row=3,column=4)
Button(root, text='流程十', anchor='center', width=8, height=4,command=flow10).grid(row=3,column=6) Button(root, text='流程十\n请领业务流_二级库\n向边仓', anchor='center', width=16, height=8,command=flow10).grid(row=3,column=6)
Button(root, text='流程十一', anchor='center', width=8, height=4,command=flow11).grid(row=3,column=8) Button(root, text='流程十一\n请领业务流_二级库\n向直送', anchor='center', width=16, height=8,command=flow11).grid(row=3,column=8)
Button(root, text='流程十二', anchor='center', width=8, height=4,command=flow12).grid(row=3,column=10) Button(root, text='流程十二\n请领业务流_二级库\n向二级库', anchor='center', width=16, height=8,command=flow12).grid(row=3,column=10)
Button(root, text='流程十三', anchor='center', width=8, height=4,command=flow13).grid(row=4,column=0) Button(root, text='流程十三\n\n请领业务流_三级库\n向二级库', anchor='center', width=16, height=8,command=flow13).grid(row=4,column=0)
Button(root, text='流程十四', anchor='center', width=8, height=4,command=flow14).grid(row=4,column=2) Button(root, text='流程十四\n退库业务消耗退库', anchor='center', width=16, height=8,command=flow14).grid(row=4,column=2)
Button(root, text='流程十五', anchor='center', width=8, height=4,command=flow15).grid(row=4,column=4) Button(root, text='流程十五\n退库业务三级库向\n二级库退库', anchor='center', width=16, height=8,command=flow15).grid(row=4,column=4)
Button(root, text='流程十六', anchor='center', width=8, height=4,command=flow16).grid(row=4,column=6) Button(root, text='流程十六\n退库业务_二级库向\n一级库退库', anchor='center', width=16, height=8,command=flow16).grid(row=4,column=6)
Button(root, text='流程十七', anchor='center', width=8, height=4,command=flow17).grid(row=4,column=8) Button(root, text='流程十七\n退库业务_中心库退\n供应商', anchor='center', width=16, height=8,command=flow17).grid(row=4,column=8)
Button(root, text='流程十八', anchor='center', width=8, height=4,command=flow18).grid(row=4,column=10) Button(root, text='流程十八\n中心库业务_拆包功能', anchor='center', width=16, height=8,command=flow18).grid(row=4,column=10)
Button(root, text='一键执行', anchor='center', width=8, height=2,command=flow0).grid(row=5,column=2) Button(root, text='一键执行', anchor='center', width=8, height=2,command=flow0).grid(row=5,column=2)
Button(root, text='删除垃圾数据', anchor='center', width=8, height=2,command=del_data).grid(row=5,column=4) Button(root, text='删除垃圾数据', anchor='center', width=8, height=2,command=del_data).grid(row=5,column=4)
Button(root, text='退 出', anchor='center', width=8, height=2,command=exit).grid(row=5,column=8) Button(root, text='退 出', anchor='center', width=8, height=2,command=exit).grid(row=5,column=8)
......
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