From 7357c25219306d188c16e8f1025b903f51ef985d Mon Sep 17 00:00:00 2001 From: LG_lai Date: Wed, 10 Aug 2022 11:35:41 +0800 Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E7=BB=84=E7=BB=87=E4=BF=A1?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 000-LoginToken/2.1-APPlogin.robot | 5 +++-- 000-LoginToken/2.2-APPlogin.robot | 5 +++-- .../2-Platform/Order/1-Platform dispatch.robot | 11 ++++++++--- .../2-Platform/Order/1-Platform dispatch.robot | 11 ++++++++--- .../2-Platform/Order/1-Platform dispatch.robot | 11 ++++++++--- 5 files changed, 30 insertions(+), 13 deletions(-) diff --git a/000-LoginToken/2.1-APPlogin.robot b/000-LoginToken/2.1-APPlogin.robot index f0fa116..973294e 100644 --- a/000-LoginToken/2.1-APPlogin.robot +++ b/000-LoginToken/2.1-APPlogin.robot @@ -37,7 +37,7 @@ get_baseInfo ${orgId} Get From Dictionary ${items} id #组织id ${orgfullName} Get From Dictionary ${items} fullName #组织名称 ${packerBaseInfo} Get From Dictionary ${items} packerBaseInfo #组织工厂信息 - Exit For Loop If '${orgfullName}'=='仔仔工厂' + Exit For Loop If '${orgId}'=='721761724339982336' #判断仔仔工厂组织 END ${packerId} Get From Dictionary ${packerBaseInfo['scrapPaperPackingFactoryList'][0]} id #组织工厂id ${packerName} Get From Dictionary ${packerBaseInfo['scrapPaperPackingFactoryList'][0]} name #组织工厂名称 @@ -55,10 +55,11 @@ get_Personal_baseInfo ${reps} GET On Session baseinfo ztb-supply-chain-service/get/user/base-info ${organizationList} Get From Dictionary ${reps.json()['data']} organizationList #用户组织列表 FOR ${items} IN @{organizationList} + ${orgId_p} Get From Dictionary ${items} id #个人资质组织id ${orgfullName} Get From Dictionary ${items} fullName #组织名称 ${enterpriseInfo} Get From Dictionary ${items} enterpriseInfo #组织企业信息 ${qualificationType} Get From Dictionary ${items} qualificationType - Exit For Loop If '${orgfullName}'=='仔仔工厂' + Exit For Loop If '${orgId_p}'=='721761724339982336' END ${salesTaxPoint} Set Variable 2051 Set Global Variable ${salesTaxPoint} diff --git a/000-LoginToken/2.2-APPlogin.robot b/000-LoginToken/2.2-APPlogin.robot index adf84e9..3d761f6 100644 --- a/000-LoginToken/2.2-APPlogin.robot +++ b/000-LoginToken/2.2-APPlogin.robot @@ -35,7 +35,7 @@ get_baseInfo ${orgId} Get From Dictionary ${items} id #组织id ${orgfullName} Get From Dictionary ${items} fullName #组织名称 ${packerBaseInfo} Get From Dictionary ${items} packerBaseInfo #组织工厂信息 - Exit For Loop If '${orgfullName}'=='长沙中联泵业股份有限公司' + Exit For Loop If '${orgId}'=='721760754042277888' #判断长沙中联组织 END ${packerId} Get From Dictionary ${packerBaseInfo['scrapPaperPackingFactoryList'][0]} id #组织工厂id ${packerName} Get From Dictionary ${packerBaseInfo['scrapPaperPackingFactoryList'][0]} name #组织工厂名称 @@ -53,10 +53,11 @@ get_Enterprise_baseInfo ${reps} GET On Session baseinfo ztb-supply-chain-service/get/user/base-info ${organizationList} Get From Dictionary ${reps.json()['data']} organizationList #用户组织列表 FOR ${items} IN @{organizationList} + ${orgId_t} Get From Dictionary ${items} id #企业资质组织id ${orgfullName} Get From Dictionary ${items} fullName #组织名称 ${enterpriseInfo} Get From Dictionary ${items} enterpriseInfo #组织企业信息 ${qualificationType} Get From Dictionary ${items} qualificationType - Exit For Loop If '${orgfullName}'=='长沙中联泵业股份有限公司' + Exit For Loop If '${orgId_t}'=='721760754042277888' END ${salesTaxPoint} Get From Dictionary ${enterpriseInfo} salesTaxPoint Set Global Variable ${salesTaxPoint} diff --git a/002-AgentSale/2-Platform/Order/1-Platform dispatch.robot b/002-AgentSale/2-Platform/Order/1-Platform dispatch.robot index 5c7935f..8420903 100644 --- a/002-AgentSale/2-Platform/Order/1-Platform dispatch.robot +++ b/002-AgentSale/2-Platform/Order/1-Platform dispatch.robot @@ -61,9 +61,14 @@ Agent_saletype Create Session order center ${ztbscops} ${ztbsc_header} ${reps} GET On Session order center ztb-supply-chain-service/admin/get/financial-service-provider/for-dispatch params=paperMillCategoryId=${paperMillScrapPaperCategoryId}&supplierOrgId=${sellerOrgId}&paperMillOrgId=${paperMillOrgId} ${proxySaleServiceProviderList} Get From Dictionary ${reps.json()['data']} proxySaleServiceProviderList #代卖供应链id列表 - ${SupplyChainId} Evaluate random.choice(${proxySaleServiceProviderList}) random - ${paperMillFinancialServiceProviderId} Get From Dictionary ${SupplyChainId} paperMillFinancialServiceProviderId #随机选择供应链id - ${paperMillFinancialServiceProviderName} Get From Dictionary ${SupplyChainId} serviceProviderOrgName #随机选择供应链名称 + FOR ${items} IN @{proxySaleServiceProviderList} + ${paperMillFinancialServiceProviderId} Get From Dictionary ${items} paperMillFinancialServiceProviderId #供应链id + ${paperMillFinancialServiceProviderName} Get From Dictionary ${items} serviceProviderOrgName #供应链名称 + Exit For Loop If '${paperMillFinancialServiceProviderId}'=='${paperMillFinancialServiceProviderId}' + END + #${SupplyChainId} Evaluate random.choice(${proxySaleServiceProviderList}) random + #${paperMillFinancialServiceProviderId} Get From Dictionary ${SupplyChainId} paperMillFinancialServiceProviderId #随机选择供应链id + #${paperMillFinancialServiceProviderName} Get From Dictionary ${SupplyChainId} serviceProviderOrgName #随机选择供应链名称 Set Global Variable ${paperMillFinancialServiceProviderId} Set Global Variable ${paperMillFinancialServiceProviderName} diff --git a/005-AgencyForwardFactoring/2-Platform/Order/1-Platform dispatch.robot b/005-AgencyForwardFactoring/2-Platform/Order/1-Platform dispatch.robot index 5c7935f..8420903 100644 --- a/005-AgencyForwardFactoring/2-Platform/Order/1-Platform dispatch.robot +++ b/005-AgencyForwardFactoring/2-Platform/Order/1-Platform dispatch.robot @@ -61,9 +61,14 @@ Agent_saletype Create Session order center ${ztbscops} ${ztbsc_header} ${reps} GET On Session order center ztb-supply-chain-service/admin/get/financial-service-provider/for-dispatch params=paperMillCategoryId=${paperMillScrapPaperCategoryId}&supplierOrgId=${sellerOrgId}&paperMillOrgId=${paperMillOrgId} ${proxySaleServiceProviderList} Get From Dictionary ${reps.json()['data']} proxySaleServiceProviderList #代卖供应链id列表 - ${SupplyChainId} Evaluate random.choice(${proxySaleServiceProviderList}) random - ${paperMillFinancialServiceProviderId} Get From Dictionary ${SupplyChainId} paperMillFinancialServiceProviderId #随机选择供应链id - ${paperMillFinancialServiceProviderName} Get From Dictionary ${SupplyChainId} serviceProviderOrgName #随机选择供应链名称 + FOR ${items} IN @{proxySaleServiceProviderList} + ${paperMillFinancialServiceProviderId} Get From Dictionary ${items} paperMillFinancialServiceProviderId #供应链id + ${paperMillFinancialServiceProviderName} Get From Dictionary ${items} serviceProviderOrgName #供应链名称 + Exit For Loop If '${paperMillFinancialServiceProviderId}'=='${paperMillFinancialServiceProviderId}' + END + #${SupplyChainId} Evaluate random.choice(${proxySaleServiceProviderList}) random + #${paperMillFinancialServiceProviderId} Get From Dictionary ${SupplyChainId} paperMillFinancialServiceProviderId #随机选择供应链id + #${paperMillFinancialServiceProviderName} Get From Dictionary ${SupplyChainId} serviceProviderOrgName #随机选择供应链名称 Set Global Variable ${paperMillFinancialServiceProviderId} Set Global Variable ${paperMillFinancialServiceProviderName} diff --git a/006-CounterFactoring/2-Platform/Order/1-Platform dispatch.robot b/006-CounterFactoring/2-Platform/Order/1-Platform dispatch.robot index 5c7935f..8420903 100644 --- a/006-CounterFactoring/2-Platform/Order/1-Platform dispatch.robot +++ b/006-CounterFactoring/2-Platform/Order/1-Platform dispatch.robot @@ -61,9 +61,14 @@ Agent_saletype Create Session order center ${ztbscops} ${ztbsc_header} ${reps} GET On Session order center ztb-supply-chain-service/admin/get/financial-service-provider/for-dispatch params=paperMillCategoryId=${paperMillScrapPaperCategoryId}&supplierOrgId=${sellerOrgId}&paperMillOrgId=${paperMillOrgId} ${proxySaleServiceProviderList} Get From Dictionary ${reps.json()['data']} proxySaleServiceProviderList #代卖供应链id列表 - ${SupplyChainId} Evaluate random.choice(${proxySaleServiceProviderList}) random - ${paperMillFinancialServiceProviderId} Get From Dictionary ${SupplyChainId} paperMillFinancialServiceProviderId #随机选择供应链id - ${paperMillFinancialServiceProviderName} Get From Dictionary ${SupplyChainId} serviceProviderOrgName #随机选择供应链名称 + FOR ${items} IN @{proxySaleServiceProviderList} + ${paperMillFinancialServiceProviderId} Get From Dictionary ${items} paperMillFinancialServiceProviderId #供应链id + ${paperMillFinancialServiceProviderName} Get From Dictionary ${items} serviceProviderOrgName #供应链名称 + Exit For Loop If '${paperMillFinancialServiceProviderId}'=='${paperMillFinancialServiceProviderId}' + END + #${SupplyChainId} Evaluate random.choice(${proxySaleServiceProviderList}) random + #${paperMillFinancialServiceProviderId} Get From Dictionary ${SupplyChainId} paperMillFinancialServiceProviderId #随机选择供应链id + #${paperMillFinancialServiceProviderName} Get From Dictionary ${SupplyChainId} serviceProviderOrgName #随机选择供应链名称 Set Global Variable ${paperMillFinancialServiceProviderId} Set Global Variable ${paperMillFinancialServiceProviderName}