Skip to content

B
Bailun.PmsAPI
Commit afa5550f by zoushenggui
Options

zsg

parent 01adeadf
Showing with 44 additions and 62 deletions
API.Services/API.Services.csproj
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder> <AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>API.Services</RootNamespace> <RootNamespace>API.Services</RootNamespace>
<AssemblyName>API.Services</AssemblyName> <AssemblyName>API.Services</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion> <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
<TargetFrameworkProfile /> <TargetFrameworkProfile />
</PropertyGroup> </PropertyGroup>
......
API.Services/HqygManageServices/HqygDataServices.cs
...@@ -145,7 +145,7 @@ namespace API.Services.HqygManageServices ...@@ -145,7 +145,7 @@ namespace API.Services.HqygManageServices
string resStrJson = HttpGetOrPost.httpGet("https://oa.bailuntec.com/api/Currency/GetCurrency"); string resStrJson = HttpGetOrPost.httpGet("http://oa.bailuntec.com/api/Currency/GetCurrency");
List<SetCategoryCurrencysByOADto> resultList = JsonConvert.DeserializeObject<List<SetCategoryCurrencysByOADto>>(resStrJson); List<SetCategoryCurrencysByOADto> resultList = JsonConvert.DeserializeObject<List<SetCategoryCurrencysByOADto>>(resStrJson);
ProductBaseDto result = new ProductBaseDto(); ProductBaseDto result = new ProductBaseDto();
result.response = true; result.response = true;
......
API.Services/ProductManageServices/ProductServices.cs
...@@ -262,6 +262,10 @@ namespace API.Services.ProductManageServices ...@@ -262,6 +262,10 @@ namespace API.Services.ProductManageServices
{ {
tempBase.s_category_simple = objBase.s_category_simple; tempBase.s_category_simple = objBase.s_category_simple;
} }
if (objBase.s_category_bailun_id > 0)
{
tempBase.s_category_bailun_id = objBase.s_category_bailun_id;
}
tempBase = ExChangeBatchToEntity(item, dicModel); tempBase = ExChangeBatchToEntity(item, dicModel);
tempBase.s_updatename = batchProduct.updateName; tempBase.s_updatename = batchProduct.updateName;
myBaseList.Add(tempBase); myBaseList.Add(tempBase);
...@@ -477,7 +481,8 @@ namespace API.Services.ProductManageServices ...@@ -477,7 +481,8 @@ namespace API.Services.ProductManageServices
{ {
var myCateList = yt_category_bailun.GetMyParentCategories(item.s_category_bailun_id); var myCateList = yt_category_bailun.GetMyParentCategories(item.s_category_bailun_id);
var objMyCate = myCateList.FirstOrDefault(m => m.c_id == item.s_category_bailun_id); var objMyCate = myCateList.FirstOrDefault(m => m.c_id == item.s_category_bailun_id);
item.s_category_bailun_name = yt_category_bailun.GetFullNameByList(myCateList); item.s_category_bailun_name = yt_category_bailun.GetFullNameByID(item.s_category_bailun_id, "cn");
//item.s_category_bailun_name = yt_category_bailun.GetFullNameByList(myCateList,1,"cn");
} }
} }
//if (item.s_category_simple == 1 && objModel.s_category_simple > 0) //if (item.s_category_simple == 1 && objModel.s_category_simple > 0)
......
API.Services/app.config
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<configuration> <configuration>
<runtime> <runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" /> <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" /> <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0"/>
</dependentAssembly> </dependentAssembly>
</assemblyBinding> </assemblyBinding>
</runtime> </runtime>
<system.data> <system.data>
<DbProviderFactories> <DbProviderFactories>
<remove invariant="MySql.Data.MySqlClient" /> <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" /> <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> </DbProviderFactories>
</system.data></configuration> </system.data><startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/></startup></configuration>
\ No newline at end of file
ApiControl/ApiControl.csproj
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder> <AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>ApiControl</RootNamespace> <RootNamespace>ApiControl</RootNamespace>
<AssemblyName>ApiControl</AssemblyName> <AssemblyName>ApiControl</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion> <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
<TargetFrameworkProfile /> <TargetFrameworkProfile />
</PropertyGroup> </PropertyGroup>
......
ApiControl/app.config
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<configuration> <configuration>
<runtime> <runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" /> <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" /> <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0"/>
</dependentAssembly> </dependentAssembly>
</assemblyBinding> </assemblyBinding>
</runtime> </runtime>
<system.data> <system.data>
<DbProviderFactories> <DbProviderFactories>
<remove invariant="MySql.Data.MySqlClient" /> <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" /> <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> </DbProviderFactories>
</system.data></configuration> </system.data><startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/></startup></configuration>
\ No newline at end of file
BailunRedis/BailunRedis.csproj
...@@ -9,8 +9,9 @@ ...@@ -9,8 +9,9 @@
<AppDesignerFolder>Properties</AppDesignerFolder> <AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>BailunRedis</RootNamespace> <RootNamespace>BailunRedis</RootNamespace>
<AssemblyName>BailunRedis</AssemblyName> <AssemblyName>BailunRedis</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion> <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols> <DebugSymbols>true</DebugSymbols>
......
CommonControl/CommonControl.csproj
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder> <AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>CommonControl</RootNamespace> <RootNamespace>CommonControl</RootNamespace>
<AssemblyName>CommonControl</AssemblyName> <AssemblyName>CommonControl</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion> <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
<TargetFrameworkProfile /> <TargetFrameworkProfile />
</PropertyGroup> </PropertyGroup>
......
PetaPoco/App.config
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<configuration> <configuration>
<connectionStrings> <connectionStrings>
<!--<add name="DbConn" connectionString="server=192.168.6.140;port=3306;database=bailundb;uid=root;password=123456;" providerName="MySql.Data.MySqlClient" />--> <!--<add name="DbConn" connectionString="server=192.168.6.140;port=3306;database=bailundb;uid=root;password=123456;" providerName="MySql.Data.MySqlClient" />-->
<add name="DbConn" connectionString="server=gz-cdb-lnrmt5zh.sql.tencentcdb.com;database=bailundb;uid=root;password=#7kfnymAM$Y9-Ntf;port=61369;Convert Zero Datetime=True;Allow User Variables=True" providerName="MySql.Data.MySqlClient" /> <add name="DbConn" connectionString="server=gz-cdb-lnrmt5zh.sql.tencentcdb.com;database=bailundb;uid=root;password=#7kfnymAM$Y9-Ntf;port=61369;Convert Zero Datetime=True;Allow User Variables=True" providerName="MySql.Data.MySqlClient"/>
</connectionStrings> </connectionStrings>
<startup> <startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" /> <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/>
</startup> </startup>
<system.data> <system.data>
<DbProviderFactories> <DbProviderFactories>
<remove invariant="MySql.Data.MySqlClient" /> <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" /> <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> </DbProviderFactories>
</system.data></configuration> </system.data></configuration>
PetaPoco/Custom/ProductData/BatchProductInfo.cs
...@@ -32,6 +32,10 @@ namespace PetaPoco.Custom.ProductData ...@@ -32,6 +32,10 @@ namespace PetaPoco.Custom.ProductData
///百伦分类 ///百伦分类
///</summary> ///</summary>
public int s_category_bailun_id { get; set; } public int s_category_bailun_id { get; set; }
/// <summary>
/// 百伦分类
/// </summary>
public int? pd_category_bailun_id { get; set; }
///<summary> ///<summary>
///简易分类 ///简易分类
......
PetaPoco/Models/Generated/Database.cs
...@@ -2,25 +2,6 @@ ...@@ -2,25 +2,6 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
...@@ -29,7 +10,6 @@ using PetaPoco; ...@@ -29,7 +10,6 @@ using PetaPoco;
namespace DbConn namespace DbConn
{ {
public partial class DbConnDB : Database public partial class DbConnDB : Database
{ {
public DbConnDB() public DbConnDB()
...@@ -77,7 +57,6 @@ namespace DbConn ...@@ -77,7 +57,6 @@ namespace DbConn
_instance=null; _instance=null;
} }
public class Record<T> where T:new() public class Record<T> where T:new()
{ {
/// <summary> /// <summary>
...@@ -140,11 +119,9 @@ namespace DbConn ...@@ -140,11 +119,9 @@ namespace DbConn
public static DbConnDB repo { get { return DbConnDB.GetInstance(); } } public static DbConnDB repo { get { return DbConnDB.GetInstance(); } }
public bool IsNew() { return repo.IsNew(this); } public bool IsNew() { return repo.IsNew(this); }
public object Insert() { return repo.Insert(this); } public object Insert() { return repo.Insert(this); }
public void Save() { repo.Save(this); } public void Save() { repo.Save(this); }
public int Update() { return repo.Update(this); } public int Update() { return repo.Update(this); }
/// <summary> /// <summary>
/// add by model /// add by model
/// </summary> /// </summary>
...@@ -199,9 +176,7 @@ namespace DbConn ...@@ -199,9 +176,7 @@ namespace DbConn
public static Page<T> Page(long page, long itemsPerPage, Sql sql) { return repo.Page<T>(page, itemsPerPage, sql); } public static Page<T> Page(long page, long itemsPerPage, Sql sql) { return repo.Page<T>(page, itemsPerPage, sql); }
public static IEnumerable<T> Query(string sql, params object[] args) { return repo.Query<T>(sql, args); } public static IEnumerable<T> Query(string sql, params object[] args) { return repo.Query<T>(sql, args); }
public static IEnumerable<T> Query(Sql sql) { return repo.Query<T>(sql); } public static IEnumerable<T> Query(Sql sql) { return repo.Query<T>(sql); }
} }
} }
......
PetaPoco/Models/Generated/MysqlModel.cs
This source diff could not be displayed because it is too large. You can view the blob instead.
PetaPoco/PetaPoco.csproj
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder> <AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>PetaPoco</RootNamespace> <RootNamespace>PetaPoco</RootNamespace>
<AssemblyName>PetaPoco</AssemblyName> <AssemblyName>PetaPoco</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion> <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
<TargetFrameworkProfile /> <TargetFrameworkProfile />
</PropertyGroup> </PropertyGroup>
......
WebApi/Areas/ProductManage/Controllers/ProductController.cs
...@@ -203,6 +203,7 @@ namespace WebApi.Areas.ProductManage.Controllers ...@@ -203,6 +203,7 @@ namespace WebApi.Areas.ProductManage.Controllers
if (pare.state) if (pare.state)
{ {
var model = CommonBaseLib.GetJsonToObject<BatchProductInfo>(pare.data.data); var model = CommonBaseLib.GetJsonToObject<BatchProductInfo>(pare.data.data);
model.pd_category_bailun_id = model.s_category_bailun_id > 0 ? model.s_category_bailun_id : model.pd_category_bailun_id;
result = ProductServices.BatchProductInfo(model); result = ProductServices.BatchProductInfo(model);
} }
else else
......
WebApi/Properties/PublishProfiles/ApiCenter.pubxml
...@@ -9,13 +9,13 @@ ...@@ -9,13 +9,13 @@
<LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration> <LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
<LastUsedPlatform>Any CPU</LastUsedPlatform> <LastUsedPlatform>Any CPU</LastUsedPlatform>
<SiteUrlToLaunchAfterPublish /> <SiteUrlToLaunchAfterPublish />
<LaunchSiteAfterPublish>True</LaunchSiteAfterPublish> <LaunchSiteAfterPublish>true</LaunchSiteAfterPublish>
<ExcludeApp_Data>False</ExcludeApp_Data> <ExcludeApp_Data>false</ExcludeApp_Data>
<publishUrl>F:\IIS Project\ApiCenter</publishUrl> <publishUrl>D:\pamsApi</publishUrl>
<DeleteExistingFiles>True</DeleteExistingFiles> <DeleteExistingFiles>true</DeleteExistingFiles>
<PrecompileBeforePublish>True</PrecompileBeforePublish> <PrecompileBeforePublish>true</PrecompileBeforePublish>
<EnableUpdateable>True</EnableUpdateable> <EnableUpdateable>true</EnableUpdateable>
<DebugSymbols>False</DebugSymbols> <DebugSymbols>false</DebugSymbols>
<WDPMergeOption>DonotMerge</WDPMergeOption> <WDPMergeOption>DonotMerge</WDPMergeOption>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
......
WebApi/WebApi.csproj
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder> <AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>WebApi</RootNamespace> <RootNamespace>WebApi</RootNamespace>
<AssemblyName>WebApi</AssemblyName> <AssemblyName>WebApi</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion> <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<MvcBuildViews>false</MvcBuildViews> <MvcBuildViews>false</MvcBuildViews>
<UseIISExpress>true</UseIISExpress> <UseIISExpress>true</UseIISExpress>
<IISExpressSSLPort /> <IISExpressSSLPort />
...@@ -93,17 +93,14 @@ ...@@ -93,17 +93,14 @@
</Reference> </Reference>
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.Data" /> <Reference Include="System.Data" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="System.Drawing" /> <Reference Include="System.Drawing" />
<Reference Include="System.Web.DynamicData" /> <Reference Include="System.Web.DynamicData" />
<Reference Include="System.Web.Entity" /> <Reference Include="System.Web.Entity" />
<Reference Include="System.Web.ApplicationServices" /> <Reference Include="System.Web.ApplicationServices" />
<Reference Include="System.ComponentModel.DataAnnotations" /> <Reference Include="System.ComponentModel.DataAnnotations" />
<Reference Include="System.Web.Extensions" />
<Reference Include="System.Web" /> <Reference Include="System.Web" />
<Reference Include="System.Web.Abstractions" /> <Reference Include="System.Web.Abstractions" />
<Reference Include="System.Web.Routing" /> <Reference Include="System.Web.Routing" />
<Reference Include="System.Xml" />
<Reference Include="System.Configuration" /> <Reference Include="System.Configuration" />
<Reference Include="System.Runtime.Serialization" /> <Reference Include="System.Runtime.Serialization" />
<Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"> <Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
...@@ -150,6 +147,7 @@ ...@@ -150,6 +147,7 @@
<Private>True</Private> <Private>True</Private>
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll</HintPath> <HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
</Reference> </Reference>
<Reference Include="System.Xml" />
<Reference Include="System.Xml.Linq" /> <Reference Include="System.Xml.Linq" />
<Reference Include="WebGrease"> <Reference Include="WebGrease">
<Private>True</Private> <Private>True</Private>
......
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