From 45b33e77b6f90e0a18fc88bbb0826ecf1e7b9b51 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期三, 19 六月 2024 15:25:16 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/WebAPI.csproj | 41 +++++++++++++++++++++++++++++++++--------
1 files changed, 33 insertions(+), 8 deletions(-)
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index 5d0f245..6ec29e6 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" />
@@ -378,6 +379,7 @@
<Compile Include="Controllers\BLL\Xt_UserController.cs" />
<Compile Include="Controllers\BLL\Xt_SystemLogController.cs" />
<Compile Include="Controllers\CellWidthController.cs" />
+ <Compile Include="Controllers\CGGL\Cg_ContractBillController.cs" />
<Compile Include="Controllers\CGGL\Cg_PORequestBillController.cs" />
<Compile Include="Controllers\CGGL\Cg_PurchaseReturnController.cs" />
<Compile Include="Controllers\CGGL\Kf_POStockInBackBillController.cs" />
@@ -395,6 +397,9 @@
<Compile Include="Controllers\CJGL\Cj_NoPassProcController.cs" />
<Compile Include="Controllers\CJGL\Cj_SendGoodsBillController.cs" />
<Compile Include="Controllers\CJGL\Mes_OrderProcFlowAllReportController.cs" />
+ <Compile Include="Controllers\CJGL\Gy_MaterPreventErrMouldBillController.cs" />
+ <Compile Include="Controllers\CJGL\Qc_PreventErrMouldCheckBillController.cs" />
+ <Compile Include="Controllers\CJGL\Sc_WorkBeginDotCheckBillController.cs" />
<Compile Include="Controllers\CJGL\ProductionPlanReportController.cs" />
<Compile Include="Controllers\CJGL\Sc_ProcessExchangeBillController.cs" />
<Compile Include="Controllers\CJGL\Cj_StationOutBillController.cs" />
@@ -417,8 +422,12 @@
<Compile Include="Controllers\MJGL\Sc_MouldStatusChangeBillController.cs" />
<Compile Include="Controllers\MJGL\Sc_MouldUpperBillController.cs" />
<Compile Include="Controllers\Pay_ReportController.cs" />
+ <Compile Include="Controllers\PlateBindingController.cs" />
<Compile Include="Controllers\SBGL\Gy_FixCardChangeBillController.cs" />
<Compile Include="Controllers\SBGL\Gy_FixCardBillController.cs" />
+ <Compile Include="Controllers\SBGL\SB_EquipICMOTechParamBillController.cs" />
+ <Compile Include="Controllers\SBGL\Sb_EquipBeginBillController.cs" />
+ <Compile Include="Controllers\SBGL\Sb_EquipStopBillController.cs" />
<Compile Include="Controllers\SBGL\Sb_EquipConkBookBillController.cs" />
<Compile Include="Controllers\SBGL\Sb_EquipSparepartsBillController.cs" />
<Compile Include="Controllers\SBGL\Sb_EquipSparepartsChangeBillController.cs" />
@@ -478,6 +487,7 @@
<Compile Include="Controllers\XSGL\Xs_SellOutChangeBillController.cs" />
<Compile Include="Controllers\XSGL\Xs_CusBalanceReportController.cs" />
<Compile Include="Controllers\XSGL\Xs_ReceivableBillController.cs" />
+ <Compile Include="Controllers\XSGL\Xs_ContractBillController.cs" />
<Compile Include="Controllers\XSGL\YS_ContactBalController.cs" />
<Compile Include="Controllers\XSGL\Xs_SeOrderChangeBillController.cs" />
<Compile Include="Controllers\XSGL\Xs_ExceptiveCheckRequestBillController.cs" />
@@ -514,14 +524,19 @@
<Compile Include="Controllers\鍝佽川绠＄悊\浜х嚎杩斾慨骞冲彴\Sc_SourceLineRepairBillController.cs" />
<Compile Include="Controllers\鍝佽川绠＄悊\瀹㈣瘔澶勭悊鍗昞Crm_CustomerAppealBillController.cs" />
<Compile Include="Controllers\鍝佽川绠＄悊\宸℃鍗昞QC_PatrolProcCheckBillController.cs" />
+ <Compile Include="Controllers\鍝佽川绠＄悊\宸℃鍗昞QC_PatrolProcCheckOtherBillController.cs" />
<Compile Include="Controllers\鍝佽川绠＄悊\宸ュ簭妫�楠屽崟\MES_ProcessCheckBill_PDAController.cs" />
+ <Compile Include="Controllers\鍝佽川绠＄悊\搴撳瓨妫�楠屽崟\QC_StockCheckBillController.cs" />
<Compile Include="Controllers\鍝佽川绠＄悊\璐ㄩ噺鎶ヨ〃\QC_QualityReportsController.cs" />
+ <Compile Include="Controllers\鍝佽川绠＄悊\杞﹂棿鑷鍗昞QC_WorkSelfCheckBillController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_CardChangeTypeController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_CardStatusController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_CardAddressController.cs" />
<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" />
@@ -554,6 +569,8 @@
<Compile Include="Controllers\鍩虹璧勬枡\宸ヨ祫鍩虹璧勬枡\Gy_WorkTypeController.cs" />
<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" />
@@ -625,6 +642,7 @@
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_RepairCheckBillController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\宸ヨ祫鍩虹璧勬枡\Gy_ProcPriceController.cs" />
<Compile Include="Controllers\搴旀敹绠＄悊\YS_ReceiveReportController.cs" />
+ <Compile Include="Controllers\鏉＄爜绠＄悊\MouldController.cs" />
<Compile Include="Controllers\鏉＄爜绠＄悊\WEBSController.cs" />
<Compile Include="Controllers\鐢熶骇绠＄悊\鎶ュ伐鍙板伐搴廫Sc_MaterToSourceStepBillController.cs" />
<Compile Include="Controllers\鐢熶骇绠＄悊\鎶ュ伐鍙板伐搴廫Sc_MESBeginStepWorkBillController.cs" />
@@ -648,10 +666,15 @@
<Compile Include="DLL\ClsGy_BadPhenomena_Ctl.cs" />
<Compile Include="DLL\ClsGy_InspectInstruMent_Ctl.cs" />
<Compile Include="DLL\ClsGy_InspectBasis_Ctl.cs" />
+ <Compile Include="DLL\ClsGy_CheckNoteItem_Ctl.cs" />
<Compile Include="DLL\ClsGy_PoStockStyle_Ctl.cs" />
<Compile Include="DLL\ClsGy_AreaSet_Ctl.cs" />
<Compile Include="DLL\ClsGy_CusType_Ctl.cs" />
<Compile Include="DLL\ClsGy_ErrMsgBackType_Ctl.cs" />
+ <Compile Include="DLL\ClsGy_MaintainLev_Ctl.cs" />
+ <Compile Include="DLL\ClsGy_PreventErrMould_Ctl.cs" />
+ <Compile Include="DLL\ClsGy_TaskClass_Ctl.cs" />
+ <Compile Include="DLL\ClsGy_ProjectClass_Ctl.cs" />
<Compile Include="DLL\ClsGy_StockCheckItem_Ctl.cs" />
<Compile Include="DLL\ClsGy_ProjectMoney_Ctl.cs" />
<Compile Include="DLL\ClsGy_SupType_Ctl.cs" />
@@ -715,6 +738,8 @@
<Compile Include="Models\ClsGy_SupMaterial.cs" />
<Compile Include="Models\ClsSc_AssemblyBillMain.cs" />
<Compile Include="Models\ClsSc_AssemblyBillSub.cs" />
+ <Compile Include="Models\Gy_MouldFileSub_SubMater.cs" />
+ <Compile Include="Models\鍩虹璧勬枡\Gy_ColorClass.cs" />
<Compile Include="Models\Employee.cs" />
<Compile Include="Models\Gy_UserCustomer.cs" />
<Compile Include="Models\Gy_UserMater.cs" />
@@ -1150,10 +1175,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>
@@ -1184,11 +1209,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