Skip to content

B
Bailun.PmsAPI
Commit 5b105aee by weitianhua
Options

Merge branch 'develop'

parents a717fe64 a8762052
Showing with 131 additions and 53 deletions
API.Services/API.Services.csproj
......@@ -33,9 +33,8 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="MySql.Data, Version=6.8.8.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\MySql.Data.6.9.9\lib\net45\MySql.Data.dll</HintPath>
<Reference Include="MySql.Data, Version=6.9.12.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
<HintPath>..\packages\MySql.Data.6.9.12\lib\net45\MySql.Data.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
......@@ -97,6 +96,7 @@
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
<None Include="packages.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
......
API.Services/app.config
......@@ -8,4 +8,9 @@
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>
\ No newline at end of file
<system.data>
<DbProviderFactories>
<remove invariant="MySql.Data.MySqlClient" />
<add name="MySQL Data Provider" invariant="MySql.Data.MySqlClient" description=".Net Framework Data Provider for MySQL" type="MySql.Data.MySqlClient.MySqlClientFactory, MySql.Data, Version=6.9.12.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d" />
</DbProviderFactories>
</system.data></configuration>
\ No newline at end of file
API.Services/packages.config 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="MySql.Data" version="6.9.12" targetFramework="net45" />
</packages>
\ No newline at end of file
ApiControl/ApiControl.csproj
......@@ -34,9 +34,8 @@
<Reference Include="log4net">
<HintPath>..\packages\log4net.2.0.3\lib\net40-full\log4net.dll</HintPath>
</Reference>
<Reference Include="MySql.Data, Version=6.9.9.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\external\MySql.Data.dll</HintPath>
<Reference Include="MySql.Data, Version=6.9.12.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
<HintPath>..\packages\MySql.Data.6.9.12\lib\net45\MySql.Data.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
......@@ -77,6 +76,7 @@
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
<None Include="packages.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
......
ApiControl/app.config
......@@ -8,4 +8,9 @@
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>
\ No newline at end of file
<system.data>
<DbProviderFactories>
<remove invariant="MySql.Data.MySqlClient" />
<add name="MySQL Data Provider" invariant="MySql.Data.MySqlClient" description=".Net Framework Data Provider for MySQL" type="MySql.Data.MySqlClient.MySqlClientFactory, MySql.Data, Version=6.9.12.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d" />
</DbProviderFactories>
</system.data></configuration>
\ No newline at end of file
ApiControl/packages.config 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="MySql.Data" version="6.9.12" targetFramework="net45" />
</packages>
\ No newline at end of file
BailunRedis/BailunRedis.csproj
......@@ -34,28 +34,28 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Qiniu.7.3.1.1\lib\Net40\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="ServiceStack, Version=3.9.71.0, Culture=neutral, processorArchitecture=MSIL">
<Reference Include="ServiceStack">
<HintPath>..\packages\ServiceStack.3.9.71\lib\net35\ServiceStack.dll</HintPath>
</Reference>
<Reference Include="ServiceStack.Common, Version=3.9.9.0, Culture=neutral, processorArchitecture=MSIL">
<Reference Include="ServiceStack.Common">
<HintPath>..\packages\ServiceStack.Common.3.9.11\lib\net35\ServiceStack.Common.dll</HintPath>
</Reference>
<Reference Include="ServiceStack.Interfaces, Version=3.9.9.0, Culture=neutral, processorArchitecture=MSIL">
<Reference Include="ServiceStack.Interfaces">
<HintPath>..\packages\ServiceStack.Common.3.9.11\lib\net35\ServiceStack.Interfaces.dll</HintPath>
</Reference>
<Reference Include="ServiceStack.OrmLite, Version=3.9.14.0, Culture=neutral, processorArchitecture=MSIL">
<Reference Include="ServiceStack.OrmLite">
<HintPath>..\packages\ServiceStack.OrmLite.SqlServer.3.9.14\lib\ServiceStack.OrmLite.dll</HintPath>
</Reference>
<Reference Include="ServiceStack.OrmLite.SqlServer, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<Reference Include="ServiceStack.OrmLite.SqlServer">
<HintPath>..\packages\ServiceStack.OrmLite.SqlServer.3.9.14\lib\ServiceStack.OrmLite.SqlServer.dll</HintPath>
</Reference>
<Reference Include="ServiceStack.Redis, Version=3.9.11.0, Culture=neutral, processorArchitecture=MSIL">
<Reference Include="ServiceStack.Redis">
<HintPath>..\packages\ServiceStack.Redis.3.9.11\lib\net35\ServiceStack.Redis.dll</HintPath>
</Reference>
<Reference Include="ServiceStack.ServiceInterface, Version=3.9.71.0, Culture=neutral, processorArchitecture=MSIL">
<Reference Include="ServiceStack.ServiceInterface">
<HintPath>..\packages\ServiceStack.3.9.71\lib\net35\ServiceStack.ServiceInterface.dll</HintPath>
</Reference>
<Reference Include="ServiceStack.Text, Version=3.9.11.0, Culture=neutral, processorArchitecture=MSIL">
<Reference Include="ServiceStack.Text">
<HintPath>..\packages\ServiceStack.Text.3.9.11\lib\net35\ServiceStack.Text.dll</HintPath>
</Reference>
<Reference Include="System" />
......@@ -80,10 +80,6 @@
<Name>CommonControl</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
<None Include="packages.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
......
CommonControl/CommonControl.csproj
......@@ -31,14 +31,8 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="BouncyCastle.Crypto, Version=1.8.6.0, Culture=neutral, PublicKeyToken=0e99375e54769942, processorArchitecture=MSIL">
<HintPath>..\packages\Portable.BouncyCastle.1.8.6\lib\net40\BouncyCastle.Crypto.dll</HintPath>
</Reference>
<Reference Include="ICSharpCode.SharpZipLib, Version=1.2.0.246, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
<HintPath>..\packages\SharpZipLib.1.2.0\lib\net45\ICSharpCode.SharpZipLib.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Qiniu.7.3.1.1\lib\Net40\Newtonsoft.Json.dll</HintPath>
<Reference Include="Newtonsoft.Json">
<HintPath>..\packages\Newtonsoft.Json.10.0.3\lib\net40\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="NPOI, Version=2.5.1.0, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL">
<HintPath>..\packages\NPOI.2.5.1\lib\net45\NPOI.dll</HintPath>
......@@ -52,13 +46,17 @@
<Reference Include="NPOI.OpenXmlFormats, Version=2.5.1.0, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL">
<HintPath>..\packages\NPOI.2.5.1\lib\net45\NPOI.OpenXmlFormats.dll</HintPath>
</Reference>
<Reference Include="Qiniu, Version=7.3.0.0, Culture=neutral, processorArchitecture=MSIL">
<Reference Include="Qiniu">
<HintPath>..\packages\Qiniu.7.3.1.1\lib\Net40\Qiniu.dll</HintPath>
</Reference>
<Reference Include="StackExchange.Redis, Version=1.2.6.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\StackExchange.Redis.1.2.6\lib\net45\StackExchange.Redis.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Configuration" />
<Reference Include="System.Core" />
<Reference Include="System.Drawing" />
<Reference Include="System.IO.Compression" />
<Reference Include="System.Web" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
......
CommonControl/packages.config
......@@ -5,4 +5,5 @@
<package id="Portable.BouncyCastle" version="1.8.6" targetFramework="net45" />
<package id="Qiniu" version="7.3.1.1" targetFramework="net45" />
<package id="SharpZipLib" version="1.2.0" targetFramework="net45" />
<package id="StackExchange.Redis" version="1.2.6" targetFramework="net45" />
</packages>
\ No newline at end of file
PetaPoco/App.config
......@@ -12,13 +12,4 @@
<remove invariant="MySql.Data.MySqlClient" />
<add name="MySQL Data Provider" invariant="MySql.Data.MySqlClient" description=".Net Framework Data Provider for MySQL" type="MySql.Data.MySqlClient.MySqlClientFactory, MySql.Data, Version=6.9.12.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d" />
</DbProviderFactories>
</system.data>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>
\ No newline at end of file
</system.data></configuration>
\ No newline at end of file
PetaPoco/Custom/ProductData/AllProductInfo.cs
......@@ -264,6 +264,16 @@ namespace PetaPoco.Custom.ProductData
public string s_operatetype { get; set; }
///<summary>
///英国海关编码
///</summary>
public string s_uk_customs_code { get; set; }
///<summary>
///发货打包要求
///</summary>
public string s_packaging_requirements { get; set; }
///<summary>
///开发主键
///</summary>
public int ex_id { get; set; }
......@@ -403,6 +413,13 @@ namespace PetaPoco.Custom.ProductData
///</summary>
public DateTime ex_updatetime { get; set; }
public string ex_selfShip_packingReq { get; set; } = "";
public string ex_transfer_packingReq { get; set; } = "";
public string ex_fba_packingReq { get; set; } = "";
///<summary>
///状态主键
///</summary>
......
PetaPoco/Custom/ProductData/BatchProductInfo.cs
......@@ -331,5 +331,15 @@ namespace PetaPoco.Custom.ProductData
/// 产品类型
/// </summary>
public int s_product_type { get; set; }
///<summary>
///英国海关编码
///</summary>
public string s_uk_customs_code { get; set; }
///<summary>
///发货打包要求
///</summary>
public string s_packaging_requirements { get; set; }
}
}
PetaPoco/Models/Generated/MysqlModel.cs
......@@ -2279,7 +2279,7 @@ namespace DbConn
[ExplicitColumns]
public partial class yt_product_base : DbConnDB.Record<yt_product_base>
{
public enum EPT {s_id ,s_main_id ,s_goods_code ,s_product_code ,s_product ,s_sku ,s_ctitle ,s_etitle ,s_ctitle_alias ,s_category_bailun_id ,s_category_bailun_name ,s_category_id ,s_category_name ,s_series ,s_skutype ,s_isfinish ,s_weight ,s_unit ,s_price ,s_currency ,s_main_image ,s_child_image ,s_color ,s_size ,s_size1 ,s_size2 ,s_product_size ,s_packing_size ,s_packing_name ,s_packing_price ,s_packing_weight ,s_packing_req ,s_packing_skuid ,s_charger_spec ,s_product_character ,s_bailun_character ,s_cpeihuo ,s_epeihuo ,s_cbaoguan ,s_ebaoguan ,s_hscode ,s_content ,s_remarks ,s_developtime ,s_createname ,s_createtime ,s_updatename ,s_updatetime ,s_operatetype, s_category_simple, s_product_type }
public enum EPT {s_id ,s_main_id ,s_goods_code ,s_product_code ,s_product ,s_sku ,s_ctitle ,s_etitle ,s_ctitle_alias ,s_category_bailun_id ,s_category_bailun_name ,s_category_id ,s_category_name ,s_series ,s_skutype ,s_isfinish ,s_weight ,s_unit ,s_price ,s_currency ,s_main_image ,s_child_image ,s_color ,s_size ,s_size1 ,s_size2 ,s_product_size ,s_packing_size ,s_packing_name ,s_packing_price ,s_packing_weight ,s_packing_req ,s_packing_skuid ,s_charger_spec ,s_product_character ,s_bailun_character ,s_cpeihuo ,s_epeihuo ,s_cbaoguan ,s_ebaoguan ,s_hscode ,s_content ,s_remarks ,s_developtime ,s_createname ,s_createtime ,s_updatename ,s_updatetime ,s_operatetype, s_category_simple, s_product_type, s_uk_customs_code, s_packaging_requirements }
......@@ -2785,6 +2785,20 @@ namespace DbConn
[Description("产品类型")]
[Column("s_product_type")] public int s_product_type { get; set; }
///<summary>
///英国海关编码
///</summary>
[Description("英国海关编码")]
[Column("s_uk_customs_code")] public string s_uk_customs_code { get; set; }
///<summary>
///发货打包要求
///</summary>
[Description("发货打包要求")]
[Column("s_packaging_requirements")] public string s_packaging_requirements { get; set; }
}
......
WebApi/Properties/PublishProfiles/ApiCenter.pubxml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<!--
您 Web 项目的发布/打包进程将使用此文件。您可以通过编辑此 MSBuild 文件
来自定义该进程的行为。若要了解与此相关的详细信息，请访问 http://go.microsoft.com/fwlink/?LinkID=208121。
-->
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<WebPublishMethod>FileSystem</WebPublishMethod>
<LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
<LastUsedPlatform>Any CPU</LastUsedPlatform>
<SiteUrlToLaunchAfterPublish />
<LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
<ExcludeApp_Data>False</ExcludeApp_Data>
<publishUrl>F:\IIS Project\ApiCenter</publishUrl>
<DeleteExistingFiles>True</DeleteExistingFiles>
<PrecompileBeforePublish>True</PrecompileBeforePublish>
<EnableUpdateable>True</EnableUpdateable>
<DebugSymbols>False</DebugSymbols>
<WDPMergeOption>DonotMerge</WDPMergeOption>
</PropertyGroup>
<ItemGroup>
<Content Include="bin\WebApi.xml">
<CopyToOutputDirectory>true</CopyToOutputDirectory>
</Content>
<!-- Include a content to each documentation file -->
</ItemGroup>
</Project>
\ No newline at end of file
WebApi/Web.config
......@@ -74,7 +74,11 @@
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" culture="neutral" publicKeyToken="30ad4fe6b2a6aeed" />
<bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0" />
<<<<<<< Updated upstream
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
=======
<bindingRedirect oldVersion="0.0.0.0-10.0.0.0" newVersion="10.0.0.0" />
>>>>>>> Stashed changes
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Web.Optimization" publicKeyToken="31bf3856ad364e35" />
......@@ -118,9 +122,4 @@
<compiler language="vb;vbs;visualbasic;vbscript" extension=".vb" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.VBCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" warningLevel="4" compilerOptions="/langversion:14 /nowarn:41008 /define:_MYTYPE=\&quot;Web\&quot; /optionInfer+" />
</compilers>
</system.codedom>
<system.data>
<DbProviderFactories>
<remove invariant="MySql.Data.MySqlClient" />
<add name="MySQL Data Provider" invariant="MySql.Data.MySqlClient" description=".Net Framework Data Provider for MySQL" type="MySql.Data.MySqlClient.MySqlClientFactory, MySql.Data, Version=6.9.12.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d" />
</DbProviderFactories>
</system.data></configuration>
\ No newline at end of file
</configuration>
\ No newline at end of file
WebApi/packages.config
......@@ -6,7 +6,6 @@
<package id="EntityFramework.zh-Hans" version="6.1.3" targetFramework="net452" />
<package id="jQuery" version="1.10.2" targetFramework="net452" />
<package id="jQuery.Validation" version="1.11.1" targetFramework="net452" />
<package id="log4net" version="2.0.3" targetFramework="net452" />
<package id="Microsoft.ApplicationInsights" version="2.0.0" targetFramework="net452" />
<package id="Microsoft.ApplicationInsights.Agent.Intercept" version="1.2.1" targetFramework="net452" />
<package id="Microsoft.ApplicationInsights.DependencyCollector" version="2.0.0" targetFramework="net452" />
......@@ -60,9 +59,12 @@
<package id="Microsoft.Owin.zh-Hans" version="3.0.1" targetFramework="net452" />
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net452" />
<package id="Modernizr" version="2.6.2" targetFramework="net452" />
<<<<<<< Updated upstream
=======
<package id="MySql.Data" version="6.9.12" targetFramework="net45" />
<package id="Newtonsoft.Json" version="12.0.3" targetFramework="net45" />
>>>>>>> Stashed changes
<package id="Owin" version="1.0" targetFramework="net452" />
<package id="Respond" version="1.2.0" targetFramework="net452" />
<package id="WebGrease" version="1.5.2" targetFramework="net452" />
<package id="log4net" version="2.0.3" targetFramework="net452" />
</packages>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment