From a04a1d45c9390547ab9cce332c9aa663dbe715f3 Mon Sep 17 00:00:00 2001 From: yusijie <ysj@hz-kingdee.com> Date: 星期二, 07 五月 2024 15:50:38 +0800 Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API --- WebAPI/WebAPI.csproj | 21 +++++++++++++-------- 1 files changed, 13 insertions(+), 8 deletions(-) diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj index 24962fd..2fa77fe 100644 --- a/WebAPI/WebAPI.csproj +++ b/WebAPI/WebAPI.csproj @@ -14,11 +14,11 @@ <RootNamespace>WebAPI</RootNamespace> <AssemblyName>WebAPI</AssemblyName> <TargetFrameworkVersion>v4.5</TargetFrameworkVersion> - <UseIISExpress>false</UseIISExpress> + <UseIISExpress>true</UseIISExpress> <IISExpressSSLPort /> - <IISExpressAnonymousAuthentication /> - <IISExpressWindowsAuthentication /> - <IISExpressUseClassicPipelineMode /> + <IISExpressAnonymousAuthentication>enabled</IISExpressAnonymousAuthentication> + <IISExpressWindowsAuthentication>disabled</IISExpressWindowsAuthentication> + <IISExpressUseClassicPipelineMode>false</IISExpressUseClassicPipelineMode> <TargetFrameworkProfile /> <Use64BitIISExpress /> <UseGlobalApplicationHostFile /> @@ -332,6 +332,7 @@ <Compile Include="App_Start\WebApiConfig.cs" /> <Compile Include="Controllers\BaseSet\Gy_BarCodeBillController.cs" /> <Compile Include="Controllers\BaseSet\Gy_ConkTypeController.cs" /> + <Compile Include="Controllers\BaseSet\Gy_ColorClassController.cs" /> <Compile Include="Controllers\BaseSet\Gy_ICBomBillController.cs" /> <Compile Include="Controllers\BaseSet\Gy_WorkDayController.cs" /> <Compile Include="Controllers\BaseSet\Gy_PackTypeController.cs" /> @@ -523,6 +524,8 @@ <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_CardTypeController.cs" /> <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_COMMONCONTACTBillController.cs" /> <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_CustLocationController.cs" /> + <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_DotCheckItemMethodController.cs" /> + <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_DotCheckItemClassController.cs" /> <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_DutyBillController.cs" /> <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_EquipStatusController.cs" /> <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_MatePriceSupController.cs" /> @@ -556,6 +559,7 @@ <Compile Include="Controllers\鍩虹璧勬枡\宸ヨ祫鍩虹璧勬枡\Gy_WorkPayTypeController.cs" /> <Compile Include="Controllers\鍩虹璧勬枡\宸ヨ祫鍩虹璧勬枡\Gy_ClassTimePrjGroupController.cs" /> <Compile Include="Controllers\鍩虹璧勬枡\鐢熶骇鍩虹璧勬枡\Gy_ShiftsController.cs" /> + <Compile Include="Controllers\澶忓疂鍞悗鎺ュ彛\ASSController.cs" /> <Compile Include="Controllers\宸ヨ祫绠$悊\HR_EmployeeSkillBillController.cs" /> <Compile Include="Controllers\宸ヨ祫绠$悊\Pay_OutApplyBillController.cs" /> <Compile Include="Controllers\宸ヨ祫绠$悊\Pay_OverApplyBillController.cs" /> @@ -719,6 +723,7 @@ <Compile Include="Models\ClsGy_SupMaterial.cs" /> <Compile Include="Models\ClsSc_AssemblyBillMain.cs" /> <Compile Include="Models\ClsSc_AssemblyBillSub.cs" /> + <Compile Include="Models\鍩虹璧勬枡\Gy_ColorClass.cs" /> <Compile Include="Models\Employee.cs" /> <Compile Include="Models\Gy_UserCustomer.cs" /> <Compile Include="Models\Gy_UserMater.cs" /> @@ -1154,10 +1159,10 @@ </ProjectReference> </ItemGroup> <ItemGroup> - <WebReferenceUrl Include="http://192.168.63.53/WEBS-WMS/WebService1.asmx"> + <WebReferenceUrl Include="http://192.168.0.81/WEBS-WMS/WebService1.asmx"> <UrlBehavior>Dynamic</UrlBehavior> <RelPath>Web References\WebS\</RelPath> - <UpdateFromURL>http://192.168.63.53/WEBS-WMS/WebService1.asmx</UpdateFromURL> + <UpdateFromURL>http://192.168.0.81/WEBS-WMS/WebService1.asmx</UpdateFromURL> <ServiceLocationURL> </ServiceLocationURL> <CachedDynamicPropName> @@ -1188,11 +1193,11 @@ <VisualStudio> <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}"> <WebProjectProperties> - <UseIIS>False</UseIIS> + <UseIIS>True</UseIIS> <AutoAssignPort>True</AutoAssignPort> <DevelopmentServerPort>12761</DevelopmentServerPort> <DevelopmentServerVPath>/</DevelopmentServerVPath> - <IISUrl>http://localhost/WebAPI</IISUrl> + <IISUrl>http://localhost:12761</IISUrl> <NTLMAuthentication>False</NTLMAuthentication> <UseCustomServer>False</UseCustomServer> <CustomServerUrl> -- Gitblit v1.9.1