diff --git a/000_get_base_datas/get_base_datas.robot b/000_get_base_datas/get_base_datas.robot index bdec688..99fcce5 100644 --- a/000_get_base_datas/get_base_datas.robot +++ b/000_get_base_datas/get_base_datas.robot @@ -90,7 +90,7 @@ get_user_register_datas ${customer_enterprisetype} Read Cell Data By Name customerclue_customer B2 ${customer_job} Read Cell Data By Name customerclue_customer C2 ${customer_name} Read Cell Data By Name customerclue_customer D2 - Set Global Variable ${customer_companyname} + Set Global Variable ${customer_companyname} Set Global Variable ${customer_enterprisetype} Set Global Variable ${customer_job} Set Global Variable ${customer_name} @@ -121,39 +121,503 @@ get_user_register_datas get_customer_open_account_datas Open Excel ./datas/003_open_account_customer.xls + ${printing_packaging_factory_name} Read Cell Data By Name open_account A2 + ${printing_packaging_factory_type} Read Cell Data By Name open_account B2 + ${printing_packaging_factory_shortname} Read Cell Data By Name open_account C2 + ${printing_packaging_factory_uniformsocialcreditcode} Read Cell Data By Name open_account D2 + ${printing_packaging_factory_locdetail} Read Cell Data By Name open_account E2 + ${printing_packaging_factory_legalpersonname} Read Cell Data By Name open_account F2 + ${printing_packaging_factory_legalpersonidcardno} Read Cell Data By Name open_account G2 + ${printing_packaging_factory_locprovinceid} Read Cell Data By Name open_account H2 + ${printing_packaging_factory_loccityid} Read Cell Data By Name open_account I2 + ${printing_packaging_factory_locdistrictid} Read Cell Data By Name open_account J2 + ${printing_packaging_factory_locstreetid} Read Cell Data By Name open_account K2 + ${printing_packaging_factory_locprovincename} Read Cell Data By Name open_account L2 + ${printing_packaging_factory_loccityname} Read Cell Data By Name open_account M2 + ${printing_packaging_factory_locdistrictname} Read Cell Data By Name open_account N2 + ${printing_packaging_factory_locstreetname} Read Cell Data By Name open_account O2 + Set Global Variable ${printing_packaging_factory_name} + Set Global Variable ${printing_packaging_factory_type} + Set Global Variable ${printing_packaging_factory_shortname} + Set Global Variable ${printing_packaging_factory_uniformsocialcreditcode} + Set Global Variable ${printing_packaging_factory_locdetail} + Set Global Variable ${printing_packaging_factory_legalpersonname} + Set Global Variable ${printing_packaging_factory_legalpersonidcardno} + Set Global Variable ${printing_packaging_factory_locprovinceid} + Set Global Variable ${printing_packaging_factory_loccityid} + Set Global Variable ${printing_packaging_factory_locdistrictid} + Set Global Variable ${printing_packaging_factory_locstreetid} + Set Global Variable ${printing_packaging_factory_locprovincename} + Set Global Variable ${printing_packaging_factory_loccityname} + Set Global Variable ${printing_packaging_factory_locdistrictname} + Set Global Variable ${printing_packaging_factory_locstreetname} + ${printing_packaging_factory_base_info_name} Read Cell Data By Name base_info A2 + ${printing_packaging_factory_base_info_type} Read Cell Data By Name base_info B2 + ${printing_packaging_factory_base_info_shortname} Read Cell Data By Name base_info C2 + ${printing_packaging_factory_base_info_uniformsocialcreditcode} Read Cell Data By Name base_info D2 + ${printing_packaging_factory_base_info_locdetail} Read Cell Data By Name base_info E2 + ${printing_packaging_factory_base_info_legalpersonname} Read Cell Data By Name base_info F2 + ${printing_packaging_factory_base_info_legalpersonidcardno} Read Cell Data By Name base_info G2 + ${printing_packaging_factory_base_info_locprovinceid} Read Cell Data By Name base_info H2 + ${printing_packaging_factory_base_info_loccityid} Read Cell Data By Name base_info I2 + ${printing_packaging_factory_base_info_locdistrictid} Read Cell Data By Name base_info J2 + ${printing_packaging_factory_base_info_locstreetid} Read Cell Data By Name base_info K2 + ${printing_packaging_factory_base_info_locprovincename} Read Cell Data By Name base_info L2 + ${printing_packaging_factory_base_info_loccityname} Read Cell Data By Name base_info M2 + ${printing_packaging_factory_base_info_locdistrictname} Read Cell Data By Name base_info N2 + ${printing_packaging_factory_base_info_locstreetname} Read Cell Data By Name base_info O2 + ${printing_packaging_factory_base_info_legalpersonmobile} Read Cell Data By Name base_info P2 + ${printing_packaging_factory_base_info_businessLicense} Read Cell Data By Name base_info Q2 + ${printing_packaging_factory_base_info_legalPersonIdCardBack} Read Cell Data By Name base_info R2 + ${printing_packaging_factory_base_info_legalPersonIdCardFront} Read Cell Data By Name base_info S2 + Set Global Variable ${printing_packaging_factory_base_info_name} + Set Global Variable ${printing_packaging_factory_base_info_type} + Set Global Variable ${printing_packaging_factory_base_info_shortname} + Set Global Variable ${printing_packaging_factory_base_info_uniformsocialcreditcode} + Set Global Variable ${printing_packaging_factory_base_info_locdetail} + Set Global Variable ${printing_packaging_factory_base_info_legalpersonname} + Set Global Variable ${printing_packaging_factory_base_info_legalpersonidcardno} + Set Global Variable ${printing_packaging_factory_base_info_locprovinceid} + Set Global Variable ${printing_packaging_factory_base_info_loccityid} + Set Global Variable ${printing_packaging_factory_base_info_locdistrictid} + Set Global Variable ${printing_packaging_factory_base_info_locstreetid} + Set Global Variable ${printing_packaging_factory_base_info_locprovincename} + Set Global Variable ${printing_packaging_factory_base_info_loccityname} + Set Global Variable ${printing_packaging_factory_base_info_locdistrictname} + Set Global Variable ${printing_packaging_factory_base_info_locstreetname} + Set Global Variable ${printing_packaging_factory_base_info_legalpersonmobile} + Set Global Variable ${printing_packaging_factory_base_info_businessLicense} + Set Global Variable ${printing_packaging_factory_base_info_legalPersonIdCardBack} + Set Global Variable ${printing_packaging_factory_base_info_legalPersonIdCardFront} + ${printing_packaging_factory_factory_locdetail} Read Cell Data By Name factory_info A2 + ${printing_packaging_factory_factory_locprovinceid} Read Cell Data By Name factory_info B2 + ${printing_packaging_factory_factory_loccityid} Read Cell Data By Name factory_info C2 + ${printing_packaging_factory_factory_locdistrictid} Read Cell Data By Name factory_info D2 + ${printing_packaging_factory_factory_locstreetid} Read Cell Data By Name factory_info E2 + ${printing_packaging_factory_factory_locprovincename} Read Cell Data By Name factory_info F2 + ${printing_packaging_factory_factory_loccityname} Read Cell Data By Name factory_info G2 + ${printing_packaging_factory_factory_locdistrictname} Read Cell Data By Name factory_info H2 + ${printing_packaging_factory_factory_locstreetname} Read Cell Data By Name factory_info I2 + ${printing_packaging_factory_factory_factoryphotos} Read Cell Data By Name factory_info J2 + ${printing_packaging_factory_factory_leasecontract} Read Cell Data By Name factory_info K2 + ${printing_packaging_factory_factory_mainproducts} Read Cell Data By Name factory_info L2 + Set Global Variable ${printing_packaging_factory_factory_locdetail} + Set Global Variable ${printing_packaging_factory_factory_locprovinceid} + Set Global Variable ${printing_packaging_factory_factory_loccityid} + Set Global Variable ${printing_packaging_factory_factory_locdistrictid} + Set Global Variable ${printing_packaging_factory_factory_locstreetid} + Set Global Variable ${printing_packaging_factory_factory_locprovincename} + Set Global Variable ${printing_packaging_factory_factory_loccityname} + Set Global Variable ${printing_packaging_factory_factory_locdistrictname} + Set Global Variable ${printing_packaging_factory_factory_locstreetname} + Set Global Variable ${printing_packaging_factory_factory_factoryphotos} + Set Global Variable ${printing_packaging_factory_factory_leasecontract} + Set Global Variable ${printing_packaging_factory_factory_mainproducts} + ${printing_packaging_factory_shipping_addresses_detail} Read Cell Data By Name shipping_addresses A2 + ${printing_packaging_factory_shipping_addresses_provinceid} Read Cell Data By Name shipping_addresses B2 + ${printing_packaging_factory_shipping_addresses_cityid} Read Cell Data By Name shipping_addresses C2 + ${printing_packaging_factory_shipping_addresses_districtid} Read Cell Data By Name shipping_addresses D2 + ${printing_packaging_factory_shipping_addresses_streetid} Read Cell Data By Name shipping_addresses E2 + ${printing_packaging_factory_shipping_addresses_provincename} Read Cell Data By Name shipping_addresses F2 + ${printing_packaging_factory_shipping_addresses_cityname} Read Cell Data By Name shipping_addresses G2 + ${printing_packaging_factory_shipping_addresses_districtname} Read Cell Data By Name shipping_addresses H2 + ${printing_packaging_factory_shipping_addresses_streetname} Read Cell Data By Name shipping_addresses I2 + ${printing_packaging_factory_shipping_addresses_receiver} Read Cell Data By Name shipping_addresses J2 + ${printing_packaging_factory_shipping_addresses_receivermobile} Read Cell Data By Name shipping_addresses K2 + Set Global Variable ${printing_packaging_factory_shipping_addresses_detail} + Set Global Variable ${printing_packaging_factory_shipping_addresses_provinceid} + Set Global Variable ${printing_packaging_factory_shipping_addresses_cityid} + Set Global Variable ${printing_packaging_factory_shipping_addresses_districtid} + Set Global Variable ${printing_packaging_factory_shipping_addresses_streetid} + Set Global Variable ${printing_packaging_factory_shipping_addresses_provincename} + Set Global Variable ${printing_packaging_factory_shipping_addresses_cityname} + Set Global Variable ${printing_packaging_factory_shipping_addresses_districtname} + Set Global Variable ${printing_packaging_factory_shipping_addresses_streetname} + Set Global Variable ${printing_packaging_factory_shipping_addresses_receiver} + Set Global Variable ${printing_packaging_factory_shipping_addresses_receivermobile} + ${printing_packaging_factory_scrappaper_credit_deposit} Read Cell Data By Name scrap_paper_credit A2 + ${printing_packaging_factory_scrappaper_credit_earnest} Read Cell Data By Name scrap_paper_credit B2 + ${printing_packaging_factory_scrappaper_credit_totalUsed} Read Cell Data By Name scrap_paper_credit C2 + Set Global Variable ${printing_packaging_factory_scrappaper_credit_deposit} + Set Global Variable ${printing_packaging_factory_scrappaper_credit_earnest} + Set Global Variable ${printing_packaging_factory_scrappaper_credit_totalUsed} + ${printing_packaging_factory_private_account_cardholdername} Read Cell Data By Name private_account A2 + ${printing_packaging_factory_private_account_bankcardnumber} Read Cell Data By Name private_account B2 + ${printing_packaging_factory_private_account_openingbank} Read Cell Data By Name private_account C2 + Set Global Variable ${printing_packaging_factory_private_account_cardholdername} + Set Global Variable ${printing_packaging_factory_private_account_bankcardnumber} + Set Global Variable ${printing_packaging_factory_private_account_openingbank} + ${printing_packaging_factory_administrator_realname} Read Cell Data By Name administrator A2 + ${printing_packaging_factory_administrator_title} Read Cell Data By Name administrator B2 + ${printing_packaging_factory_administrator_mobile} Read Cell Data By Name administrator C2 + Set Global Variable ${printing_packaging_factory_administrator_realname} + Set Global Variable ${printing_packaging_factory_administrator_title} + Set Global Variable ${printing_packaging_factory_administrator_mobile} + ${printing_packaging_factory_employee_position} Read Cell Data By Name add_employee A2 + ${printing_packaging_factory_employee_realname} Read Cell Data By Name add_employee B2 + Set Global Variable ${printing_packaging_factory_employee_position} + Set Global Variable ${printing_packaging_factory_employee_realname} get_supplier_open_account_datas Open Excel ./datas/004_open_account_supplier_paper.xls + ${virtual_supplier_name} Read Cell Data By Name virtual_supplier A2 + ${virtual_supplier_shortName} Read Cell Data By Name virtual_supplier B2 + ${virtual_supplier_details} Read Cell Data By Name virtual_supplier C2 + ${virtual_supplier_contactname} Read Cell Data By Name virtual_supplier D2 + ${virtual_supplier_contactmoblie} Read Cell Data By Name virtual_supplier E2 + ${virtual_supplier_provinceid} Read Cell Data By Name virtual_supplier F2 + ${virtual_supplier_cityid} Read Cell Data By Name virtual_supplier G2 + ${virtual_supplier_districtid} Read Cell Data By Name virtual_supplier H2 + ${virtual_supplier_streetid} Read Cell Data By Name virtual_supplier I2 + ${virtual_supplier_provincename} Read Cell Data By Name virtual_supplier J2 + ${virtual_supplier_cityname} Read Cell Data By Name virtual_supplier K2 + ${virtual_supplier_districtname} Read Cell Data By Name virtual_supplier L2 + ${virtual_supplier_streetname} Read Cell Data By Name virtual_supplier M2 + Set Global Variable ${virtual_supplier_name} + Set Global Variable ${virtual_supplier_shortName} + Set Global Variable ${virtual_supplier_details} + Set Global Variable ${virtual_supplier_contactname} + Set Global Variable ${virtual_supplier_contactmoblie} + Set Global Variable ${virtual_supplier_provinceid} + Set Global Variable ${virtual_supplier_cityid} + Set Global Variable ${virtual_supplier_districtid} + Set Global Variable ${virtual_supplier_streetid} + Set Global Variable ${virtual_supplier_provincename} + Set Global Variable ${virtual_supplier_cityname} + Set Global Variable ${virtual_supplier_districtname} + Set Global Variable ${virtual_supplier_streetname} + ${supplier_paper_name} Read Cell Data By Name open_account A2 + ${supplier_paper_type} Read Cell Data By Name open_account B2 + ${supplier_paper_uniformSocialCreditCode} Read Cell Data By Name open_account C2 + ${supplier_paper_legalPersonName} Read Cell Data By Name open_account D2 + ${supplier_paper_legalPersonIdCardNo} Read Cell Data By Name open_account E2 + ${supplier_paper_paperSettlementIntervalTypeId} Read Cell Data By Name open_account F2 + ${supplier_paper_locProvinceId} Read Cell Data By Name open_account G2 + ${supplier_paper_locCityId} Read Cell Data By Name open_account H2 + ${supplier_paper_locDistrictId} Read Cell Data By Name open_account I2 + ${supplier_paper_locStreetId} Read Cell Data By Name open_account J2 + ${supplier_paper_locDetail} Read Cell Data By Name open_account K2 + ${supplier_paper_legalPersonIdCardFrontImg} Read Cell Data By Name open_account L2 + ${supplier_paper_legalPersonIdCardBackImg} Read Cell Data By Name open_account M2 + ${supplier_paper_businessLicenseImg} Read Cell Data By Name open_account N2 + ${supplier_paper_contactsname} Read Cell Data By Name open_account O2 + ${supplier_paper_mobilePhone} Read Cell Data By Name open_account P2 + ${supplier_paper_telephone} Read Cell Data By Name open_account Q2 + ${supplier_paper_email} Read Cell Data By Name open_account R2 + ${supplier_paper_wechatAccount} Read Cell Data By Name open_account S2 + ${supplier_paper_remark} Read Cell Data By Name open_account T2 + ${supplier_paper_bankAccountName} Read Cell Data By Name open_account U2 + ${supplier_paper_bankAccount} Read Cell Data By Name open_account V2 + ${supplier_paper_bankName} Read Cell Data By Name open_account W2 + ${supplier_paper_accountOpeningBranch} Read Cell Data By Name open_account X2 + ${supplier_paper_locationBank} Read Cell Data By Name open_account Y2 + Set Global Variable ${supplier_paper_name} + Set Global Variable ${supplier_paper_type} + Set Global Variable ${supplier_paper_uniformSocialCreditCode} + Set Global Variable ${supplier_paper_legalPersonName} + Set Global Variable ${supplier_paper_legalPersonIdCardNo} + Set Global Variable ${supplier_paper_paperSettlementIntervalTypeId} + Set Global Variable ${supplier_paper_locProvinceId} + Set Global Variable ${supplier_paper_locCityId} + Set Global Variable ${supplier_paper_locDistrictId} + Set Global Variable ${supplier_paper_locStreetId} + Set Global Variable ${supplier_paper_locDetail} + Set Global Variable ${supplier_paper_legalPersonIdCardFrontImg} + Set Global Variable ${supplier_paper_legalPersonIdCardBackImg} + Set Global Variable ${supplier_paper_businessLicenseImg} + Set Global Variable ${supplier_paper_contactsname} + Set Global Variable ${supplier_paper_mobilePhone} + Set Global Variable ${supplier_paper_telephone} + Set Global Variable ${supplier_paper_email} + Set Global Variable ${supplier_paper_wechatAccount} + Set Global Variable ${supplier_paper_remark} + Set Global Variable ${supplier_paper_bankAccountName} + Set Global Variable ${supplier_paper_bankAccount} + Set Global Variable ${supplier_paper_bankName} + Set Global Variable ${supplier_paper_accountOpeningBranch} + Set Global Variable ${supplier_paper_locationBank} + ${supplier_paper_base_info_name} Read Cell Data By Name base_info A2 + ${supplier_paper_base_info_shortName} Read Cell Data By Name base_info B2 + ${supplier_paper_base_info_type} Read Cell Data By Name base_info C2 + ${supplier_paper_base_info_uniformSocialCreditCode} Read Cell Data By Name base_info D2 + ${supplier_paper_base_info_legalPersonName} Read Cell Data By Name base_info E2 + ${supplier_paper_base_info_legalPersonIdCardNo} Read Cell Data By Name base_info F2 + ${supplier_paper_base_info_legalPersonMobile} Read Cell Data By Name base_info G2 + ${supplier_paper_base_info_paperSettlementIntervalTypeId} Read Cell Data By Name base_info H2 + ${supplier_paper_base_info_locProvinceId} Read Cell Data By Name base_info I2 + ${supplier_paper_base_info_locCityId} Read Cell Data By Name base_info J2 + ${supplier_paper_base_info_locDistrictId} Read Cell Data By Name base_info K2 + ${supplier_paper_base_info_locStreetId} Read Cell Data By Name base_info L2 + ${supplier_paper_base_info_locprovincename} Read Cell Data By Name base_info M2 + ${supplier_paper_base_info_loccityname} Read Cell Data By Name base_info N2 + ${supplier_paper_base_info_locdistrictname} Read Cell Data By Name base_info O2 + ${supplier_paper_base_info_locstreetname} Read Cell Data By Name base_info P2 + ${supplier_paper_base_info_locDetail} Read Cell Data By Name base_info Q2 + ${supplier_paper_base_info_legalPersonIdCardFrontImg} Read Cell Data By Name base_info R2 + ${supplier_paper_base_info_legalPersonIdCardBackImg} Read Cell Data By Name base_info S2 + ${supplier_paper_base_info_businessLicenseImg} Read Cell Data By Name base_info T2 + Set Global Variable ${supplier_paper_base_info_name} + Set Global Variable ${supplier_paper_base_info_shortName} + Set Global Variable ${supplier_paper_base_info_type} + Set Global Variable ${supplier_paper_base_info_uniformSocialCreditCode} + Set Global Variable ${supplier_paper_base_info_legalPersonName} + Set Global Variable ${supplier_paper_base_info_legalPersonIdCardNo} + Set Global Variable ${supplier_paper_base_info_legalPersonMobile} + Set Global Variable ${supplier_paper_base_info_paperSettlementIntervalTypeId} + Set Global Variable ${supplier_paper_base_info_locProvinceId} + Set Global Variable ${supplier_paper_base_info_locCityId} + Set Global Variable ${supplier_paper_base_info_locDistrictId} + Set Global Variable ${supplier_paper_base_info_locStreetId} + Set Global Variable ${supplier_paper_base_info_locprovincename} + Set Global Variable ${supplier_paper_base_info_loccityname} + Set Global Variable ${supplier_paper_base_info_locdistrictname} + Set Global Variable ${supplier_paper_base_info_locstreetname} + Set Global Variable ${supplier_paper_base_info_locDetail} + Set Global Variable ${supplier_paper_base_info_legalPersonIdCardFrontImg} + Set Global Variable ${supplier_paper_base_info_legalPersonIdCardBackImg} + Set Global Variable ${supplier_paper_base_info_businessLicenseImg} + ${supplier_factory_locProvinceId} Read Cell Data By Name factory_info A2 + ${supplier_factory_locCityId} Read Cell Data By Name factory_info B2 + ${supplier_factory_locDistrictId} Read Cell Data By Name factory_info C2 + ${supplier_factory_locStreetId} Read Cell Data By Name factory_info D2 + ${supplier_factory_locprovincename} Read Cell Data By Name factory_info E2 + ${supplier_factory_loccityname} Read Cell Data By Name factory_info F2 + ${supplier_factory_locdistrictname} Read Cell Data By Name factory_info G2 + ${supplier_factory_locstreetname} Read Cell Data By Name factory_info H2 + ${supplier_factory_locDetail} Read Cell Data By Name factory_info I2 + ${supplier_factory_leaseContractImg} Read Cell Data By Name factory_info J2 + ${supplier_factory_factoryPhotos} Read Cell Data By Name factory_info K2 + Set Global Variable ${supplier_factory_locProvinceId} + Set Global Variable ${supplier_factory_locCityId} + Set Global Variable ${supplier_factory_locDistrictId} + Set Global Variable ${supplier_factory_locStreetId} + Set Global Variable ${supplier_factory_locprovincename} + Set Global Variable ${supplier_factory_loccityname} + Set Global Variable ${supplier_factory_locdistrictname} + Set Global Variable ${supplier_factory_locstreetname} + Set Global Variable ${supplier_factory_locDetail} + Set Global Variable ${supplier_factory_leaseContractImg} + Set Global Variable ${supplier_factory_factoryPhotos} + ${supplier_private_account_cardholderName} Read Cell Data By Name private_account A2 + ${supplier_private_account_bankCardNumber} Read Cell Data By Name private_account B2 + ${supplier_private_account_openingBank} Read Cell Data By Name private_account C2 + Set Global Variable ${supplier_private_account_cardholderName} + Set Global Variable ${supplier_private_account_bankCardNumber} + Set Global Variable ${supplier_private_account_openingBank} + ${supplier_machine_name} Read Cell Data By Name add_pc_machine A2 + ${supplier_machineType} Read Cell Data By Name add_pc_machine B2 + Set Global Variable ${supplier_machine_name} + Set Global Variable ${supplier_machineType} + ${supplier_enterprise_administrator_realname} Read Cell Data By Name administrator A2 + ${supplier_enterprise_administrator_mobile} Read Cell Data By Name administrator B2 + ${supplier_enterprise_administrator_position} Read Cell Data By Name administrator C2 + Set Global Variable ${supplier_enterprise_administrator_realname} + Set Global Variable ${supplier_enterprise_administrator_mobile} + Set Global Variable ${supplier_enterprise_administrator_position} get_credit_qniao_customer_datas Open Excel ./datas/005_credit_qniao_customer.xls + ${printing_packaging_factory_credit_qniao_save_type} Read Cell Data By Name credit_qniao_save A2 + ${printing_packaging_factory_credit_qniao_save_purpose} Read Cell Data By Name credit_qniao_save B2 + ${printing_packaging_factory_credit_qniao_save_creditLine} Read Cell Data By Name credit_qniao_save C2 + ${printing_packaging_factory_credit_qniao_save_paperSettlementIntervalTypeId} Read Cell Data By Name credit_qniao_save D2 + ${printing_packaging_factory_credit_qniao_save_remark} Read Cell Data By Name credit_qniao_save E2 + Set Global Variable ${printing_packaging_factory_credit_qniao_save_type} + Set Global Variable ${printing_packaging_factory_credit_qniao_save_purpose} + Set Global Variable ${printing_packaging_factory_credit_qniao_save_creditLine} + Set Global Variable ${printing_packaging_factory_credit_qniao_save_paperSettlementIntervalTypeId} + Set Global Variable ${printing_packaging_factory_credit_qniao_save_remark} + ${printing_packaging_factory_credit_qniao_edit_type} Read Cell Data By Name credit_qniao_edit A2 + ${printing_packaging_factory_credit_qniao_edit_purpose} Read Cell Data By Name credit_qniao_edit B2 + ${printing_packaging_factory_credit_qniao_edit_creditLine} Read Cell Data By Name credit_qniao_edit C2 + ${printing_packaging_factory_credit_qniao_edit_paperSettlementIntervalTypeId} Read Cell Data By Name credit_qniao_edit D2 + ${printing_packaging_factory_credit_qniao_edit_remark} Read Cell Data By Name credit_qniao_edit E2 + Set Global Variable ${printing_packaging_factory_credit_qniao_edit_type} + Set Global Variable ${printing_packaging_factory_credit_qniao_edit_purpose} + Set Global Variable ${printing_packaging_factory_credit_qniao_edit_creditLine} + Set Global Variable ${printing_packaging_factory_credit_qniao_edit_paperSettlementIntervalTypeId} + Set Global Variable ${printing_packaging_factory_credit_qniao_edit_remark} get_credit_password_datas Open Excel ./datas/006_credit_password.xls + ${customer_credit_password} Read Cell Data By Name credit_password_save A2 + ${save_creditpassword_type} Read Cell Data By Name credit_password_save B2 + Set Global Variable ${customer_credit_password} + Set Global Variable ${save_creditpassword_type} + ${customer_credit_password_new} Read Cell Data By Name credit_password_edit A2 + ${save_creditpassword_type_new} Read Cell Data By Name credit_password_edit B2 + Set Global Variable ${customer_credit_password_new} + Set Global Variable ${save_creditpassword_type_new} get_paper_variety_management_datas Open Excel ./datas/007_paper_variety_management.xls + ${paper_categoryid} Read Cell Data By Name paper_brand A2 + ${paper_Manufacturerid} Read Cell Data By Name paper_brand B2 + ${paper_brand_name} Read Cell Data By Name paper_brand C2 + ${paper_name} Read Cell Data By Name paper_brand D2 + ${paper_characteristic} Read Cell Data By Name paper_brand E2 + ${paper_description} Read Cell Data By Name paper_brand F2 + ${paper_brand_img} Read Cell Data By Name paper_brand G2 + Set Global Variable ${paper_categoryid} + Set Global Variable ${paper_Manufacturerid} + Set Global Variable ${paper_brand_name} + Set Global Variable ${paper_name} + Set Global Variable ${paper_characteristic} + Set Global Variable ${paper_description} + Set Global Variable ${paper_brand_img} + ${paper_category_name} Read Cell Data By Name paper_category A2 + Set Global Variable ${paper_category_name} + ${paper_manufacturer_name} Read Cell Data By Name paper_manufacturer A2 + ${paper_manufacturer_shortName} Read Cell Data By Name paper_manufacturer B2 + ${paper_manufacturer_description} Read Cell Data By Name paper_manufacturer C2 + ${paper_manufacturer_logoImg} Read Cell Data By Name paper_manufacturer D2 + Set Global Variable ${paper_manufacturer_name} + Set Global Variable ${paper_manufacturer_shortName} + Set Global Variable ${paper_manufacturer_description} + Set Global Variable ${paper_manufacturer_logoImg} get_market_information_link_datas Open Excel ./datas/008_market_information_link.xls + ${market_information_link} Read Cell Data By Name link A2 + Set Global Variable ${market_information_link} get_product_manage_datas Open Excel ./datas/009_product_manage.xls + ${gramweight} Read Cell Data By Name product_save A2 + ${purchasePrice} Read Cell Data By Name product_save B2 + Set Global Variable ${gramweight} + Set Global Variable ${purchasePrice} get_product_price_datas Open Excel ./datas/012_product_price.xls + ${product_price_sku_alterType} Read Cell Data By Name product_price_update A2 + ${product_price_sku_new} Read Cell Data By Name product_price_update B2 + Set Global Variable ${product_price_sku_alterType} + Set Global Variable ${product_price_sku_new} get_customer_shipping_address_datas Open Excel ./datas/014_customer_shipping_address.xls + ${customer_enterprise_shipping_address_isDefault} Read Cell Data By Name shipping_address_save A2 + ${customer_enterprise_shipping_address_receiver} Read Cell Data By Name shipping_address_save B2 + ${customer_enterprise_shipping_address_receiverMobile} Read Cell Data By Name shipping_address_save C2 + ${customer_enterprise_shipping_address_detail} Read Cell Data By Name shipping_address_save D2 + ${customer_enterprise_shipping_address_provinceid} Read Cell Data By Name shipping_address_save E2 + ${customer_enterprise_shipping_address_cityid} Read Cell Data By Name shipping_address_save F2 + ${customer_enterprise_shipping_address_districtid} Read Cell Data By Name shipping_address_save G2 + ${customer_enterprise_shipping_address_streetid} Read Cell Data By Name shipping_address_save H2 + ${customer_enterprise_shipping_address_provincename} Read Cell Data By Name shipping_address_save I2 + ${customer_enterprise_shipping_address_cityname} Read Cell Data By Name shipping_address_save J2 + ${customer_enterprise_shipping_address_districtname} Read Cell Data By Name shipping_address_save K2 + ${customer_enterprise_shipping_address_streetname} Read Cell Data By Name shipping_address_save L2 + Set Global Variable ${customer_enterprise_shipping_address_isDefault} + Set Global Variable ${customer_enterprise_shipping_address_receiver} + Set Global Variable ${customer_enterprise_shipping_address_receiverMobile} + Set Global Variable ${customer_enterprise_shipping_address_detail} + Set Global Variable ${customer_enterprise_shipping_address_provinceid} + Set Global Variable ${customer_enterprise_shipping_address_cityid} + Set Global Variable ${customer_enterprise_shipping_address_districtid} + Set Global Variable ${customer_enterprise_shipping_address_streetid} + Set Global Variable ${customer_enterprise_shipping_address_provincename} + Set Global Variable ${customer_enterprise_shipping_address_cityname} + Set Global Variable ${customer_enterprise_shipping_address_districtname} + Set Global Variable ${customer_enterprise_shipping_address_streetname} get_customer_create_order_datas Open Excel ./datas/015_customer_create_order.xls + ${customer_create_order_paymentMethod} Read Cell Data By Name create_order A2 + ${customer_create_order_width} Read Cell Data By Name create_order B2 + ${customer_create_order_length} Read Cell Data By Name create_order C2 + ${customer_create_order_quantity} Read Cell Data By Name create_order D2 + ${customer_create_order_bootFee} Read Cell Data By Name create_order E2 + ${customer_create_order_cuttingFee} Read Cell Data By Name create_order F2 + ${customer_create_order_freightFee} Read Cell Data By Name create_order G2 + ${customer_create_order_serviceFee} Read Cell Data By Name create_order H2 + ${customer_create_order_otherFee} Read Cell Data By Name create_order I2 + Set Global Variable ${customer_create_order_paymentMethod} + Set Global Variable ${customer_create_order_width} + Set Global Variable ${customer_create_order_length} + Set Global Variable ${customer_create_order_quantity} + Set Global Variable ${customer_create_order_bootFee} + Set Global Variable ${customer_create_order_cuttingFee} + Set Global Variable ${customer_create_order_freightFee} + Set Global Variable ${customer_create_order_serviceFee} + Set Global Variable ${customer_create_order_otherFee} get_customer_enquiry_create_order_datas Open Excel ./datas/016_customer_enquiry_create_order.xls + ${customer_enquiryContent} Read Cell Data By Name enquiry_add A2 + ${customer_enquiry_deliveryDay} Read Cell Data By Name enquiry_add B2 + ${customer_enquiry_deliveryArea} Read Cell Data By Name enquiry_add C2 + Set Global Variable ${customer_enquiryContent} + Set Global Variable ${customer_enquiry_deliveryDay} + Set Global Variable ${customer_enquiry_deliveryArea} + ${enquiry_gramWeight1} Read Cell Data By Name enquiry_edit A2 + ${enquiry_width1} Read Cell Data By Name enquiry_edit B2 + ${enquiry_length1} Read Cell Data By Name enquiry_edit C2 + ${enquiry_quantity1} Read Cell Data By Name enquiry_edit D2 + ${enquiry_gramWeight2} Read Cell Data By Name enquiry_edit E2 + ${enquiry_width2} Read Cell Data By Name enquiry_edit F2 + ${enquiry_length2} Read Cell Data By Name enquiry_edit G2 + ${enquiry_quantity2} Read Cell Data By Name enquiry_edit H2 + ${customer_enquiry_remark} Read Cell Data By Name enquiry_edit I2 + Set Global Variable ${enquiry_gramWeight1} + Set Global Variable ${enquiry_width1} + Set Global Variable ${enquiry_length1} + Set Global Variable ${enquiry_quantity1} + Set Global Variable ${enquiry_gramWeight2} + Set Global Variable ${enquiry_width2} + Set Global Variable ${enquiry_length2} + Set Global Variable ${enquiry_quantity2} + Set Global Variable ${customer_enquiry_remark} + ${paper_quotation_gramWeight1} Read Cell Data By Name submit_paper_quotation A2 + ${paper_quotation_width1} Read Cell Data By Name submit_paper_quotation B2 + ${paper_quotation_length1} Read Cell Data By Name submit_paper_quotation C2 + ${paper_quotation_quantity1} Read Cell Data By Name submit_paper_quotation D2 + ${paper_quotation_otherFee} Read Cell Data By Name submit_paper_quotation E2 + ${paper_quotation_gramWeight2} Read Cell Data By Name submit_paper_quotation F2 + ${paper_quotation_width2} Read Cell Data By Name submit_paper_quotation G2 + ${paper_quotation_length2} Read Cell Data By Name submit_paper_quotation H2 + ${paper_quotation_quantity2} Read Cell Data By Name submit_paper_quotation I2 + ${supplierfocus_paper_quotation_remark} Read Cell Data By Name submit_paper_quotation J2 + Set Global Variable ${paper_quotation_gramWeight1} + Set Global Variable ${paper_quotation_width1} + Set Global Variable ${paper_quotation_length1} + Set Global Variable ${paper_quotation_quantity1} + Set Global Variable ${paper_quotation_otherFee} + Set Global Variable ${paper_quotation_gramWeight2} + Set Global Variable ${paper_quotation_width2} + Set Global Variable ${paper_quotation_length2} + Set Global Variable ${paper_quotation_quantity2} + Set Global Variable ${supplierfocus_paper_quotation_remark} + ${customer_create_order_paymentMethod} Read Cell Data By Name enquiry_create_order A2 + ${customer_create_order_bootFee1} Read Cell Data By Name enquiry_create_order B2 + ${customer_create_order_cuttingFee1} Read Cell Data By Name enquiry_create_order C2 + ${customer_create_order_freightFee1} Read Cell Data By Name enquiry_create_order D2 + ${customer_create_order_serviceFee1} Read Cell Data By Name enquiry_create_order E2 + ${customer_create_order_bootFee2} Read Cell Data By Name enquiry_create_order F2 + ${customer_create_order_cuttingFee2} Read Cell Data By Name enquiry_create_order G2 + ${customer_create_order_freightFee2} Read Cell Data By Name enquiry_create_order H2 + ${customer_create_order_serviceFee2} Read Cell Data By Name enquiry_create_order I2 + Set Global Variable ${customer_create_order_paymentMethod} + Set Global Variable ${customer_create_order_bootFee1} + Set Global Variable ${customer_create_order_cuttingFee1} + Set Global Variable ${customer_create_order_freightFee1} + Set Global Variable ${customer_create_order_serviceFee1} + Set Global Variable ${customer_create_order_bootFee2} + Set Global Variable ${customer_create_order_cuttingFee2} + Set Global Variable ${customer_create_order_freightFee2} + Set Global Variable ${customer_create_order_serviceFee2} get_create_supplier_order_batch_datas Open Excel ./datas/017_create_supplier_order_batch.xls + ${supplier_order_remark} Read Cell Data By Name create_supplier_order A2 + Set Global Variable ${supplier_order_remark} get_payable_receivable_datas Open Excel ./datas/018_payable_receivable.xls + ${payable_fundProvider} Read Cell Data By Name confirm_payable A2 + ${payable_remark} Read Cell Data By Name confirm_payable B2 + Set Global Variable ${payable_fundProvider} + Set Global Variable ${payable_remark} + ${receivable_remark} Read Cell Data By Name confirm_receivable A2 + Set Global Variable ${receivable_remark} diff --git a/003_enterprise_open_account_customer/printing_packaging_factory_open_account.robot b/003_enterprise_open_account_customer/printing_packaging_factory_open_account.robot index 80de801..b0a2130 100644 --- a/003_enterprise_open_account_customer/printing_packaging_factory_open_account.robot +++ b/003_enterprise_open_account_customer/printing_packaging_factory_open_account.robot @@ -8,26 +8,7 @@ Library urllib3 operate_open_account_printing_packaging_factory Disable Warnings Create Session yytops ${yytops} headers=${operationbackend_header} - ${printing_packaging_factory_name} Set Variable autotest_printing_packaging_factory_name - ${printing_packaging_factory_type} Set Variable 2 #企业类型 1云印客户 2印刷包装厂 3造纸厂 4打包厂 5原纸供应商 6设备供应商 7其他 - ${printing_packaging_factory_shortname} Set Variable autotest_shortname - ${printing_packaging_factory_uniformsocialcreditcode} Set Variable autotest_91440101MA59F2J10M - ${printing_packaging_factory_locdetail} Set Variable autotest_printing_packaging_factory_locdetail - ${printing_packaging_factory_legalpersonname} Set Variable autotest_legalperson - ${printing_packaging_factory_legalpersonidcardno} Set Variable autotest_legalpersonidcardno - ${printing_packaging_factory_locprovinceid} Set Variable 440000 - ${printing_packaging_factory_loccityid} Set Variable 440100 - ${printing_packaging_factory_locdistrictid} Set Variable 440106 - ${printing_packaging_factory_locstreetid} Set Variable 440106003 - ${printing_packaging_factory_locprovincename} Set Variable 广东省 - ${printing_packaging_factory_loccityname} Set Variable 广州市 - ${printing_packaging_factory_locdistrictname} Set Variable 天河区 - ${printing_packaging_factory_locstreetname} Set Variable 车陂街道 ${body} Set Variable {"name":"${printing_packaging_factory_name}","type":${printing_packaging_factory_type},"shortName":"${printing_packaging_factory_shortname}","uniformSocialCreditCode":"${printing_packaging_factory_uniformsocialcreditcode}","locDetail":"${printing_packaging_factory_locdetail}","legalPersonName":"${printing_packaging_factory_legalpersonname}","legalPersonIdCardNo":"${printing_packaging_factory_legalpersonidcardno}","locProvinceId":${printing_packaging_factory_locprovinceid},"locCityId":${printing_packaging_factory_loccityid},"locDistrictId":${printing_packaging_factory_locdistrictid},"locStreetId":${printing_packaging_factory_locstreetid},"locProvinceName":"${printing_packaging_factory_locprovincename}","locCityName":"${printing_packaging_factory_loccityname}","locDistrictName":"${printing_packaging_factory_locdistrictname}","locStreetName":"${printing_packaging_factory_locstreetname}"} - Set Global Variable ${printing_packaging_factory_name} - Set Suite Variable ${printing_packaging_factory_shortname} - Set Global Variable ${printing_packaging_factory_legalpersonname} - Set Global Variable ${printing_packaging_factory_legalpersonidcardno} ${response} POST On Session yytops /cloud-print-user-center/admin/save/enterprise ${body.encode("utf8")} log ${response.json()} Should Be Equal As Numbers 200 ${response.status_code} @@ -67,58 +48,11 @@ operate_get_printing_packaging_factory_modify_state log ${response.json()} Should Be Equal As Numbers 200 ${response.status_code} Should Be Equal As Strings successful ${response.json()["message"]} - #operate_save_printing_packaging_factory_baseinfo_industrialandcommercial_registration_information - # Disable Warnings - # Create Session uecops ${uecops} headers=${operationbackend_header} - # ${printing_packaging_factory_name} Set Variable autotest_printing_packaging_factory_name - # ${printing_packaging_factory_type} Set Variable 2 #企业类型 1云印客户 2印刷包装厂 3造纸厂 4打包厂 5原纸供应商 6设备供应商 7其他 - # ${printing_packaging_factory_shortname} Set Variable autotest_shortname - # ${printing_packaging_factory_uniformsocialcreditcode} Set Variable autotest_91440101MA59F2J10M - # ${printing_packaging_factory_locdetail} Set Variable autotest_printing_packaging_factory_locdetail - # ${printing_packaging_factory_legalpersonname} Set Variable autotest_legalperson - # ${printing_packaging_factory_legalpersonidcardno} Set Variable autotest_legalpersonidcardno - # ${printing_packaging_factory_locprovinceid} Set Variable 440000 - # ${printing_packaging_factory_loccityid} Set Variable 440100 - # ${printing_packaging_factory_locdistrictid} Set Variable 440106 - # ${printing_packaging_factory_locstreetid} Set Variable 440106003 - # ${printing_packaging_factory_locprovincename} Set Variable 广东省 - # ${printing_packaging_factory_loccityname} Set Variable 广州市 - # ${printing_packaging_factory_locdistrictname} Set Variable 天河区 - # ${printing_packaging_factory_locstreetname} Set Variable 车陂街道 - # ${printing_packaging_factory_legalpersonmobile} Set Variable 13800138000 - # ${printing_packaging_factory_businessLicense} Set Variable https://qncloudprintfiletest.oss-cn-shenzhen.aliyuncs.com/cloudprint/1632378545847.jpg - # ${printing_packaging_factory_legalPersonIdCardBack} Set Variable https://qncloudprintfiletest.oss-cn-shenzhen.aliyuncs.com/cloudprint/1632378545847.jpg - # ${printing_packaging_factory_legalPersonIdCardFront} Set Variable https://qncloudprintfiletest.oss-cn-shenzhen.aliyuncs.com/cloudprint/1632378545847.jpg - # ${body} Set Variable {"id":"${printing_packaging_factory_id}","enterpriseId":"${printing_packaging_factory_id}","status":0,"legalPersonIdCardFrontImg":"${printing_packaging_factory_legalPersonIdCardFront}","legalPersonIdCardFrontImgs":["${printing_packaging_factory_legalPersonIdCardFront}"],"legalPersonIdCardBackImg":"${printing_packaging_factory_legalPersonIdCardBack}","legalPersonIdCardBackImgs":["${printing_packaging_factory_legalPersonIdCardBack}"],"businessLicenseImg":"${printing_packaging_factory_businessLicense}","businessLicenseImgs":["${printing_packaging_factory_businessLicense}"],"legalPersonMobile":"${printing_packaging_factory_legalpersonmobile}","registeredCapital":999,"name":"${printing_packaging_factory_name}","type":${printing_packaging_factory_type},"shortName":"${printing_packaging_factory_shortname}","uniformSocialCreditCode":"${printing_packaging_factory_uniformsocialcreditcode}","locDetail":"${printing_packaging_factory_locdetail}","legalPersonName":"${printing_packaging_factory_legalpersonname}","legalPersonIdCardNo":"${printing_packaging_factory_legalpersonidcardno}","locProvinceId":${printing_packaging_factory_locprovinceid},"locCityId":${printing_packaging_factory_loccityid},"locDistrictId":${printing_packaging_factory_locdistrictid},"locStreetId":${printing_packaging_factory_locstreetid},"locProvinceName":"${printing_packaging_factory_locprovincename}","locCityName":"${printing_packaging_factory_loccityname}","locDistrictName":"${printing_packaging_factory_locdistrictname}","locStreetName":"${printing_packaging_factory_locstreetname}"} - # ${response} POST On Session uecops /uec/admin/save/enterprise2 ${body.encode("utf8")} - # log ${response.json()} - # Should Be Equal As Numbers 200 ${response.status_code} - # Should Be Equal As Strings successful ${response.json()["message"]} - # sleep 1 operate_save_printing_packaging_factory_base_info Disable Warnings Create Session yytops ${yytops} headers=${operationbackend_header} - ${printing_packaging_factory_name} Set Variable autotest_printing_packaging_factory_name - ${printing_packaging_factory_type} Set Variable 2 #企业类型 1云印客户 2印刷包装厂 3造纸厂 4打包厂 5原纸供应商 6设备供应商 7其他 - ${printing_packaging_factory_shortname} Set Variable autotest_shortname - ${printing_packaging_factory_uniformsocialcreditcode} Set Variable autotest_91440101MA59F2J10M - ${printing_packaging_factory_locdetail} Set Variable autotest_printing_packaging_factory_locdetail - ${printing_packaging_factory_legalpersonname} Set Variable autotest_legalperson - ${printing_packaging_factory_legalpersonidcardno} Set Variable autotest_legalpersonidcardno - ${printing_packaging_factory_locprovinceid} Set Variable 440000 - ${printing_packaging_factory_loccityid} Set Variable 440100 - ${printing_packaging_factory_locdistrictid} Set Variable 440106 - ${printing_packaging_factory_locstreetid} Set Variable 440106003 - ${printing_packaging_factory_locprovincename} Set Variable 广东省 - ${printing_packaging_factory_loccityname} Set Variable 广州市 - ${printing_packaging_factory_locdistrictname} Set Variable 天河区 - ${printing_packaging_factory_locstreetname} Set Variable 车陂街道 - ${printing_packaging_factory_legalpersonmobile} Set Variable 13800138000 - ${printing_packaging_factory_businessLicense} Set Variable https://qncloudprintfiletest.oss-cn-shenzhen.aliyuncs.com/cloudprint/1632378545847.jpg - ${printing_packaging_factory_legalPersonIdCardBack} Set Variable https://qncloudprintfiletest.oss-cn-shenzhen.aliyuncs.com/cloudprint/1632378545847.jpg - ${printing_packaging_factory_legalPersonIdCardFront} Set Variable https://qncloudprintfiletest.oss-cn-shenzhen.aliyuncs.com/cloudprint/1632378545847.jpg - ${body} Set Variable {"enterpriseId":"${printing_packaging_factory_id}","id":"${printing_packaging_factory_id}","createTime":"${current_date_second}","updateTime":"${current_date_second}","name":"${printing_packaging_factory_name}","uniformSocialCreditCode":"${printing_packaging_factory_uniformsocialcreditcode}","locProvinceId":${printing_packaging_factory_locprovinceid},"locProvinceName":"${printing_packaging_factory_locprovincename}","locCityId":${printing_packaging_factory_loccityid},"locCityName":"${printing_packaging_factory_loccityname}","locDistrictId":${printing_packaging_factory_locdistrictid},"locDistrictName":"${printing_packaging_factory_locdistrictname}","locStreetId":${printing_packaging_factory_locstreetid},"locStreetName":"${printing_packaging_factory_locstreetname}","locDetail":"${printing_packaging_factory_locdetail}","legalPersonName":"${printing_packaging_factory_legalpersonname}","legalPersonIdCardNo":"${printing_packaging_factory_legalpersonidcardno}","legalPersonMobile":"${printing_packaging_factory_legalpersonmobile}","type":${printing_packaging_factory_type},"shortName":"${printing_packaging_factory_shortname}","registeredCapital":999,"incomeInPastTwoYears":100,"regAddrLongitude":null,"regAddrLatitude":null,"birthday":"${current_date}","cooperationTime":"${current_date_month}","legalPersonIdCardFrontImg":"${printing_packaging_factory_legalPersonIdCardFront}","legalPersonIdCardBackImg":null,"businessLicenseImg":"${printing_packaging_factory_businessLicense}"} + ${body} Set Variable {"enterpriseId":"${printing_packaging_factory_id}","id":"${printing_packaging_factory_id}","createTime":"${current_date_second}","updateTime":"${current_date_second}","name":"${printing_packaging_factory_base_info_name}","uniformSocialCreditCode":"${printing_packaging_factory_base_info_uniformsocialcreditcode}","locProvinceId":${printing_packaging_factory_base_info_locprovinceid},"locProvinceName":"${printing_packaging_factory_base_info_locprovincename}","locCityId":${printing_packaging_factory_base_info_loccityid},"locCityName":"${printing_packaging_factory_base_info_loccityname}","locDistrictId":${printing_packaging_factory_base_info_locdistrictid},"locDistrictName":"${printing_packaging_factory_base_info_locdistrictname}","locStreetId":${printing_packaging_factory_base_info_locstreetid},"locStreetName":"${printing_packaging_factory_base_info_locstreetname}","locDetail":"${printing_packaging_factory_base_info_locdetail}","legalPersonName":"${printing_packaging_factory_base_info_legalpersonname}","legalPersonIdCardNo":"${printing_packaging_factory_base_info_legalpersonidcardno}","legalPersonMobile":"${printing_packaging_factory_base_info_legalpersonmobile}","type":${printing_packaging_factory_base_info_type},"shortName":"${printing_packaging_factory_base_info_shortname}","registeredCapital":999,"incomeInPastTwoYears":100,"regAddrLongitude":null,"regAddrLatitude":null,"birthday":"${current_date}","cooperationTime":"${current_date_month}","legalPersonIdCardFrontImg":"${printing_packaging_factory_base_info_legalPersonIdCardFront}","legalPersonIdCardBackImg":"${printing_packaging_factory_base_info_legalPersonIdCardBack}","businessLicenseImg":"${printing_packaging_factory_base_info_businessLicense}"} ${response} POST On Session yytops /cloud-print-user-center/admin/save/packaging-printing-mill/base-info ${body.encode("utf8")} log ${response.json()} Should Be Equal As Numbers 200 ${response.status_code} @@ -128,19 +62,7 @@ operate_save_printing_packaging_factory_base_info operate_save_printing_packaging_factory_baseinfo_factory_related_information Disable Warnings Create Session yytops ${yytops} headers=${operationbackend_header} - ${printing_packaging_factory_locdetail} Set Variable autotest_printing_packaging_factory_locdetail - ${printing_packaging_factory_locprovinceid} Set Variable 440000 - ${printing_packaging_factory_loccityid} Set Variable 440100 - ${printing_packaging_factory_locdistrictid} Set Variable 440106 - ${printing_packaging_factory_locstreetid} Set Variable 440106003 - ${printing_packaging_factory_locprovincename} Set Variable 广东省 - ${printing_packaging_factory_loccityname} Set Variable 广州市 - ${printing_packaging_factory_locdistrictname} Set Variable 天河区 - ${printing_packaging_factory_locstreetname} Set Variable 车陂街道 - ${printing_packaging_factory_factoryphotos} Set Variable https://qncloudprintfiletest.oss-cn-shenzhen.aliyuncs.com/cloudprint/1632378545847.jpg - ${printing_packaging_factory_leasecontract} Set Variable https://qncloudprintfiletest.oss-cn-shenzhen.aliyuncs.com/cloudprint/1632378545847.jpg - ${printing_packaging_factory_mainproducts} Set Variable autotest_mainproducts - ${body} Set Variable {"enterpriseId":"${printing_packaging_factory_id}","leaseContractImg":"${printing_packaging_factory_leasecontract}","factoryPhotos":"${printing_packaging_factory_factoryphotos}","mainProducts":"${printing_packaging_factory_mainproducts}","businessAnnualVolume":"9990000","locLatitude":"23.119958","locLongitude":"113.406448","locDetail":"${printing_packaging_factory_locdetail}","legalPersonName":"${printing_packaging_factory_legalpersonname}","locProvinceId":${printing_packaging_factory_locprovinceid},"locCityId":${printing_packaging_factory_loccityid},"locDistrictId":${printing_packaging_factory_locdistrictid},"locStreetId":${printing_packaging_factory_locstreetid},"locProvinceName":"${printing_packaging_factory_locprovincename}","locCityName":"${printing_packaging_factory_loccityname}","locDistrictName":"${printing_packaging_factory_locdistrictname}","locStreetName":"${printing_packaging_factory_locstreetname}"} + ${body} Set Variable {"enterpriseId":"${printing_packaging_factory_id}","leaseContractImg":"${printing_packaging_factory_factory_leasecontract}","factoryPhotos":"${printing_packaging_factory_factory_factoryphotos}","mainProducts":"${printing_packaging_factory_factory_mainproducts}","businessAnnualVolume":"9990000","locLatitude":"23.119958","locLongitude":"113.406448","locDetail":"${printing_packaging_factory_factory_locdetail}","locProvinceId":${printing_packaging_factory_factory_locprovinceid},"locCityId":${printing_packaging_factory_factory_loccityid},"locDistrictId":${printing_packaging_factory_factory_locdistrictid},"locStreetId":${printing_packaging_factory_factory_locstreetid},"locProvinceName":"${printing_packaging_factory_factory_locprovincename}","locCityName":"${printing_packaging_factory_factory_loccityname}","locDistrictName":"${printing_packaging_factory_factory_locdistrictname}","locStreetName":"${printing_packaging_factory_factory_locstreetname}"} ${response} POST On Session yytops /cloud-print-user-center/admin/save/factory ${body.encode("utf8")} log ${response.json()} Should Be Equal As Numbers 200 ${response.status_code} @@ -150,18 +72,7 @@ operate_save_printing_packaging_factory_baseinfo_factory_related_information operate_save_printing_packaging_factory_baseinfo_enterprise_shipping_addresses Disable Warnings Create Session uecops ${uecops} headers=${operationbackend_header} - ${printing_packaging_factory_detail} Set Variable autotest_printing_packaging_factory_locdetail - ${printing_packaging_factory_provinceid} Set Variable 440000 - ${printing_packaging_factory_cityid} Set Variable 440100 - ${printing_packaging_factory_districtid} Set Variable 440106 - ${printing_packaging_factory_streetid} Set Variable 440106003 - ${printing_packaging_factory_provincename} Set Variable 广东省 - ${printing_packaging_factory_cityname} Set Variable 广州市 - ${printing_packaging_factory_districtname} Set Variable 天河区 - ${printing_packaging_factory_streetname} Set Variable 车陂街道 - ${printing_packaging_factory_receiver} Set Variable autotest_receiver - ${printing_packaging_factory_receivermobile} Set Variable 13800138000 - ${body} Set Variable {"enterpriseId":"${printing_packaging_factory_id}","receiverMobile":"${printing_packaging_factory_receivermobile}","receiver":"${printing_packaging_factory_receiver}","receiveEnterpriseName":"${printing_packaging_factory_name}","enterpriseShippingAddressList":[{"detail":"${printing_packaging_factory_detail}","provinceId":${printing_packaging_factory_provinceid},"cityId":${printing_packaging_factory_cityid},"districtId":${printing_packaging_factory_districtid},"streetId":${printing_packaging_factory_streetid},"provinceName":"${printing_packaging_factory_provincename}","cityName":"${printing_packaging_factory_cityname}","districtName":"${printing_packaging_factory_districtname}","streetName":"${printing_packaging_factory_streetname}"}]} + ${body} Set Variable {"enterpriseId":"${printing_packaging_factory_id}","receiverMobile":"${printing_packaging_factory_shipping_addresses_receivermobile}","receiver":"${printing_packaging_factory_shipping_addresses_receiver}","receiveEnterpriseName":"${printing_packaging_factory_name}","enterpriseShippingAddressList":[{"detail":"${printing_packaging_factory_shipping_addresses_detail}","provinceId":${printing_packaging_factory_shipping_addresses_provinceid},"cityId":${printing_packaging_factory_shipping_addresses_cityid},"districtId":${printing_packaging_factory_shipping_addresses_districtid},"streetId":${printing_packaging_factory_shipping_addresses_streetid},"provinceName":"${printing_packaging_factory_shipping_addresses_provincename}","cityName":"${printing_packaging_factory_shipping_addresses_cityname}","districtName":"${printing_packaging_factory_shipping_addresses_districtname}","streetName":"${printing_packaging_factory_shipping_addresses_streetname}"}]} ${response} POST On Session uecops /uec/admin/save/enterprise-shipping-addresses ${body.encode("utf8")} log ${response.json()} Should Be Equal As Numbers 200 ${response.status_code} @@ -170,7 +81,8 @@ operate_save_printing_packaging_factory_baseinfo_enterprise_shipping_addresses operate_save_printing_packaging_factory_settlementaccountinfo_enterprise_scrappaper_credit Disable Warnings Create Session yytops ${yytops} headers=${operationbackend_header} - ${body} Set Variable {"enterpriseId":"${printing_packaging_factory_id}","deposit":990000,"earnest":900000,"totalUsed":90000} + #${body} Set Variable {"enterpriseId":"${printing_packaging_factory_id}","deposit":990000,"earnest":900000,"totalUsed":90000} + ${body} Set Variable {"enterpriseId":"${printing_packaging_factory_id}","deposit":${printing_packaging_factory_scrappaper_credit_deposit},"earnest":${printing_packaging_factory_scrappaper_credit_earnest},"totalUsed":${printing_packaging_factory_scrappaper_credit_totalUsed}} ${response} POST On Session yytops /cloud-print-user-center/admin/save/enterprise-scrap-paper-credit ${body.encode("utf8")} log ${response.json()} Should Be Equal As Numbers 200 ${response.status_code} @@ -179,10 +91,7 @@ operate_save_printing_packaging_factory_settlementaccountinfo_enterprise_scrappa operate_save_printing_packaging_factory_settlementaccountinfo_enterprise_private_account Disable Warnings Create Session uecops ${uecops} headers=${operationbackend_header} - ${printing_packaging_factory_cardholdername} Set Variable autotest_name - ${printing_packaging_factory_bankcardnumber} Set Variable autotest_bankcardnumber - ${printing_packaging_factory_openingbank} Set Variable autotest_openingbank - ${body} Set Variable {"enterpriseId":"${printing_packaging_factory_id}","list":[{"cardholderName":"${printing_packaging_factory_cardholdername}","bankCardNumber":"${printing_packaging_factory_bankcardnumber}","openingBank":"${printing_packaging_factory_openingbank}"}]} + ${body} Set Variable {"enterpriseId":"${printing_packaging_factory_id}","list":[{"cardholderName":"${printing_packaging_factory_private_account_cardholdername}","bankCardNumber":"${printing_packaging_factory_private_account_bankcardnumber}","openingBank":"${printing_packaging_factory_private_account_openingbank}"}]} ${response} POST On Session uecops /uec/admin/save/enterprise/private-account ${body.encode("utf8")} log ${response.json()} Should Be Equal As Numbers 200 ${response.status_code} @@ -191,9 +100,9 @@ operate_save_printing_packaging_factory_settlementaccountinfo_enterprise_private operate_save_printing_packaging_factory_settlementaccountinfo_enterprise_papereexternal_settlement_accounts Disable Warnings Create Session yytops ${yytops} headers=${operationbackend_header} - ${printing_packaging_factory_type} Set Variable 1 #类型 1千纸鹤 2新希望 - ${printing_packaging_factory_accountid} Set Variable autotest_accountid - ${body} Set Variable {"enterpriseId":"${printing_packaging_factory_id}","enterprisePaperExternalSettlementAccountList":[{"type":"${printing_packaging_factory_type}","accountId":"${printing_packaging_factory_accountid}","balance":990000,"total":990000}]} + ${printing_packaging_factory_papereexternal_settlement_accounts_type} Set Variable 1 #类型 1千纸鹤 2新希望 + ${printing_packaging_factory_papereexternal_settlement_accounts_accountid} Set Variable autotest_accountid + ${body} Set Variable {"enterpriseId":"${printing_packaging_factory_id}","enterprisePaperExternalSettlementAccountList":[{"type":"${printing_packaging_factory_papereexternal_settlement_accounts_type}","accountId":"${printing_packaging_factory_papereexternal_settlement_accounts_accountid}","balance":990000,"total":990000}]} ${response} POST On Session yytops /cloud-print-user-center/admin/save/enterprise-papere-external-settlement-accounts ${body.encode("utf8")} log ${response.json()} Should Be Equal As Numbers 200 ${response.status_code} @@ -202,9 +111,6 @@ operate_save_printing_packaging_factory_settlementaccountinfo_enterprise_paperee operate_save_printing_packaging_factory_employee_list_add_enterprise_administrator Disable Warnings Create Session yytops ${yytops} headers=${operationbackend_header} - ${printing_packaging_factory_administrator_realname} Set Variable autotest_name_customer - ${printing_packaging_factory_administrator_title} Set Variable autotest_job_customer - ${printing_packaging_factory_administrator_mobile} Set Variable 13012345678 ${body} Set Variable {"enterpriseId":"${printing_packaging_factory_id}","realName":"${printing_packaging_factory_administrator_realname}","title":"${printing_packaging_factory_administrator_title}","mobile":"${printing_packaging_factory_administrator_mobile}"} ${response} POST On Session yytops /cloud-print-user-center/admin/add/enterprise-administrator ${body.encode("utf8")} Set Suite Variable ${printing_packaging_factory_administrator_mobile} @@ -216,9 +122,7 @@ operate_save_printing_packaging_factory_employee_list_add_enterprise_administrat operate_save_printing_packaging_factory_employee_list_add_employee Disable Warnings Create Session uecops ${uecops} headers=${operationbackend_header} - ${printing_packaging_factory_position} Set Variable ADMINISTRATOR #角色 ADMINISTRATOR管理员 PRIMARY企业主 ORDINARY普通员工 - ${printing_packaging_factory_realname} Set Variable autotest_employee - ${body} Set Variable {"enterpriseId":"${printing_packaging_factory_id}","position":"${printing_packaging_factory_position}","realName":"${printing_packaging_factory_realname}"} + ${body} Set Variable {"enterpriseId":"${printing_packaging_factory_id}","position":"${printing_packaging_factory_employee_position}","realName":"${printing_packaging_factory_employee_realname}"} ${response} POST On Session uecops /uec/admin/add/employee ${body.encode("utf8")} log ${response.json()} Should Be Equal As Numbers 200 ${response.status_code} diff --git a/004_enterprise_open_account_supplier/supplier_paper_open_account.robot b/004_enterprise_open_account_supplier/supplier_paper_open_account.robot index d3e20b3..105b75f 100644 --- a/004_enterprise_open_account_supplier/supplier_paper_open_account.robot +++ b/004_enterprise_open_account_supplier/supplier_paper_open_account.robot @@ -8,19 +8,6 @@ Library urllib3 operate_save_virtual_supplier Disable Warnings Create Session yytops ${yytops} headers=${operationbackend_header} - ${virtual_supplier_name} Set Variable autotest_supplier_paper_name - ${virtual_supplier_shortName} Set Variable autotest_supplier_shortName - ${virtual_supplier_details} Set Variable autotest_supplier_paper_details - ${virtual_supplier_contactname} Set Variable autotest_supplier_paper_contactname - ${virtual_supplier_contactmoblie} Set Variable 13800138000 - ${virtual_supplier_provinceid} Set Variable 440000 - ${virtual_supplier_cityid} Set Variable 440100 - ${virtual_supplier_districtid} Set Variable 440106 - ${virtual_supplier_streetid} Set Variable 440106003 - ${virtual_supplier_provincename} Set Variable 广东省 - ${virtual_supplier_cityname} Set Variable 广州市 - ${virtual_supplier_districtname} Set Variable 天河区 - ${virtual_supplier_streetname} Set Variable 车陂街道 ${body} Set Variable {"name":"${virtual_supplier_name}","shortName":"${virtual_supplier_shortName}","details":"${virtual_supplier_details}","contactName":"${virtual_supplier_contactname}","contactMoblie":"${virtual_supplier_contactmoblie}","provinceName":"${virtual_supplier_provincename}","cityName":"${virtual_supplier_cityname}","districtName":"${virtual_supplier_districtname}","streetName":"${virtual_supplier_streetname}","provinceId":${virtual_supplier_provinceid},"cityId":${virtual_supplier_cityid},"districtId":${virtual_supplier_districtid},"streetId":${virtual_supplier_streetid}} Set Suite Variable ${virtual_supplier_name} ${response} POST On Session yytops /cloud-print-user-center/admin/supplier/directsalestore/virtual-supplier/save ${body.encode("utf8")} @@ -52,31 +39,6 @@ operate_update_virtual_supplier_status operate_create_enterprise_with_supplier_paper Disable Warnings Create Session yytops ${yytops} headers=${operationbackend_header} - ${supplier_paper_name} Set Variable autotest_supplier_paper_name - ${supplier_paper_type} Set Variable 5 #企业类型 1云印客户 2印刷包装厂 3造纸厂 4打包厂 5原纸供应商 6设备供应商 7其他 - ${supplier_paper_uniformSocialCreditCode} Set Variable autotest91440101MA59F2J10M - ${supplier_paper_legalPersonName} Set Variable autotest_legalperson - ${supplier_paper_legalPersonIdCardNo} Set Variable autotest_legalpersonidcardno - ${supplier_paper_paperSettlementIntervalTypeId} Set Variable 1 #结算周期 1现结 2月结20天 3月结45天 4月结60天 5月结75天 6月结90天 - ${supplier_paper_locProvinceId} Set Variable 440000 - ${supplier_paper_locCityId} Set Variable 440100 - ${supplier_paper_locDistrictId} Set Variable 440106 - ${supplier_paper_locStreetId} Set Variable 440106003 - ${supplier_paper_locDetail} Set Variable autotest_supplier_paper_details - ${supplier_paper_legalPersonIdCardFrontImg} Set Variable https://qncloudprintfiletest.oss-cn-shenzhen.aliyuncs.com/cloudprint/1632378545847.jpg - ${supplier_paper_legalPersonIdCardBackImg} Set Variable https://qncloudprintfiletest.oss-cn-shenzhen.aliyuncs.com/cloudprint/1632378545847.jpg - ${supplier_paper_businessLicenseImg} Set Variable https://qncloudprintfiletest.oss-cn-shenzhen.aliyuncs.com/cloudprint/1632378545847.jpg - ${supplier_paper_contactsname} Set Variable autotest_contactsname - ${supplier_paper_mobilePhone} Set Variable autotest_mobilePhone - ${supplier_paper_telephone} Set Variable autotest_telephone - ${supplier_paper_email} Set Variable autotest_email - ${supplier_paper_wechatAccount} Set Variable autotest_wechatAccount - ${supplier_paper_remark} Set Variable autotest_remark - ${supplier_paper_bankAccountName} Set Variable autotest_bankAccountName - ${supplier_paper_bankAccount} Set Variable autotest_bankAccount - ${supplier_paper_bankName} Set Variable autotest_bankName - ${supplier_paper_accountOpeningBranch} Set Variable autotest_accountOpeningBranch - ${supplier_paper_locationBank} Set Variable autotest_locationBank ${body} Set Variable {"supplierId":"${supplier_paper_id}","enterprise":{"name":"${supplier_paper_name}","locDetail":"${supplier_paper_locDetail}","type":${supplier_paper_type},"uniformSocialCreditCode":"${supplier_paper_uniformSocialCreditCode}","legalPersonIdCardNo":"${supplier_paper_legalPersonIdCardNo}","legalPersonName":"${supplier_paper_legalPersonName}","paperSettlementIntervalTypeId":"${supplier_paper_paperSettlementIntervalTypeId}","locProvinceId":${supplier_paper_locProvinceId},"locCityId":${supplier_paper_locCityId},"locDistrictId":${supplier_paper_locDistrictId},"locStreetId":${supplier_paper_locStreetId},"legalPersonIdCardFrontImg":"${supplier_paper_legalPersonIdCardFrontImg}","legalPersonIdCardBackImg":"${supplier_paper_legalPersonIdCardBackImg}","businessLicenseImg":"${supplier_paper_businessLicenseImg}"},"enterpriseContacts":{"name":"${supplier_paper_contactsname}","mobilePhone":"${supplier_paper_mobilePhone}","telephone":"${supplier_paper_telephone}","email":"${supplier_paper_email}","wechatAccount":"${supplier_paper_wechatAccount}","remark":"${supplier_paper_remark}"},"enterpriseCorporateAccount":{"bankAccountName":"${supplier_paper_bankAccountName}","bankAccount":"${supplier_paper_bankAccount}","bankName":"${supplier_paper_bankName}","accountOpeningBranch":"${supplier_paper_accountOpeningBranch}","locationBank":"${supplier_paper_locationBank}"}} ${response} POST On Session yytops /cloud-print-user-center/admin/create/enterprise/with/supplier ${body.encode("utf8")} Set Global Variable ${supplier_paper_name} @@ -100,27 +62,7 @@ operate_get_virtual_supplier_search operate_supplier_paper_save_base_info Disable Warnings Create Session yytops ${yytops} headers=${operationbackend_header} - ${supplier_paper_name} Set Variable autotest_supplier_paper_name - ${supplier_paper_shortName} Set Variable autotest_shortName - ${supplier_paper_type} Set Variable 5 #企业类型 1云印客户 2印刷包装厂 3造纸厂 4打包厂 5原纸供应商 6设备供应商 7其他 - ${supplier_paper_uniformSocialCreditCode} Set Variable autotest91440101MA59F2J10M - ${supplier_paper_legalPersonName} Set Variable autotest_legalperson - ${supplier_paper_legalPersonIdCardNo} Set Variable autotest_legalpersonidcardno - ${supplier_paper_legalPersonMobile} Set Variable 13800138000 - ${supplier_paper_paperSettlementIntervalTypeId} Set Variable 1 #结算周期 1现结 2月结20天 3月结45天 4月结60天 5月结75天 6月结90天 - ${supplier_paper_locProvinceId} Set Variable 440000 - ${supplier_paper_locCityId} Set Variable 440100 - ${supplier_paper_locDistrictId} Set Variable 440106 - ${supplier_paper_locStreetId} Set Variable 440106003 - ${supplier_paper_locprovincename} Set Variable 广东省 - ${supplier_paper_loccityname} Set Variable 广州市 - ${supplier_paper_locdistrictname} Set Variable 天河区 - ${supplier_paper_locstreetname} Set Variable 车陂街道 - ${supplier_paper_locDetail} Set Variable autotest_supplier_paper_details - ${supplier_paper_legalPersonIdCardFrontImg} Set Variable https://qncloudprintfiletest.oss-cn-shenzhen.aliyuncs.com/cloudprint/1632378545847.jpg - ${supplier_paper_legalPersonIdCardBackImg} Set Variable https://qncloudprintfiletest.oss-cn-shenzhen.aliyuncs.com/cloudprint/1632378545847.jpg - ${supplier_paper_businessLicenseImg} Set Variable https://qncloudprintfiletest.oss-cn-shenzhen.aliyuncs.com/cloudprint/1632378545847.jpg - ${body} Set Variable {"id":"${supplier_enterprise_id}","createTime":null,"updateTime":"${current_date_second}","name":"${supplier_paper_name}","shortName":"${supplier_paper_shortName}","receiptRequirement":null,"legalPersonName":"${supplier_paper_legalPersonName}","legalPersonIdCardNo":"${supplier_paper_legalPersonIdCardNo}","legalPersonMobile":"${supplier_paper_legalPersonMobile}","type":${supplier_paper_type},"registeredCapital":999,"regAddrLongitude":null,"regAddrLatitude":null,"supplierId":null,"annualTurnover":100,"uniformSocialCreditCode":"${supplier_paper_uniformSocialCreditCode}","locProvinceId":${supplier_paper_locProvinceId},"locProvinceName":"${supplier_paper_locprovincename}","locCityId":${supplier_paper_locCityId},"locCityName":"${supplier_paper_loccityname}","locDistrictId":${supplier_paper_locDistrictId},"locDistrictName":"${supplier_paper_locdistrictname}","locStreetId":${supplier_paper_locStreetId},"locStreetName":"${supplier_paper_locstreetname}","locDetail":"${supplier_paper_locDetail}","businessLicenseImg":"${supplier_paper_businessLicenseImg}","legalPersonIdCardFrontImg":"${supplier_paper_legalPersonIdCardFrontImg}","legalPersonIdCardBackImg":"${supplier_paper_legalPersonIdCardBackImg}"} + ${body} Set Variable {"id":"${supplier_enterprise_id}","createTime":null,"updateTime":"${current_date_second}","name":"${supplier_paper_base_info_name}","shortName":"${supplier_paper_base_info_shortName}","receiptRequirement":null,"legalPersonName":"${supplier_paper_base_info_legalPersonName}","legalPersonIdCardNo":"${supplier_paper_base_info_legalPersonIdCardNo}","legalPersonMobile":"${supplier_paper_base_info_legalPersonMobile}","type":${supplier_paper_base_info_type},"registeredCapital":999,"regAddrLongitude":null,"regAddrLatitude":null,"supplierId":null,"annualTurnover":100,"uniformSocialCreditCode":"${supplier_paper_base_info_uniformSocialCreditCode}","locProvinceId":${supplier_paper_base_info_locProvinceId},"locProvinceName":"${supplier_paper_base_info_locprovincename}","locCityId":${supplier_paper_base_info_locCityId},"locCityName":"${supplier_paper_base_info_loccityname}","locDistrictId":${supplier_paper_base_info_locDistrictId},"locDistrictName":"${supplier_paper_base_info_locdistrictname}","locStreetId":${supplier_paper_base_info_locStreetId},"locStreetName":"${supplier_paper_base_info_locstreetname}","locDetail":"${supplier_paper_base_info_locDetail}","businessLicenseImg":"${supplier_paper_base_info_businessLicenseImg}","legalPersonIdCardFrontImg":"${supplier_paper_base_info_legalPersonIdCardFrontImg}","legalPersonIdCardBackImg":"${supplier_paper_base_info_legalPersonIdCardBackImg}"} ${response} POST On Session yytops /cloud-print-user-center/admin/save/supplier/base-info ${body.encode("utf8")} log ${response.json()} Should Be Equal As Numbers 200 ${response.status_code} @@ -139,17 +81,6 @@ operate_supplier_paper_save_main_products operate_supplier_paper_save_factory_list Disable Warnings Create Session yytops ${yytops} headers=${operationbackend_header} - ${supplier_factory_locProvinceId} Set Variable 440000 - ${supplier_factory_locCityId} Set Variable 440100 - ${supplier_factory_locDistrictId} Set Variable 440106 - ${supplier_factory_locStreetId} Set Variable 440106003 - ${supplier_factory_locprovincename} Set Variable 广东省 - ${supplier_factory_loccityname} Set Variable 广州市 - ${supplier_factory_locdistrictname} Set Variable 天河区 - ${supplier_factory_locstreetname} Set Variable 车陂街道 - ${supplier_factory_locDetail} Set Variable autotest_supplier_factory_details - ${supplier_factory_leaseContractImg} Set Variable https://qncloudprintfiletest.oss-cn-shenzhen.aliyuncs.com/cloudprint/1632378545847.jpg - ${supplier_factory_factoryPhotos} Set Variable https://qncloudprintfiletest.oss-cn-shenzhen.aliyuncs.com/cloudprint/1632378545847.jpg ${body} Set Variable {"enterpriseId":"${supplier_enterprise_id}","factoryList":[{"locProvinceName":"${supplier_factory_locprovincename}","locCityName":"${supplier_factory_loccityname}","locDistrictName":"${supplier_factory_locdistrictname}","locStreetName":"${supplier_factory_locstreetname}","locDetail":"${supplier_factory_locDetail}","locProvinceId":${supplier_factory_locProvinceId},"locCityId":${supplier_factory_locCityId},"locDistrictId":${supplier_factory_locDistrictId},"locStreetId":${supplier_factory_locStreetId},"leaseContractImg":"${supplier_factory_leaseContractImg}","factoryPhotos":"${supplier_factory_factoryPhotos}"}]} ${response} POST On Session yytops /cloud-print-user-center/admin/save/factory-list ${body.encode("utf8")} log ${response.json()} @@ -160,9 +91,6 @@ operate_supplier_paper_save_factory_list operate_supplier_paper_save_private_account Disable Warnings Create Session uecops ${uecops} headers=${operationbackend_header} - ${supplier_private_account_cardholderName} Set Variable autotest_cardholder - ${supplier_private_account_bankCardNumber} Set Variable autotest_bankCardNumber - ${supplier_private_account_openingBank} Set Variable autotest_openingBank ${body} Set Variable {"enterpriseId":"${supplier_enterprise_id}","list":[{"cardholderName":"${supplier_private_account_cardholderName} ","bankCardNumber":"${supplier_private_account_bankCardNumber}","openingBank":"${supplier_private_account_openingBank} "}]} ${response} POST On Session uecops /uec/admin/save/enterprise/private-account ${body.encode("utf8")} log ${response.json()} @@ -172,8 +100,6 @@ operate_supplier_paper_save_private_account operate_supplier_paper_add_pc_machine Disable Warnings Create Session yytops ${yytops} headers=${operationbackend_header} - ${supplier_machine_name} Set Variable autotest_supplier_machine_name - ${supplier_machineType} Set Variable 10 ${body} Set Variable {"enterpriseId":"${supplier_enterprise_id}","id":null,"name":"${supplier_machine_name}","machineType":"${supplier_machineType}"} ${response} POST On Session yytops /capacity-market/add/pc-machine ${body.encode("utf8")} log ${response.json()} @@ -183,12 +109,9 @@ operate_supplier_paper_add_pc_machine operate_supplier_paper_add_enterprise_administrator Disable Warnings Create Session yytops ${yytops} headers=${operationbackend_header} - ${supplier_enterprise_administrator_realname} Set Variable autotest_name_supplier - ${supplier_enterprise_administrator_mobile} Set Variable 13123456789 - ${supplier_enterprise_administrator_position} Set Variable ADMINISTRATOR #角色 ADMINISTRATOR管理员 ORDINARY普通员工 ${body} Set Variable {"enterpriseId":"${supplier_enterprise_id}","realName":"${supplier_enterprise_administrator_realname}","mobile":${supplier_enterprise_administrator_mobile},"position":"${supplier_enterprise_administrator_position}"} ${response} POST On Session yytops /cloud-print-user-center/admin/save/user/to/enterprise ${body.encode("utf8")} - Set Suite Variable ${supplier_enterprise_administrator_mobile} + Set Global Variable ${supplier_enterprise_administrator_mobile} Set Suite Variable ${supplier_enterprise_administrator_realname} log ${response.json()} Should Be Equal As Numbers 200 ${response.status_code} diff --git a/005_enterprise_apply_credit/apply_credit_qniao_customer.robot b/005_enterprise_apply_credit/apply_credit_qniao_customer.robot index 8128e39..0e1a674 100644 --- a/005_enterprise_apply_credit/apply_credit_qniao_customer.robot +++ b/005_enterprise_apply_credit/apply_credit_qniao_customer.robot @@ -7,14 +7,8 @@ Library urllib3 operate_save_apply_credit_qniao Disable Warnings Create Session yytops ${yytops} headers=${operationpsc_header} - ${printing_packaging_factory_type} Set Variable 2 - ${printing_packaging_factory_purpose} Set Variable 1 #授信类型 1采购原纸 - ${printing_packaging_factory_creditLine} Set Variable 990000 - ${printing_packaging_factory_paperSettlementIntervalTypeId} Set Variable 11 #结算周期 11月结30天 12月结45天 13月结60天 14月结75天 15月结90天 - ${printing_packaging_factory_remark} Set Variable autotest_remark - ${body} Set Variable {"creditLine":${printing_packaging_factory_creditLine},"enterpriseId":"${printing_packaging_factory_id}","enterpriseName":"${printing_packaging_factory_name}","enterpriseType":${printing_packaging_factory_type},"legalpersonIdNo":"${printing_packaging_factory_legalpersonidcardno}","legalpersonMobile":null,"legalpersonName":"${printing_packaging_factory_legalpersonname}","purpose":${printing_packaging_factory_purpose},"remark":"${printing_packaging_factory_remark}","paperSettlementIntervalTypeId":"${printing_packaging_factory_paperSettlementIntervalTypeId}"} + ${body} Set Variable {"creditLine":${printing_packaging_factory_credit_qniao_save_creditLine},"enterpriseId":"${printing_packaging_factory_id}","enterpriseName":"${printing_packaging_factory_name}","enterpriseType":${printing_packaging_factory_credit_qniao_save_type},"legalpersonIdNo":"${printing_packaging_factory_legalpersonidcardno}","legalpersonMobile":null,"legalpersonName":"${printing_packaging_factory_legalpersonname}","purpose":${printing_packaging_factory_credit_qniao_save_purpose},"remark":"${printing_packaging_factory_credit_qniao_save_remark}","paperSettlementIntervalTypeId":"${printing_packaging_factory_credit_qniao_save_paperSettlementIntervalTypeId}"} ${response} POST On Session yytops /cloud-print-user-center/admin/credit/application/save/application ${body.encode("utf8")} - Set Suite Variable ${printing_packaging_factory_creditLine} log ${response.json()} Should Be Equal As Numbers 200 ${response.status_code} Should Be Equal As Strings successful ${response.json()["message"]} @@ -53,12 +47,7 @@ operate_verify_reject_apply_credit_qniao operate_update_apply_credit_qniao Disable Warnings Create Session yytops ${yytops} headers=${operationpsc_header} - ${printing_packaging_factory_type} Set Variable 2 - ${printing_packaging_factory_purpose} Set Variable 1 #授信类型 1采购原纸 - ${printing_packaging_factory_creditLine} Set Variable 990000 - ${printing_packaging_factory_paperSettlementIntervalTypeId} Set Variable 11 #结算周期 11月结30天 12月结45天 13月结60天 14月结75天 15月结90天 - ${printing_packaging_factory_remark} Set Variable autotest_remark - ${body} Set Variable {"id":"${printing_packaging_factory_credit_id}","creditLine":${printing_packaging_factory_creditLine},"enterpriseId":"${printing_packaging_factory_id}","enterpriseName":"${printing_packaging_factory_name}","enterpriseType":${printing_packaging_factory_type},"legalpersonIdNo":"${printing_packaging_factory_legalpersonidcardno}","legalpersonMobile":null,"legalpersonName":"${printing_packaging_factory_legalpersonname}","purpose":${printing_packaging_factory_purpose},"remark":"${printing_packaging_factory_remark}","paperSettlementIntervalTypeId":"${printing_packaging_factory_paperSettlementIntervalTypeId}"} + ${body} Set Variable {"id":"${printing_packaging_factory_credit_id}","creditLine":${printing_packaging_factory_credit_qniao_edit_creditLine},"enterpriseId":"${printing_packaging_factory_id}","enterpriseName":"${printing_packaging_factory_name}","enterpriseType":${printing_packaging_factory_credit_qniao_edit_type},"legalpersonIdNo":"${printing_packaging_factory_legalpersonidcardno}","legalpersonMobile":null,"legalpersonName":"${printing_packaging_factory_legalpersonname}","purpose":${printing_packaging_factory_credit_qniao_edit_purpose},"remark":"${printing_packaging_factory_credit_qniao_edit_remark}","paperSettlementIntervalTypeId":"${printing_packaging_factory_credit_qniao_edit_paperSettlementIntervalTypeId}"} ${response} POST On Session yytops /cloud-print-user-center/admin/credit/application/update/application ${body.encode("utf8")} log ${response.json()} Should Be Equal As Numbers 200 ${response.status_code} @@ -103,4 +92,4 @@ operate_get_credit_list_details_list log ${response.json()} Should Be Equal As Numbers 200 ${response.status_code} Should Be Equal As Strings successful ${response.json()["message"]} - Should Be Equal As Integers ${printing_packaging_factory_creditLine} ${response.json()["data"]["records"][0]["currentCreditLine"]} + Should Be Equal As Integers ${printing_packaging_factory_credit_qniao_save_creditLine} ${response.json()["data"]["records"][0]["currentCreditLine"]} diff --git a/006_get_credit/customer_credit_password.robot b/006_get_credit/customer_credit_password.robot index 43a8f55..e54b9f4 100644 --- a/006_get_credit/customer_credit_password.robot +++ b/006_get_credit/customer_credit_password.robot @@ -15,12 +15,10 @@ customer_get_credit_password_status customer_save_credit_password Disable Warnings - Create Session yytclient ${yytclient} headers=${cloudfactory_customer_header} - ${customer_credit_password} Set Variable 123456 - ${save_creditpassword_type} Set Variable 0 #操作状态 0增加密码 1修改密码 + Create Session yytclient ${yytclient} headers=${cloudfactory_customer_header}# ${body} Set Variable {"oldPassword":"","newPassword":"${customer_credit_password}","repeatPassword":"${customer_credit_password}","status":${save_creditpassword_type}} ${response} POST On Session yytclient /cloud-print-user-center/credit/payment-password/save ${body.encode("utf8")} - Set Suite Variable ${customer_credit_password} + #Set Suite Variable ${customer_credit_password} log ${response.json()} Should Be Equal As Numbers 200 ${response.status_code} Should Be Equal As Strings successful ${response.json()["message"]} @@ -28,11 +26,8 @@ customer_save_credit_password customer_update_credit_password Disable Warnings Create Session yytclient ${yytclient} headers=${cloudfactory_customer_header} - ${customer_credit_password_new} Set Variable 123456 - ${save_creditpassword_type} Set Variable 1 #操作状态 0增加密码 1修改密码 - ${body} Set Variable {"oldPassword":"${customer_credit_password}","newPassword":"${customer_credit_password_new}","repeatPassword":"${customer_credit_password_new}","status":${save_creditpassword_type}} + ${body} Set Variable {"oldPassword":"${customer_credit_password}","newPassword":"${customer_credit_password_new}","repeatPassword":"${customer_credit_password_new}","status":${save_creditpassword_type_new}} ${response} POST On Session yytclient /cloud-print-user-center/credit/payment-password/save ${body.encode("utf8")} log ${response.json()} Should Be Equal As Numbers 200 ${response.status_code} Should Be Equal As Strings successful ${response.json()["message"]} - Set Global Variable ${customer_credit_password_new} diff --git a/007_paper_variety_management/paper_brand.robot b/007_paper_variety_management/paper_brand.robot index bd4e00a..cf6014d 100644 --- a/007_paper_variety_management/paper_brand.robot +++ b/007_paper_variety_management/paper_brand.robot @@ -7,21 +7,7 @@ Library urllib3 supplierfocus_save_paper_brand Disable Warnings Create Session yytclient ${yytclient} headers=${cloudfactory_supplierfocus_header} - ${paper_categoryid} Set Variable 638458876659896320 - ${paper_Manufacturerid} Set Variable 638458967357526016 - ${paper_brand_name} Set Variable aotutest_paper_brand_name - ${paper_name} Set Variable aotutest_paper_name - ${paper_characteristic} Set Variable This autotest_paper_characteristic - ${paper_description} Set Variable This apaper_description - ${paper_brand_img} Set Variable https://qncloudprintfiletest.oss-cn-shenzhen.aliyuncs.com/cloudprint/1632378545847.jpg ${body} Set Variable {"categoryId":"${paper_categoryid}","paperManufacturerId":"${paper_Manufacturerid}","name":"${paper_brand_name}","paperName":"${paper_name}","characteristic":"${paper_characteristic}","description":"${paper_description}","img":"${paper_brand_img}"} - Set Global Variable ${paper_brand_name} - Set Global Variable ${paper_name} - Set Global Variable ${paper_categoryid} - Set Global Variable ${paper_Manufacturerid} - Set Suite Variable ${paper_characteristic} - Set Suite Variable ${paper_description} - Set Suite Variable ${paper_brand_img} ${response} POST On Session yytclient /trading-center/save/product/brand ${body.encode("utf8")} log ${response.json()} Should Be Equal As Numbers 200 ${response.status_code} diff --git a/007_paper_variety_management/paper_category.robot b/007_paper_variety_management/paper_category.robot index e830653..f5a9437 100644 --- a/007_paper_variety_management/paper_category.robot +++ b/007_paper_variety_management/paper_category.robot @@ -8,11 +8,9 @@ Library urllib3 supplierfocus_save_paper_category Disable Warnings Create Session yytclient ${yytclient} headers=${cloudfactory_supplierfocus_header} - ${paper_category_name} Set Variable autotest_paper_category_name ${body} Set Variable {"name":"${paper_category_name}"} Set Suite Variable ${paper_category_name} ${response} POST On Session yytclient /trading-center/save/product/paper-category ${body.encode("utf8")} - Set Global Variable ${paper_category_name} log ${response.json()} Should Be Equal As Numbers 200 ${response.status_code} Should Be Equal As Strings successful ${response.json()["message"]} @@ -28,7 +26,7 @@ supplierfocus_get_paper_category_list ${paper_category_id} Get From Dictionary ${response.json()["data"]["records"][0]} id Set Global Variable ${paper_category_id} ${paper_category_status} Get From Dictionary ${response.json()["data"]["records"][0]} status - Set Suite Variable ${paper_category_status} + Set Global Variable ${paper_category_status} supplierfocus_edit_paper_category Disable Warnings diff --git a/007_paper_variety_management/paper_manufacturer.robot b/007_paper_variety_management/paper_manufacturer.robot index 0c96b55..1be34b3 100644 --- a/007_paper_variety_management/paper_manufacturer.robot +++ b/007_paper_variety_management/paper_manufacturer.robot @@ -7,15 +7,7 @@ Library urllib3 supplierfocus_save_paper_manufacturer Disable Warnings Create Session yytclient ${yytclient} headers=${cloudfactory_supplierfocus_header} - ${paper_manufacturer_name} Set Variable autotest_paper_manufacturer_name - ${paper_manufacturer_shortName} Set Variable apmn - ${paper_manufacturer_description} Set Variable This autotest_paper_manufacturer - ${paper_manufacturer_logoImg} Set Variable https://qncloudprintfiletest.oss-cn-shenzhen.aliyuncs.com/cloudprint/1632378545847.jpg ${body} Set Variable {"name":"${paper_manufacturer_name}","shortName":"${paper_manufacturer_shortName}","description":"${paper_manufacturer_description}","logoImg":"${paper_manufacturer_logoImg}"} - Set Global Variable ${paper_manufacturer_name} - Set Global Variable ${paper_manufacturer_shortName} - Set Suite Variable ${paper_manufacturer_description} - Set Suite Variable ${paper_manufacturer_logoImg} ${response} POST On Session yytclient /trading-center/save/paper-manufacturer ${body.encode("utf8")} log ${response.json()} Should Be Equal As Numbers 200 ${response.status_code} diff --git a/008_market_information/market_information_link.robot b/008_market_information/market_information_link.robot index afce17a..c8ec7f0 100644 --- a/008_market_information/market_information_link.robot +++ b/008_market_information/market_information_link.robot @@ -7,9 +7,7 @@ Library urllib3 operate_save_market_information_link Disable Warnings Create Session yytops ${yytops} headers=${operationbackend_header} - ${market_information_link} Set Variable http://mp.weixin.qq.com/s?__biz=MzU1MDMwNzAzMA==&mid=2247483666&idx=1&sn=f63007b21094978d2f864fdd884b39dc&chksm=fba3d4abccd45dbdb535ef00b0a3cb7c24242e467f3b55e067c343da11d780d527d6fc5cb327&scene=18#wechat_redirect ${body} Set Variable {"link":"${market_information_link}"} - Set Suite Variable ${market_information_link} ${response} POST On Session yytops /trading-center/admin/save/market-information-link ${body.encode("utf8")} Log ${response.json()} Should Be Equal As Numbers 200 ${response.status_code} diff --git a/009_product_manage/product_add_and_list.robot b/009_product_manage/product_add_and_list.robot index 0640c26..b71394a 100644 --- a/009_product_manage/product_add_and_list.robot +++ b/009_product_manage/product_add_and_list.robot @@ -16,12 +16,8 @@ supplierfocus_product_check_exist supplierfocus_save_product Disable Warnings Create Session yytclient ${yytclient} headers=${cloudfactory_supplierfocus_header} - ${gramweight} Set Variable 678 - ${purchasePrice} Set Variable 5678 ${body} Set Variable {"categoryId":null,"brandName":"${paper_brand_name}","name":"${paper_name}","itemNo":"无","description":"报价全部为现金含税价，支持先用后付，欢迎来电查询！近期价格波动较大，请下单前先咨询价格。","shippingNote":"分切纸不足重量的，另加调机费；低于送货重量或超出送货范围的，运费另计。","sellingProposition":"月结30天价格，不加服务费！","setUnit":"吨","skuList":[{"id":null,"2":${gramweight},"purchasePrice":${purchasePrice}}],"categoryBrandId":"${paper_brand_id}","categoryName":"${paper_category_name}","paperMill":"${paper_manufacturer_shortName}","salesEnterpriseId":${supplier_paper_id},"supplierName":"${supplier_paper_name}"} ${response} POST On Session yytclient /trading-center/save/product ${body.encode("utf8")} - Set Global Variable ${gramweight} - Set Global Variable ${purchasePrice} log ${response.json()} Should Be Equal As Numbers 200 ${response.status_code} Should Be Equal As Strings successful ${response.json()["message"]} diff --git a/012_product_price_update/product_price_batch_update_purchaseprice.robot b/012_product_price_update/product_price_batch_update_purchaseprice.robot index db3f2ba..bc4f13a 100644 --- a/012_product_price_update/product_price_batch_update_purchaseprice.robot +++ b/012_product_price_update/product_price_batch_update_purchaseprice.robot @@ -26,8 +26,6 @@ product_price_sku_list_search product_price_sku_batch_update_purchaseprice Disable Warnings Create Session yytclient ${yytclient} headers=${cloudfactory_supplierfocus_header} - ${product_price_sku_alterType} Set Variable 1 #变更类型 1统一修改 2增加价格 3减少价格 - ${product_price_sku_new} Set Variable 6789 ${body} Set Variable {"skuids":["${product_price_sku_id}"],"alterType":${product_price_sku_alterType},"price":${product_price_sku_new}} ${response} POST On Session yytclient /trading-center/product/unify/alter/purchasing-cost ${body.encode("utf8")} Set Global Variable ${product_price_sku_new} diff --git a/014_shinpping_address/customer_enterprise_shipping_address.robot b/014_shinpping_address/customer_enterprise_shipping_address.robot index b4f55c9..49f4053 100644 --- a/014_shinpping_address/customer_enterprise_shipping_address.robot +++ b/014_shinpping_address/customer_enterprise_shipping_address.robot @@ -15,31 +15,8 @@ customer_enterprise_shipping_address_list customer_enterprise_save_shipping_address Disable Warnings Create Session uecclient ${uecclient} headers=${cloudfactory_customer_header} - ${customer_enterprise_shipping_address_isDefault} Set Variable 1 #是否默认地址 0否 1是 - ${customer_enterprise_shipping_address_receiver} Set Variable autotest_receiver - ${customer_enterprise_shipping_address_receiverMobile} Set Variable 13800138000 - ${customer_enterprise_shipping_address_detail} Set Variable autotest_customer_enterprise_shipping_address_detail - ${customer_enterprise_shipping_address_provinceid} Set Variable 440000 - ${customer_enterprise_shipping_address_cityid} Set Variable 440100 - ${customer_enterprise_shipping_address_districtid} Set Variable 440106 - ${customer_enterprise_shipping_address_streetid} Set Variable 440106003 - ${customer_enterprise_shipping_address_provincename} Set Variable 广东省 - ${customer_enterprise_shipping_address_cityname} Set Variable 广州市 - ${customer_enterprise_shipping_address_districtname} Set Variable 天河区 - ${customer_enterprise_shipping_address_streetname} Set Variable 车陂街道 ${body} Set Variable {"isDefault":${customer_enterprise_shipping_address_isDefault},"receiver":"${customer_enterprise_shipping_address_receiver}","receiverMobile":${customer_enterprise_shipping_address_receiverMobile},"detail":"${customer_enterprise_shipping_address_detail}","provinceId":${customer_enterprise_shipping_address_provinceid},"cityId":${customer_enterprise_shipping_address_cityid},"districtId":${customer_enterprise_shipping_address_districtid},"streetId":${customer_enterprise_shipping_address_streetid},"provinceName":"${customer_enterprise_shipping_address_provincename}","cityName":"${customer_enterprise_shipping_address_cityname}","districtName":"${customer_enterprise_shipping_address_districtname}","streetName":"${customer_enterprise_shipping_address_streetname}"} ${response} POST On Session uecclient /uec/save/enterprise-shipping-address ${body.encode("utf-8")} - Set Global Variable ${customer_enterprise_shipping_address_receiver} - Set Global Variable ${customer_enterprise_shipping_address_receiverMobile} - Set Global Variable ${customer_enterprise_shipping_address_detail} - Set Global Variable ${customer_enterprise_shipping_address_provinceid} - Set Global Variable ${customer_enterprise_shipping_address_cityid} - Set Global Variable ${customer_enterprise_shipping_address_streetid} - Set Global Variable ${customer_enterprise_shipping_address_districtid} - Set Global Variable ${customer_enterprise_shipping_address_provincename} - Set Global Variable ${customer_enterprise_shipping_address_cityname} - Set Global Variable ${customer_enterprise_shipping_address_districtname} - Set Global Variable ${customer_enterprise_shipping_address_streetname} log ${response.json()} Should Be Equal As Numbers 200 ${response.status_code} Should Be Equal As Strings successful ${response.json()["message"]} diff --git a/015_customer_create_order/customer_create_order_credit_payment.robot b/015_customer_create_order/customer_create_order_credit_payment.robot index a37f950..55465ca 100644 --- a/015_customer_create_order/customer_create_order_credit_payment.robot +++ b/015_customer_create_order/customer_create_order_credit_payment.robot @@ -31,30 +31,10 @@ get_settlement_interval_premium_rate_feisuan customer_create_order_credit_payment Disable Warnings Create Session yytclient ${yytclient} headers=${cloudfactory_customer_header} - ${customer_enterprise_shipping_address_receiver} Set Variable autotest_receiver - ${customer_enterprise_shipping_address_receiverMobile} Set Variable 13800138000 - ${customer_enterprise_shipping_address_detail} Set Variable autotest_customer_enterprise_shipping_address_detail - ${customer_enterprise_shipping_address_provinceid} Set Variable 440000 - ${customer_enterprise_shipping_address_cityid} Set Variable 440100 - ${customer_enterprise_shipping_address_districtid} Set Variable 440106 - ${customer_enterprise_shipping_address_streetid} Set Variable 440106003 - ${customer_enterprise_shipping_address_provincename} Set Variable 广东省 - ${customer_enterprise_shipping_address_cityname} Set Variable 广州市 - ${customer_enterprise_shipping_address_districtname} Set Variable 天河区 - ${customer_enterprise_shipping_address_streetname} Set Variable 车陂街道 - ${customer_create_order_paymentMethod} Set Variable 2 #支付方式 1微信支付 2授信支付 3线下支付 4飞算支付 - ${customer_create_order_width} Set Variable 787 - ${customer_create_order_length} Set Variable 1092 - ${customer_create_order_quantity} Set Variable 5000 ${customer_create_order_buyton} Evaluate ${gramweight}*${customer_create_order_width}*${customer_create_order_length}*${customer_create_order_quantity}/1000000000000 ${customer_create_order_buyTon} Convert To Number ${customer_create_order_buyton} 4 #precision 如果可选精度为正或零，则返回的数字将四舍五入到小数位数。负精度意味着数字四舍五入到绝对精度幂的最接近10的倍数。如果一个数字同样接近某一精度，它总是从零开始四舍五入。 ${customer_create_order_price} Evaluate ${product_price_sku_new}*(1+${settlement_interval_premium_rate_qniao}) ${customer_create_order_Price} Convert To Number ${customer_create_order_price} 2 #precision 如果可选精度为正或零，则返回的数字将四舍五入到小数位数。负精度意味着数字四舍五入到绝对精度幂的最接近10的倍数。如果一个数字同样接近某一精度，它总是从零开始四舍五入。 - ${customer_create_order_bootFee} Set Variable 0 - ${customer_create_order_cuttingFee} Set Variable 0 - ${customer_create_order_freightFee} Set Variable 0 - ${customer_create_order_serviceFee} Set Variable 0 - ${customer_create_order_otherFee} Set Variable 0 ${customer_create_order_totalOfferPrice} Evaluate ${customer_create_order_Price}*${customer_create_order_buyTon}+${customer_create_order_cuttingFee}+${customer_create_order_bootFee}+${customer_create_order_otherFee}+${customer_create_order_freightFee}+${customer_create_order_serviceFee} ${customer_create_order_totalOfferPrice_item} Convert To Number ${customer_create_order_totalOfferPrice} 2 #precision 如果可选精度为正或零，则返回的数字将四舍五入到小数位数。负精度意味着数字四舍五入到绝对精度幂的最接近10的倍数。如果一个数字同样接近某一精度，它总是从零开始四舍五入。 ${customer_create_order_realPayPrice} Set Variable ${customer_create_order_totalOfferPrice_item} diff --git a/016_enquiry_create_order/customer_enquiry_operate_and_supplier_quoted_price_create_order.robot b/016_enquiry_create_order/customer_enquiry_operate_and_supplier_quoted_price_create_order.robot index 24bcbd6..394aae1 100644 --- a/016_enquiry_create_order/customer_enquiry_operate_and_supplier_quoted_price_create_order.robot +++ b/016_enquiry_create_order/customer_enquiry_operate_and_supplier_quoted_price_create_order.robot @@ -7,14 +7,8 @@ Library urllib3 customer_add_enquiry Disable Warnings Create Session yytclient ${yytclient} headers=${cloudfactory_customer_header} - ${customer_enquiryContent} Set Variable autotest_enquiryContent - ${customer_deliveryDay} Set Variable 48 - ${customer_deliveryArea} Set Variable 广东省 广州市 天河区 - ${body} Set Variable {"enquiryContent":"${customer_enquiryContent}","picUrl":"","deliveryDay":${customer_deliveryDay},"deliveryArea":"${customer_deliveryArea}"} + ${body} Set Variable {"enquiryContent":"${customer_enquiryContent}","picUrl":"","deliveryDay":${customer_enquiry_deliveryDay},"deliveryArea":"${customer_enquiry_deliveryArea}"} ${response} POST On Session yytclient /trading-center/add/enquiry-order ${body.encode("utf-8")} - Set Global Variable ${customer_enquiryContent} - Set Suite Variable ${customer_deliveryDay} - Set Suite Variable ${customer_deliveryArea} log ${response.json()} Should Be Equal As Numbers 200 ${response.status_code} Should Be Equal As Strings successful ${response.json()["message"]} @@ -45,18 +39,8 @@ supplierfocus_get_enquiry_list_search supplierfocus_edit_enquiry_details Disable Warnings Create Session yytclient ${yytclient} headers=${cloudfactory_customer_header} - ${enquiry_gramWeight1} Set Variable 678 - ${enquiry_width1} Set Variable 787 - ${enquiry_length1} Set Variable 1000 - ${enquiry_quantity1} Set Variable 5500 - ${enquiry_gramWeight2} Set Variable 678 - ${enquiry_width2} Set Variable 787 - ${enquiry_length2} Set Variable 1092 - ${enquiry_quantity2} Set Variable 5000 - ${customer_enquiry_remark} Set Variable autotest_remark - ${body} Set Variable {"addList":[{"deliveryId":null,"deliveryProvinceId":null,"deliveryProvinceName":null,"deliveryCityId":null,"deliveryCityName":null,"deliveryDistrictId":null,"deliveryDistrictName":null,"deliveryStreetId":null,"deliveryStreetName":null,"deliveryDetails":null,"deliveryReceiver":null,"deliveryReceiverMobile":null,"brandId":"${paper_brand_id}","gramWeight":${enquiry_gramWeight1},"width":${enquiry_width1},"length":${enquiry_length1},"quantity":${enquiry_quantity1},"brandName":"${paper_name}","enquiryId":"${customer_enquiry_id}","remark":"${customer_enquiry_remark}"},{"deliveryId":null,"deliveryProvinceId":null,"deliveryProvinceName":null,"deliveryCityId":null,"deliveryCityName":null,"deliveryDistrictId":null,"deliveryDistrictName":null,"deliveryStreetId":null,"deliveryStreetName":null,"deliveryDetails":null,"deliveryReceiver":null,"deliveryReceiverMobile":null,"brandId":"${paper_brand_id}","gramWeight":${enquiry_gramWeight2},"width":${enquiry_width2},"length":${enquiry_length2},"quantity":${enquiry_quantity2},"brandName":"${paper_name}","enquiryId":"${customer_enquiry_id}","remark":"${customer_enquiry_remark}"}],"delList":[],"updateList":[],"id":"${customer_enquiry_id}","askEnterprise":"${printing_packaging_factory_id}","belongEnterpriseName":"${printing_packaging_factory_name}","deliveryDay":${customer_deliveryDay},"deliveryArea":"${customer_deliveryArea}","enquiryContent":"${customer_enquiryContent}","picUrl":null,"receiver":null,"receiverMobile":null,"deliveryProvinceId":null,"deliveryCityId":null,"deliveryDistrictId":null,"deliveryStreetId":null,"deliveryProvinceName":null,"deliveryCityName":null,"deliveryDistrictName":null,"deliveryStreetName":null,"deliveryDetail":null,"deliveryId":null,"deliveryDetails":null,"deliveryReceiver":null,"deliveryReceiverMobile":null} + ${body} Set Variable {"addList":[{"deliveryId":null,"deliveryProvinceId":null,"deliveryProvinceName":null,"deliveryCityId":null,"deliveryCityName":null,"deliveryDistrictId":null,"deliveryDistrictName":null,"deliveryStreetId":null,"deliveryStreetName":null,"deliveryDetails":null,"deliveryReceiver":null,"deliveryReceiverMobile":null,"brandId":"${paper_brand_id}","gramWeight":${enquiry_gramWeight1},"width":${enquiry_width1},"length":${enquiry_length1},"quantity":${enquiry_quantity1},"brandName":"${paper_name}","enquiryId":"${customer_enquiry_id}","remark":"${customer_enquiry_remark}"},{"deliveryId":null,"deliveryProvinceId":null,"deliveryProvinceName":null,"deliveryCityId":null,"deliveryCityName":null,"deliveryDistrictId":null,"deliveryDistrictName":null,"deliveryStreetId":null,"deliveryStreetName":null,"deliveryDetails":null,"deliveryReceiver":null,"deliveryReceiverMobile":null,"brandId":"${paper_brand_id}","gramWeight":${enquiry_gramWeight2},"width":${enquiry_width2},"length":${enquiry_length2},"quantity":${enquiry_quantity2},"brandName":"${paper_name}","enquiryId":"${customer_enquiry_id}","remark":"${customer_enquiry_remark}"}],"delList":[],"updateList":[],"id":"${customer_enquiry_id}","askEnterprise":"${printing_packaging_factory_id}","belongEnterpriseName":"${printing_packaging_factory_name}","deliveryDay":${customer_enquiry_deliveryDay},"deliveryArea":"${customer_enquiry_deliveryArea}","enquiryContent":"${customer_enquiryContent}","picUrl":null,"receiver":null,"receiverMobile":null,"deliveryProvinceId":null,"deliveryCityId":null,"deliveryDistrictId":null,"deliveryStreetId":null,"deliveryProvinceName":null,"deliveryCityName":null,"deliveryDistrictName":null,"deliveryStreetName":null,"deliveryDetail":null,"deliveryId":null,"deliveryDetails":null,"deliveryReceiver":null,"deliveryReceiverMobile":null} ${response} POST On Session yytclient /trading-center/update/enquiry-order ${body.encode("utf-8")} - Set Global Variable ${customer_enquiry_remark} log ${response.json()} Should Be Equal As Numbers 200 ${response.status_code} Should Be Equal As Strings successful ${response.json()["message"]} @@ -99,23 +83,14 @@ supplierfocus_get_obtain_paper_quotes_list supplierfocus_submit_paper_quotation Disable Warnings Create Session yytclient ${yytclient} headers=${cloudfactory_supplierfocus_header} - ${paper_quotation_gramWeight1} Set Variable 678 - ${paper_quotation_width1} Set Variable 787 - ${paper_quotation_length1} Set Variable 1000 - ${paper_quotation_quantity1} Set Variable 5500 ${paper_quotation_buyton1} Evaluate ${paper_quotation_gramWeight1}*${paper_quotation_width1}*${paper_quotation_length1}*${paper_quotation_quantity1}/1000000000000 ${paper_quotation_buyTon1} Convert To Number ${paper_quotation_buyton1} 4 #precision 如果可选精度为正或零，则返回的数字将四舍五入到小数位数。负精度意味着数字四舍五入到绝对精度幂的最接近10的倍数。如果一个数字同样接近某一精度，它总是从零开始四舍五入。 ${paper_quotation_unitfee1} Evaluate ${product_price_sku_new}*(1+${settlement_interval_premium_rate_qniao}) ${paper_quotation_flyCalcSalesprice1} Evaluate ${product_price_sku_new}*(1+${settlement_interval_premium_rate_feisuan}) - ${paper_quotation_otherFee} Set Variable 0 ${paper_quotation_unitFee1} Convert To Number ${paper_quotation_unitfee1} ${paper_quotation_flyCalcSalesPrice1} Convert To Number ${paper_quotation_flyCalcSalesprice1} ${paper_quotation_totalOfferPrice1} Evaluate ${paper_quotation_unitFee1}*${paper_quotation_buyTon1}+${paper_quotation_otherFee} ${paper_quotation_totalOfferPrice_item1} Convert To Number ${paper_quotation_totalOfferPrice1} 2 - ${paper_quotation_gramWeight2} Set Variable 678 - ${paper_quotation_width2} Set Variable 787 - ${paper_quotation_length2} Set Variable 1092 - ${paper_quotation_quantity2} Set Variable 5000 ${paper_quotation_buyton2} Evaluate ${paper_quotation_gramWeight2}*${paper_quotation_width2}*${paper_quotation_length2}*${paper_quotation_quantity2}/1000000000000 ${paper_quotation_buyTon2} Convert To Number ${paper_quotation_buyton2} 4 #precision 如果可选精度为正或零，则返回的数字将四舍五入到小数位数。负精度意味着数字四舍五入到绝对精度幂的最接近10的倍数。如果一个数字同样接近某一精度，它总是从零开始四舍五入。 ${paper_quotation_unitfee2} Evaluate ${product_price_sku_new}*(1+${settlement_interval_premium_rate_qniao}) @@ -124,26 +99,16 @@ supplierfocus_submit_paper_quotation ${paper_quotation_flyCalcSalesPrice2} Convert To Number ${paper_quotation_flyCalcSalesprice2} ${paper_quotation_totalOfferPrice2} Evaluate ${paper_quotation_unitFee2}*${paper_quotation_buyTon2}+${paper_quotation_otherFee} ${paper_quotation_totalOfferPrice_item2} Convert To Number ${paper_quotation_totalOfferPrice2} 2 - ${supplierfocus_paper_quotation_remark} Set Variable autotest_supplierfocus_paper_quotation_remark ${body} Set Variable {"addList":[],"delList":[],"enquiryId":"${customer_enquiry_id}","updateList":[{"enquiryId":"${customer_enquiry_id}","paperQuotedPriceId":"${paperQuotedPriceId}","id":"${paper_quotes_item_id1}","productSkuId":"${product_price_sku_id}","paperId":null,"brandId":"${paper_brand_id}","paperName":null,"brandName":"${paper_name}","productName":null,"gramWeight":${paper_quotation_gramWeight1},"quantity":${paper_quotation_quantity1},"length":${paper_quotation_length1},"width":${paper_quotation_width1},"weight":${paper_quotation_buyTon1},"unitFee":${paper_quotation_unitFee1},"totalPrice":"${paper_quotation_totalOfferPrice_item1}","createTime":"${current_date_second.encode('utf-8')}","updateTime":"${current_date_second.encode('utf-8')}","effectiveTime":"${current_date_second.encode('utf-8')}","salesEnterpriseId":"${supplier_paper_id}","remark":"${customer_enquiry_remark}","purchasePrice":${product_price_sku_new},"otherFee":${paper_quotation_otherFee},"repEnterprise":"553652487819759617","repEnterpriseName":"千鸟官方直营","salesEnterpriseName":"${printing_packaging_factory_name}","flyCalcSalesPrice":${paper_quotation_flyCalcSalesPrice1}},{"enquiryId":"${customer_enquiry_id}","paperQuotedPriceId":"${paperQuotedPriceId}","id":"${paper_quotes_item_id2}","productSkuId":"${product_price_sku_id}","paperId":null,"brandId":"${paper_brand_id}","paperName":null,"brandName":"${paper_name}","productName":null,"gramWeight":${paper_quotation_gramWeight2},"quantity":${paper_quotation_quantity2},"length":${paper_quotation_length2},"width":${paper_quotation_width2},"weight":${paper_quotation_buyTon2},"unitFee":${paper_quotation_unitFee2},"totalPrice":"${paper_quotation_totalOfferPrice_item2}","createTime ":"${current_date_second.encode('utf-8')}","updateTime":"${current_date_second.encode('utf-8')}","effectiveTime":"${current_date_second.encode('utf-8')}","salesEnterpriseId":"${supplier_paper_id}","remark":"${customer_enquiry_remark}","purchasePrice":${product_price_sku_new},"otherFee":${paper_quotation_otherFee},"repEnterprise":"553652487819759617","repEnterpriseName":"千鸟官方直营","salesEnterpriseName":"${printing_packaging_factory_name}","flyCalcSalesPrice":${paper_quotation_flyCalcSalesPrice2}}],"remark":"${supplierfocus_paper_quotation_remark}"} ${response} POST On Session yytclient /trading-center/submit/paper-quotation ${body.encode("utf-8")} - Set Suite Variable ${paper_quotation_gramWeight1} - Set Suite Variable ${paper_quotation_width1} - Set Suite Variable ${paper_quotation_length1} - Set Suite Variable ${paper_quotation_quantity1} - Set Suite Variable ${paper_quotation_buyTon1} - Set Suite Variable ${paper_quotation_unitFee1} - Set Suite Variable ${paper_quotation_flyCalcSalesPrice1} - Set Suite Variable ${paper_quotation_totalOfferPrice_item1} - Set Suite Variable ${paper_quotation_otherFee} - Set Suite Variable ${paper_quotation_gramWeight2} - Set Suite Variable ${paper_quotation_width2} - Set Suite Variable ${paper_quotation_length2} - Set Suite Variable ${paper_quotation_quantity2} - Set Suite Variable ${paper_quotation_buyTon2} - Set Suite Variable ${paper_quotation_unitFee2} - Set Suite Variable ${paper_quotation_flyCalcSalesPrice2} - Set Suite Variable ${paper_quotation_totalOfferPrice_item2} + Set Global Variable ${paper_quotation_buyTon1} + Set Global Variable ${paper_quotation_unitFee1} + Set Global Variable ${paper_quotation_flyCalcSalesPrice1} + Set Global Variable ${paper_quotation_totalOfferPrice_item1} + Set Global Variable ${paper_quotation_buyTon2} + Set Global Variable ${paper_quotation_unitFee2} + Set Global Variable ${paper_quotation_flyCalcSalesPrice2} + Set Global Variable ${paper_quotation_totalOfferPrice_item2} log ${response.json()} Should Be Equal As Numbers 200 ${response.status_code} Should Be Equal As Strings successful ${response.json()["message"]} @@ -180,28 +145,8 @@ customer_get_enquiry_result customer_enquiry_create_order_credit_payment Disable Warnings Create Session yytclient ${yytclient} headers=${cloudfactory_customer_header} - ${customer_enterprise_shipping_address_receiver} Set Variable autotest_receiver - ${customer_enterprise_shipping_address_receiverMobile} Set Variable 13800138000 - ${customer_enterprise_shipping_address_detail} Set Variable autotest_customer_enterprise_shipping_address_detail - ${customer_enterprise_shipping_address_provinceid} Set Variable 440000 - ${customer_enterprise_shipping_address_cityid} Set Variable 440100 - ${customer_enterprise_shipping_address_districtid} Set Variable 440106 - ${customer_enterprise_shipping_address_streetid} Set Variable 440106003 - ${customer_enterprise_shipping_address_provincename} Set Variable 广东省 - ${customer_enterprise_shipping_address_cityname} Set Variable 广州市 - ${customer_enterprise_shipping_address_districtname} Set Variable 天河区 - ${customer_enterprise_shipping_address_streetname} Set Variable 车陂街道 - ${customer_create_order_paymentMethod} Set Variable 2 #支付方式 1微信支付 2授信支付 3线下支付 4飞算支付 - ${customer_create_order_bootFee1} Set Variable 0 - ${customer_create_order_cuttingFee1} Set Variable 0 - ${customer_create_order_freightFee1} Set Variable 0 - ${customer_create_order_serviceFee1} Set Variable 0 ${customer_create_order_enquiry_totalOfferPrice_item1} Evaluate ${paper_quotation_totalOfferPrice_item1}+${customer_create_order_bootFee1}+${customer_create_order_cuttingFee1}+${customer_create_order_freightFee1}+${customer_create_order_serviceFee1} ${customer_create_order_enquiry_totalOfferPrice_Item1} Convert To Number ${customer_create_order_enquiry_totalOfferPrice_item1} 2 - ${customer_create_order_bootFee2} Set Variable 0 - ${customer_create_order_cuttingFee2} Set Variable 0 - ${customer_create_order_freightFee2} Set Variable 0 - ${customer_create_order_serviceFee2} Set Variable 0 ${customer_create_order_enquiry_totalOfferPrice_item2} Evaluate ${paper_quotation_totalOfferPrice_item2}+${customer_create_order_bootFee2}+${customer_create_order_cuttingFee2}+${customer_create_order_freightFee2}+${customer_create_order_serviceFee2} ${customer_create_order_enquiry_totalOfferPrice_Item2} Convert To Number ${customer_create_order_enquiry_totalOfferPrice_item2} 2 ${customer_create_order_enquiry_realPayprice} Evaluate ${customer_create_order_enquiry_totalOfferPrice_Item1}+${customer_create_order_enquiry_totalOfferPrice_Item2} diff --git a/017_order_and_receipt_and_delivery/get_oeder_and_receipt_and_delivery.robot b/017_order_and_receipt_and_delivery/get_oeder_and_receipt_and_delivery.robot index abdd565..927c256 100644 --- a/017_order_and_receipt_and_delivery/get_oeder_and_receipt_and_delivery.robot +++ b/017_order_and_receipt_and_delivery/get_oeder_and_receipt_and_delivery.robot @@ -66,18 +66,6 @@ supplierfocus_get_order_order-item-list supplierfocus_create_supplier_order_batch Disable Warnings Create Session yytclient ${yytclient} headers=${cloudfactory_supplierfocus_header} - ${customer_enterprise_shipping_address_receiver} Set Variable autotest_receiver - ${customer_enterprise_shipping_address_receiverMobile} Set Variable 13800138000 - ${customer_enterprise_shipping_address_detail} Set Variable autotest_customer_enterprise_shipping_address_detail - ${customer_enterprise_shipping_address_provinceid} Set Variable 440000 - ${customer_enterprise_shipping_address_cityid} Set Variable 440100 - ${customer_enterprise_shipping_address_districtid} Set Variable 440106 - ${customer_enterprise_shipping_address_streetid} Set Variable 440106003 - ${customer_enterprise_shipping_address_provincename} Set Variable 广东省 - ${customer_enterprise_shipping_address_cityname} Set Variable 广州市 - ${customer_enterprise_shipping_address_districtname} Set Variable 天河区 - ${customer_enterprise_shipping_address_streetname} Set Variable 车陂街道 - ${supplier_order_remark} Set Variable autotest_supplier_order_remark ${body} Set Variable {"orderItemList":[{"deliveryId":"${customer_enterprise_shipping_address_id}","deliveryProvinceId":${customer_enterprise_shipping_address_provinceid},"deliveryProvinceName":"${customer_enterprise_shipping_address_provincename}","deliveryCityId":${customer_enterprise_shipping_address_cityid},"deliveryCityName":"${customer_enterprise_shipping_address_cityname}","deliveryDistrictId":${customer_enterprise_shipping_address_districtid},"deliveryDistrictName":"${customer_enterprise_shipping_address_districtname}","deliveryStreetId":${customer_enterprise_shipping_address_streetid},"deliveryStreetName":"${customer_enterprise_shipping_address_streetname}","deliveryDetails":"${customer_enterprise_shipping_address_detail}","receiver":"${customer_enterprise_shipping_address_receiver}","receiverMobile":"${customer_enterprise_shipping_address_receiverMobile}","otherFee":0,"remark":"autotest_supplier_order_remark","unitPrice":5000,"supplyOrderItemId":"${supply_order_item_id1}"},{"deliveryId":"${customer_enterprise_shipping_address_id}","deliveryProvinceId":${customer_enterprise_shipping_address_provinceid},"deliveryProvinceName":"${customer_enterprise_shipping_address_provincename}","deliveryCityId":${customer_enterprise_shipping_address_cityid},"deliveryCityName":"${customer_enterprise_shipping_address_cityname}","deliveryDistrictId":${customer_enterprise_shipping_address_districtid},"deliveryDistrictName":"${customer_enterprise_shipping_address_districtname}","deliveryStreetId":${customer_enterprise_shipping_address_streetid},"deliveryStreetName":"${customer_enterprise_shipping_address_streetname}","deliveryDetails":"${customer_enterprise_shipping_address_detail}","receiver":"${customer_enterprise_shipping_address_receiver}","receiverMobile":"${customer_enterprise_shipping_address_receiverMobile}","otherFee":0,"remark":"autotest_supplier_order_remark","unitPrice":5000,"supplyOrderItemId":"${supply_order_item_id2}"}]} ${response} POST On Session yytclient /trading-center/seller/create/supplier-order-batch ${body.encode("utf-8")} log ${response.json()} diff --git a/018_payable_and_receivable/payable.robot b/018_payable_and_receivable/payable.robot index 26eb025..6ed8606 100644 --- a/018_payable_and_receivable/payable.robot +++ b/018_payable_and_receivable/payable.robot @@ -26,8 +26,6 @@ operate_get_payable_list_search operate_confirm_payable Disable Warnings Create Session yytops ${yytops} headers=${operationpsc_header} - ${payable_fundProvider} Set Variable 1 #付款资金方 1千鸟互联 2千纸鹤 - ${payable_remark} Set Variable autotest_remark ${bady} Set Variable {"fundProvider":${payable_fundProvider},"id":"${payable_id}","realAmount":${supplier_order_totalPrice},"remark":"${payable_remark}"} ${response} POST On Session yytops /trading-center/admin/confirm/payable ${bady} log ${response.json()} diff --git a/018_payable_and_receivable/receivable.robot b/018_payable_and_receivable/receivable.robot index 0f437ce..4ed936e 100644 --- a/018_payable_and_receivable/receivable.robot +++ b/018_payable_and_receivable/receivable.robot @@ -28,7 +28,6 @@ operate_get_receivable_list_search operate_confirm_receivable Disable Warnings Create Session yytops ${yytops} headers=${operationpsc_header} - ${receivable_remark} Set Variable autotest_remark ${bady} Set Variable {"id":"${receivable_id}","realAmount":${customer_order_totalPrice},"remark":"${receivable_remark}"} ${response} POST On Session yytops /trading-center/admin/confirm/receivable ${bady} log ${response.json()} diff --git a/100_test_data_clear/test_data_clear.robot b/100_test_data_clear/test_data_clear.robot index 47a9f6f..8232a48 100644 --- a/100_test_data_clear/test_data_clear.robot +++ b/100_test_data_clear/test_data_clear.robot @@ -8,11 +8,11 @@ Library urllib3 database_delete_user_customerclue_customer Connect To Database Using Custom Params pymysql database='uec', user='root', password='password', host='8.135.8.221', port=3306, charset='utf8' Execute Sql String update qn_account set is_delete = 1 where tid = "${account_customer}" - Execute Sql String update qn_enterprise_member set is_delete = 1 where user_id = ${account_customer} - ${query} Query select user_id from qn_account where tid = "${account_customer}" - ${query_list} Get From List ${query} 0 - ${userid} Get From List ${query_list} 0 - Execute Sql String update qn_user set is_delete = 1 where id = ${userid} + #${query} Query select user_id from qn_account where tid = "${account_customer}" + #${query_list} Get From List ${query} 0 + #${userid} Get From List ${query_list} 0 + Execute Sql String update qn_enterprise_member set is_delete = 1 where user_id = ${userid_customer} + Execute Sql String update qn_user set is_delete = 1 where id = ${userid_customer} Connect To Database Using Custom Params pymysql database='yyt_user_center', user='root', password='password', host='8.135.8.221', port=3306, charset='utf8' Execute Sql String update qn_customer_clue set is_delete = 1 where mobile = "${account_customer}" Disconnect From Database @@ -20,11 +20,11 @@ database_delete_user_customerclue_customer database_delete_user_customerclue_supplier Connect To Database Using Custom Params pymysql database='uec', user='root', password='password', host='8.135.8.221', port=3306, charset='utf8' Execute Sql String update qn_account set is_delete = 1 where tid = "${account_supplier}" - Execute Sql String update qn_enterprise_member set is_delete = 1 where user_id = ${account_supplier} - ${query} Query select user_id from qn_account where tid = "${account_supplier}" - ${query_list} Get From List ${query} 0 - ${userid} Get From List ${query_list} 0 - Execute Sql String update qn_user set is_delete = 1 where id = ${userid} + #${query} Query select user_id from qn_account where tid = "${account_supplier}" + #${query_list} Get From List ${query} 0 + #${userid} Get From List ${query_list} 0 + Execute Sql String update qn_enterprise_member set is_delete = 1 where user_id = ${userid_supplier} + Execute Sql String update qn_user set is_delete = 1 where id = ${userid_supplier} Connect To Database Using Custom Params pymysql database='yyt_user_center', user='root', password='password', host='8.135.8.221', port=3306, charset='utf8' Execute Sql String update qn_customer_clue set is_delete = 1 where mobile = "${account_supplier}" Disconnect From Database @@ -33,6 +33,12 @@ database_delete_printing_packaging_factory Connect To Database Using Custom Params pymysql database='uec', user='root', password='password', host='8.135.8.221', port=3306, charset='utf8' Execute Sql String update qn_enterprise set is_delete = 1 where id = ${printing_packaging_factory_id} Execute Sql String update qn_enterprise_member set is_delete = 1 where enterprise_id = ${printing_packaging_factory_id} + Execute Sql String update qn_account set is_delete = 1 where tid = "${printing_packaging_factory_administrator_mobile}" + ${query} Query select user_id from qn_account where tid = "${printing_packaging_factory_administrator_mobile}" + ${query_list} Get From List ${query} 0 + ${userid} Get From List ${query_list} 0 + Execute Sql String update qn_enterprise_member set is_delete = 1 where user_id = ${userid} + Execute Sql String update qn_user set is_delete = 1 where id = ${userid} Connect To Database Using Custom Params pymysql database='yyt_user_center', user='root', password='password', host='8.135.8.221', port=3306, charset='utf8' Execute Sql String update qn_enterprise set is_delete = 1 where id = ${printing_packaging_factory_id} Execute Sql String update qn_enterprise_profile set is_delete = 1 where enterprise_id = ${printing_packaging_factory_id} @@ -42,6 +48,12 @@ database_delete_supplier_paper Connect To Database Using Custom Params pymysql database='uec', user='root', password='password', host='8.135.8.221', port=3306, charset='utf8' Execute Sql String update qn_enterprise set is_delete = 1 where id = ${supplier_enterprise_id} Execute Sql String update qn_enterprise_member set is_delete = 1 where enterprise_id = ${supplier_enterprise_id} + Execute Sql String update qn_account set is_delete = 1 where tid = "${supplier_enterprise_administrator_mobile}" + ${query} Query select user_id from qn_account where tid = "${supplier_enterprise_administrator_mobile}" + ${query_list} Get From List ${query} 0 + ${userid} Get From List ${query_list} 0 + Execute Sql String update qn_enterprise_member set is_delete = 1 where user_id = ${userid} + Execute Sql String update qn_user set is_delete = 1 where id = ${userid} Connect To Database Using Custom Params pymysql database='yyt_user_center', user='root', password='password', host='8.135.8.221', port=3306, charset='utf8' Execute Sql String update qn_enterprise set is_delete = 1 where id = ${supplier_enterprise_id} Execute Sql String update qn_enterprise_profile set is_delete = 1 where enterprise_id = ${supplier_enterprise_id} diff --git a/datas/003_open_account_customer.xls b/datas/003_open_account_customer.xls index 32453b2..177b81b 100644 Binary files a/datas/003_open_account_customer.xls and b/datas/003_open_account_customer.xls differ diff --git a/datas/004_open_account_supplier_paper.xls b/datas/004_open_account_supplier_paper.xls index 2425a07..f5665dd 100644 Binary files a/datas/004_open_account_supplier_paper.xls and b/datas/004_open_account_supplier_paper.xls differ diff --git a/datas/005_credit_qniao_customer.xls b/datas/005_credit_qniao_customer.xls index 7e71a86..78cac5a 100644 Binary files a/datas/005_credit_qniao_customer.xls and b/datas/005_credit_qniao_customer.xls differ diff --git a/datas/008_market_information_link.xls b/datas/008_market_information_link.xls index fef9d59..f99eb7d 100644 Binary files a/datas/008_market_information_link.xls and b/datas/008_market_information_link.xls differ diff --git a/datas/012_product_price.xls b/datas/012_product_price.xls index 8f3c9d3..b9cfccc 100644 Binary files a/datas/012_product_price.xls and b/datas/012_product_price.xls differ diff --git a/datas/015_customer_create_order.xls b/datas/015_customer_create_order.xls index 383659f..32f9fe5 100644 Binary files a/datas/015_customer_create_order.xls and b/datas/015_customer_create_order.xls differ diff --git a/datas/016_customer_enquiry_create_order.xls b/datas/016_customer_enquiry_create_order.xls index b07512d..c1faff7 100644 Binary files a/datas/016_customer_enquiry_create_order.xls and b/datas/016_customer_enquiry_create_order.xls differ diff --git a/datas/017_create_supplier_order_batch.xls b/datas/017_create_supplier_order_batch.xls index d475fc7..277481d 100644 Binary files a/datas/017_create_supplier_order_batch.xls and b/datas/017_create_supplier_order_batch.xls differ