DEmon/WebWIPAPI/Controllers/MesIntegrController.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
DEmon/WebWIPAPI/Models/ApiResponse.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
DEmon/WebWIPAPI/Web.config | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
DEmon/WebWIPAPI/WebWIPAPI.csproj | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
DEmon/dll/EntityFramework.SqlServer.dll | 补丁 | 查看 | 原始文档 | blame | 历史 | |
DEmon/dll/EntityFramework.dll | 补丁 | 查看 | 原始文档 | blame | 历史 | |
DEmon/iWareDataCore/BASE/Entity/MaterialViewEntity.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
DEmon/iWareDataCore/ORM/BASEInputMaterial.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
DEmon/WebWIPAPI/Controllers/MesIntegrController.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,51 @@ using iWareDataCore.BASE.Entity; using iWareDataCore.BASE.Service; using Newtonsoft.Json; using System.Collections.Generic; using System.Web.Mvc; using WebWIPAPI.Models; using WebWIPAPI.Properties; using WebWIPAPI.Utils; namespace WebWIPAPI.Controllers { /// <summary> /// MESå¯¹æ¥æ¥å£ /// </summary> public class MesIntegrController : Controller { /// <summary> /// 忥ç«åºçç©æä¿¡æ¯ /// WCS>>WIP:æ¯å¤©å®æ¶WCSæ¨éç«åºéçç©æä¿¡æ¯ /// </summary> /// <param name="sysCode"></param> /// <param name="wareHouseInfo"></param> /// <param name="processCardNumber"></param> /// <param name="wareHouseId"></param> /// <param name="timestamp"></param> /// <returns></returns> [HttpPost] public ActionResult syncMaterialInfo() { var msg = ""; var datalist = PlaceMaterialViewService.GetInstance().GetPlacePreview(out msg); var responseMessage = new ApiResponse<List<PlaceMaterialViewEntity>>() { Code = 200, Success = true, Message = "æå", Data = datalist, }; //å°å¯¹è±¡è½¬å为jsonæ ¼å¼ var responseStr = JsonConvert.SerializeObject(responseMessage); LogTextHelper.WriteLine(Resources.LogDir, "WIPAPI:{0},{1}, {2}", "syncMaterialInfo", "请æ±åæ°ï¼" + "", "ååºä¿¡æ¯;" + responseStr); return Json(responseMessage, JsonRequestBehavior.DenyGet); } } } DEmon/WebWIPAPI/Models/ApiResponse.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,35 @@ using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; namespace WebWIPAPI.Models { /// <summary> /// éç¨æ³åæ¥å£ååºæ¨¡å /// </summary> /// <typeparam name="T">Data åæ®µçç±»åï¼å¯ä»¥æ¯ä»»æç±»åï¼å¦ stringãintãèªå®ä¹ç±»ç</typeparam> public class ApiResponse<T> { /// <summary> /// ç¶æç ï¼ä¾å¦ 200 表示æå /// </summary> public int Code { get; set; } /// <summary> /// æ¯å¦æåï¼true 表示æåï¼false 表示失败 /// </summary> public bool Success { get; set; } /// <summary> /// è¿åæ¶æ¯ï¼ä¾å¦ï¼"æå" æéè¯¯ä¿¡æ¯ /// </summary> public string Message { get; set; } /// <summary> /// è¿åçæ°æ®å 容ï¼ç±»å为æ³å T /// </summary> public T Data { get; set; } } } DEmon/WebWIPAPI/Web.config
@@ -2,6 +2,9 @@ <configuration> <configSections> <section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" /> </configSections> <appSettings> <add key="webpages:Version" value="2.0.0.0" /> <add key="webpages:Enabled" value="false" /> @@ -32,4 +35,9 @@ <system.webServer> <validation validateIntegratedModeConfiguration="false" /> </system.webServer> <connectionStrings> <add name="DbModelExcel" connectionString="data source=.;initial catalog=WGQ_WB19011_EXCEL;persist security info=True;user id=sa;password=123abc.com;MultipleActiveResultSets=True;App=EntityFramework" providerName="System.Data.SqlClient" /> <add name="DbModelLog" connectionString="data source=.;initial catalog=WGQ_WB19011_LOG;user id=sa;password=123abc.com;MultipleActiveResultSets=True;App=EntityFramework" providerName="System.Data.SqlClient" /> <add name="DbModelCore" connectionString="data source=.;initial catalog=WGQ_WB19011_CORE;user id=sa;password=123abc.com;MultipleActiveResultSets=True;App=EntityFramework" providerName="System.Data.SqlClient" /> </connectionStrings> </configuration> DEmon/WebWIPAPI/WebWIPAPI.csproj
@@ -20,6 +20,8 @@ <IISExpressAnonymousAuthentication /> <IISExpressWindowsAuthentication /> <IISExpressUseClassicPipelineMode /> <Use64BitIISExpress /> <UseGlobalApplicationHostFile /> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <DebugSymbols>true</DebugSymbols> @@ -39,6 +41,13 @@ <WarningLevel>4</WarningLevel> </PropertyGroup> <ItemGroup> <Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL"> <SpecificVersion>False</SpecificVersion> <HintPath>..\dll\EntityFramework.dll</HintPath> </Reference> <Reference Include="EntityFramework.SqlServer"> <HintPath>..\dll\EntityFramework.SqlServer.dll</HintPath> </Reference> <Reference Include="Microsoft.CSharp" /> <Reference Include="System" /> <Reference Include="System.Data" /> @@ -106,10 +115,12 @@ <ItemGroup> <Compile Include="Controllers\HomeController.cs" /> <Compile Include="Controllers\TaskExecController.cs" /> <Compile Include="Controllers\MesIntegrController.cs" /> <Compile Include="Controllers\WcsIntegrController.cs" /> <Compile Include="Global.asax.cs"> <DependentUpon>Global.asax</DependentUpon> </Compile> <Compile Include="Models\ApiResponse.cs" /> <Compile Include="Properties\AssemblyInfo.cs" /> <Compile Include="Properties\Resources.Designer.cs"> <AutoGen>True</AutoGen> @@ -134,7 +145,6 @@ </ItemGroup> <ItemGroup> <Folder Include="App_Data\" /> <Folder Include="Models\" /> </ItemGroup> <ItemGroup> <Content Include="Views\Home\Index.cshtml" /> @@ -144,6 +154,16 @@ <Generator>ResXFileCodeGenerator</Generator> <LastGenOutput>Resources.Designer.cs</LastGenOutput> </EmbeddedResource> </ItemGroup> <ItemGroup> <ProjectReference Include="..\iWareCommon\iWareCommon.csproj"> <Project>{a9859d3c-ea37-497c-ba93-43cec47f5798}</Project> <Name>iWareCommon</Name> </ProjectReference> <ProjectReference Include="..\iWareDataCore\iWareDataCore.csproj"> <Project>{714d8b00-61ad-4cee-b062-add15f4962b7}</Project> <Name>iWareDataCore</Name> </ProjectReference> </ItemGroup> <PropertyGroup> <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion> @@ -159,13 +179,11 @@ <VisualStudio> <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}"> <WebProjectProperties> <UseIIS>False</UseIIS> <UseIIS>True</UseIIS> <AutoAssignPort>False</AutoAssignPort> <DevelopmentServerPort>47533</DevelopmentServerPort> <DevelopmentServerVPath>/</DevelopmentServerVPath> <IISUrl>http://127.0.0.1:8085/wip</IISUrl> <OverrideIISAppRootUrl>True</OverrideIISAppRootUrl> <IISAppRootUrl>http://127.0.0.1:8085/wip</IISAppRootUrl> <IISUrl>http://localhost:47533/</IISUrl> <NTLMAuthentication>False</NTLMAuthentication> <UseCustomServer>False</UseCustomServer> <CustomServerUrl> DEmon/dll/EntityFramework.SqlServer.dllBinary files differ
DEmon/dll/EntityFramework.dllBinary files differ
DEmon/iWareDataCore/BASE/Entity/MaterialViewEntity.cs
@@ -71,7 +71,7 @@ public string ClassificationSociety { get; set; } /// <summary> /// 12è§æ ¼åå· /// 12åæ®µå· /// </summary> public string SerialNo { get; set; } DEmon/iWareDataCore/ORM/BASEInputMaterial.cs
@@ -6,6 +6,9 @@ using System.ComponentModel.DataAnnotations.Schema; using System.Data.Entity.Spatial; /// <summary> /// åºå ¥åºåç©æå¯¼å ¥è¡¨ /// </summary> [Table("BASEInputMaterial")] public partial class BASEInputMaterial {