Amkor/Groupware
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

임현대수석님 건의사항 적용.

Browse Source
This commit is contained in:
chi
2021-05-31 13:37:27 +09:00
parent ba02049737
commit 6590694e8b
15 changed files with 463 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

87
SubProject/WebServer/App.config
View File

@@ -3,6 +3,9 @@
<configSections>
<!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
<section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
<sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
<section name="WebServer.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
</sectionGroup>
</configSections>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7" />
@@ -32,4 +35,88 @@
<provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer" />
</providers>
</entityFramework>
<userSettings>
<WebServer.Properties.Settings>
<setting name="json" serializeAs="String">
<value>{
"basicGoods": [
{
"id": "1234561",
"name": "Mineral Water 550ml",
"barcode": "12421432143214321",
"price": "2.00",
"num": "1",
"amount": "2.00"
},
{
"id": "1234562",
"name": "Herbal tea 300ml",
"barcode": "12421432143214322",
"price": "3.00",
"num": "2",
"amount": "6.00"
},
{
"id": "1234563",
"name": "Delicious potato chips",
"barcode": "12421432143214323",
"price": "7.00",
"num": "4",
"amount": "28.00"
},
{
"id": "1234564",
"name": "Specially delicious egg rolls",
"barcode": "12421432143214324",
"price": "8.50",
"num": "3",
"amount": "25.50"
}
],
"basicProgress": [
{
"key": "1",
"time": "2017-10-01 14:10",
"rate": "Contact Clients",
"status": "Processing",
"operator": "Pickup Assistant ID1234",
"cost": "5mins"
},
{
"key": "2",
"time": "2017-10-01 14:05",
"rate": "Pickup Guy Departs",
"status": "Success",
"operator": "Pickup Assistant ID1234",
"cost": "1h"
},
{
"key": "3",
"time": "2017-10-01 13:05",
"rate": "Pick-up person takes orders",
"status": "Success",
"operator": "Pickup Assistant ID1234",
"cost": "5mins"
},
{
"key": "4",
"time": "2017-10-01 13:00",
"rate": "Apply For Approval",
"status": "Success",
"operator": "system",
"cost": "1h"
},
{
"key": "5",
"time": "2017-10-01 12:00",
"rate": "Initiated a Return Request",
"status": "Success",
"operator": "user",
"cost": "5mins"
}
]
}</value>
</setting>
</WebServer.Properties.Settings>
</userSettings>
</configuration>

34
SubProject/WebServer/Controller/CommonController.cs Normal file
View File

@@ -0,0 +1,34 @@
using Newtonsoft.Json.Linq;
using System;
using System.Linq;
using System.Net.Http;
using System.Web.Http;
namespace WebServer
{
public class CommonController : BaseController
{
[HttpGet]
public HttpResponseMessage List()
{
var db = new EEEntities();
var liast = db.Common.Where(t => t.gcode == "EET1P").OrderBy(t => t.code).ToArray();
//System.Web.Http.Results.JsonResult<string>
var json = JObject.FromObject(liast);
return new HttpResponseMessage()
{
Content = new StringContent(
json.ToString(),
System.Text.Encoding.UTF8,
"application/json")
};
}
}
}

2
SubProject/WebServer/Controller/HomeController.cs
View File

@@ -26,7 +26,7 @@ namespace WebServer
[HttpGet]
public string Test()
{
return "test";
return Properties.Settings.Default.json;
}
[HttpGet]

59
SubProject/WebServer/Properties/Settings.Designer.cs generated Normal file
View File

@@ -0,0 +1,59 @@
//------------------------------------------------------------------------------
// <auto-generated>
// 이 코드는 도구를 사용하여 생성되었습니다.
// 런타임 버전:4.0.30319.42000
//
// 파일 내용을 변경하면 잘못된 동작이 발생할 수 있으며, 코드를 다시 생성하면
// 이러한 변경 내용이 손실됩니다.
// </auto-generated>
//------------------------------------------------------------------------------
namespace WebServer.Properties {
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.8.1.0")]
internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
public static Settings Default {
get {
return defaultInstance;
}
}
[global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("{\n \"basicGoods\": [\n {\n \"id\": \"1234561\",\n \"name\": \"Mineral Water 550" +
"ml\",\n \"barcode\": \"12421432143214321\",\n \"price\": \"2.00\",\n \"num\": \"" +
"1\",\n \"amount\": \"2.00\"\n },\n {\n \"id\": \"1234562\",\n \"name\": \"He" +
"rbal tea 300ml\",\n \"barcode\": \"12421432143214322\",\n \"price\": \"3.00\",\n " +
" \"num\": \"2\",\n \"amount\": \"6.00\"\n },\n {\n \"id\": \"1234563\",\n " +
" \"name\": \"Delicious potato chips\",\n \"barcode\": \"12421432143214323\",\n \"" +
"price\": \"7.00\",\n \"num\": \"4\",\n \"amount\": \"28.00\"\n },\n {\n \"id" +
"\": \"1234564\",\n \"name\": \"Specially delicious egg rolls\",\n \"barcode\": \"1" +
"2421432143214324\",\n \"price\": \"8.50\",\n \"num\": \"3\",\n \"amount\": \"25." +
"50\"\n }\n ],\n \"basicProgress\": [\n {\n \"key\": \"1\",\n \"time\": \"2017-" +
"10-01 14:10\",\n \"rate\": \"Contact Clients\",\n \"status\": \"Processing\",\n " +
" \"operator\": \"Pickup Assistant ID1234\",\n \"cost\": \"5mins\"\n },\n {\n " +
" \"key\": \"2\",\n \"time\": \"2017-10-01 14:05\",\n \"rate\": \"Pickup Guy Depar" +
"ts\",\n \"status\": \"Success\",\n \"operator\": \"Pickup Assistant ID1234\",\n " +
" \"cost\": \"1h\"\n },\n {\n \"key\": \"3\",\n \"time\": \"2017-10-01 13:05\"," +
"\n \"rate\": \"Pick-up person takes orders\",\n \"status\": \"Success\",\n \"" +
"operator\": \"Pickup Assistant ID1234\",\n \"cost\": \"5mins\"\n },\n {\n \"" +
"key\": \"4\",\n \"time\": \"2017-10-01 13:00\",\n \"rate\": \"Apply For Approval\"," +
"\n \"status\": \"Success\",\n \"operator\": \"system\",\n \"cost\": \"1h\"\n }" +
",\n {\n \"key\": \"5\",\n \"time\": \"2017-10-01 12:00\",\n \"rate\": \"Initi" +
"ated a Return Request\",\n \"status\": \"Success\",\n \"operator\": \"user\",\n " +
" \"cost\": \"5mins\"\n }\n ]\n}")]
public string json {
get {
return ((string)(this["json"]));
}
set {
this["json"] = value;
}
}
}
}

86
SubProject/WebServer/Properties/Settings.settings Normal file
View File

@@ -0,0 +1,86 @@
<?xml version='1.0' encoding='utf-8'?>
<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)" GeneratedClassNamespace="WebServer.Properties" GeneratedClassName="Settings">
<Profiles />
<Settings>
<Setting Name="json" Type="System.String" Scope="User">
<Value Profile="(Default)">{
"basicGoods": [
{
"id": "1234561",
"name": "Mineral Water 550ml",
"barcode": "12421432143214321",
"price": "2.00",
"num": "1",
"amount": "2.00"
},
{
"id": "1234562",
"name": "Herbal tea 300ml",
"barcode": "12421432143214322",
"price": "3.00",
"num": "2",
"amount": "6.00"
},
{
"id": "1234563",
"name": "Delicious potato chips",
"barcode": "12421432143214323",
"price": "7.00",
"num": "4",
"amount": "28.00"
},
{
"id": "1234564",
"name": "Specially delicious egg rolls",
"barcode": "12421432143214324",
"price": "8.50",
"num": "3",
"amount": "25.50"
}
],
"basicProgress": [
{
"key": "1",
"time": "2017-10-01 14:10",
"rate": "Contact Clients",
"status": "Processing",
"operator": "Pickup Assistant ID1234",
"cost": "5mins"
},
{
"key": "2",
"time": "2017-10-01 14:05",
"rate": "Pickup Guy Departs",
"status": "Success",
"operator": "Pickup Assistant ID1234",
"cost": "1h"
},
{
"key": "3",
"time": "2017-10-01 13:05",
"rate": "Pick-up person takes orders",
"status": "Success",
"operator": "Pickup Assistant ID1234",
"cost": "5mins"
},
{
"key": "4",
"time": "2017-10-01 13:00",
"rate": "Apply For Approval",
"status": "Success",
"operator": "system",
"cost": "1h"
},
{
"key": "5",
"time": "2017-10-01 12:00",
"rate": "Initiated a Return Request",
"status": "Success",
"operator": "user",
"cost": "5mins"
}
]
}</Value>
</Setting>
</Settings>
</SettingsFile>

10
SubProject/WebServer/WebServer.csproj
View File

@@ -132,6 +132,7 @@
<DependentUpon>Model1.tt</DependentUpon>
</Compile>
<Compile Include="Controller\CustomerController.cs" />
<Compile Include="Controller\CommonController.cs" />
<Compile Include="Controller\HomeController.cs" />
<Compile Include="Controller\ItemController.cs" />
<Compile Include="Controller\JobreportController.cs" />
@@ -200,6 +201,11 @@
<DependentUpon>Model1.tt</DependentUpon>
</Compile>
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Properties\Settings.Designer.cs">
<AutoGen>True</AutoGen>
<DesignTimeSharedInput>True</DesignTimeSharedInput>
<DependentUpon>Settings.settings</DependentUpon>
</Compile>
<Compile Include="Purchase.cs">
<DependentUpon>Model1.tt</DependentUpon>
</Compile>
@@ -232,6 +238,10 @@
<DependentUpon>Model1.edmx</DependentUpon>
</None>
<None Include="packages.config" />
<None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
</None>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\FCOMMON\FCOMMON.csproj">