From 066d3178d59090b80f7312d5cc59b97f346e02ff Mon Sep 17 00:00:00 2001 From: yangle <admin@YINMOU> Date: 星期一, 18 九月 2023 08:39:36 +0800 Subject: [PATCH] 1 --- WebAPI/WebAPI.csproj | 76 ++++++++++++++++++++++++-------------- 1 files changed, 48 insertions(+), 28 deletions(-) diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj index e52d40e..873af06 100644 --- a/WebAPI/WebAPI.csproj +++ b/WebAPI/WebAPI.csproj @@ -223,8 +223,6 @@ </Reference> </ItemGroup> <ItemGroup> - <Content Include="bin\WebAPI.dll" /> - <Content Include="bin\WebAPI.pdb" /> <Content Include="Content\bootstrap.css" /> <Content Include="Content\bootstrap.min.css" /> <Content Include="Content\Site.css" /> @@ -243,6 +241,7 @@ <Content Include="Views\Scripts\bootstrap.js" /> <Content Include="Views\Scripts\bootstrap.min.js" /> <Content Include="Config\kdapi.config" /> + <Content Include="libman.json" /> <None Include="Properties\Settings.settings"> <Generator>SettingsSingleFileGenerator</Generator> <LastGenOutput>Settings.Designer.cs</LastGenOutput> @@ -256,11 +255,6 @@ <Content Include="Views\Scripts\jquery.validate.unobtrusive.js" /> <Content Include="Views\Scripts\jquery.validate.unobtrusive.min.js" /> <Content Include="Views\Scripts\modernizr-2.6.2.js" /> - <Content Include="Web References\WebS2\Reference.map"> - <Generator>MSDiscoCodeGenerator</Generator> - <LastGenOutput>Reference.cs</LastGenOutput> - </Content> - <None Include="Web References\WebS2\WebService1.disco" /> <Content Include="Web References\WebS\ClsCLD_Customer_Model.datasource"> <DependentUpon>Reference.map</DependentUpon> </Content> @@ -280,6 +274,9 @@ <DependentUpon>Reference.map</DependentUpon> </Content> <Content Include="Web References\WebS\ClsGy_BadReason_Model.datasource"> + <DependentUpon>Reference.map</DependentUpon> + </Content> + <Content Include="Web References\WebS\ClsGy_BarCodeBill_WMS_Model.datasource"> <DependentUpon>Reference.map</DependentUpon> </Content> <Content Include="Web References\WebS\ClsGy_BarCodeBill_WMS_Model_View.datasource"> @@ -318,11 +315,10 @@ <Content Include="Web References\WebS\ClsKf_ICStockBill_WMS.datasource"> <DependentUpon>Reference.map</DependentUpon> </Content> - <None Include="Web References\WebS\Reference.map"> + <Content Include="Web References\WebS\Reference.map"> <Generator>MSDiscoCodeGenerator</Generator> <LastGenOutput>Reference.cs</LastGenOutput> - </None> - <None Include="Web References\WebS2\WebService1.wsdl" /> + </Content> <None Include="Web References\WebS\WebService1.disco" /> <Content Include="Web.config"> <SubType>Designer</SubType> @@ -388,6 +384,8 @@ <Compile Include="Controllers\CGGL\Kf_POStockInBackBillController.cs" /> <Compile Include="Controllers\CGGL\Kf_POStockInBillController.cs" /> <Compile Include="Controllers\CGGL\Cg_POOrderBillController.cs" /> + <Compile Include="Controllers\CGGL\Sup_AskPriceBillController.cs" /> + <Compile Include="Controllers\CGGL\Sup_QuotePriceBillController.cs" /> <Compile Include="Controllers\CGGL\WW_EntrustOrderBillController.cs" /> <Compile Include="Controllers\CGGL\Cg_POInStockBillController.cs" /> <Compile Include="Controllers\CGGL\Cg_POInStockBackBillController.cs" /> @@ -403,7 +401,10 @@ <Compile Include="Controllers\CJGL\Cj_StationInBillController.cs" /> <Compile Include="Controllers\CJGL\Cj_StationEntrustOutBillController.cs" /> <Compile Include="Controllers\CJGL\Sc_ProcExchRecordBackBillController.cs" /> + <Compile Include="Controllers\CJGL\Sc_ProcessSendWorkController.cs" /> + <Compile Include="Controllers\CJGL\Sc_ProcExchSendWorkBillController.cs" /> <Compile Include="Controllers\CJGL\Sc_ProcExchWorkBackBillController.cs" /> + <Compile Include="Controllers\CJGL\Sc_ProcExchWWSendWorkBillController.cs" /> <Compile Include="Controllers\CJGL\Sc_WorkBillAutoSortBillMainController.cs" /> <Compile Include="Controllers\Gy_MateMouldController.cs" /> <Compile Include="Controllers\Gy_StdMinPickQtyController.cs" /> @@ -419,6 +420,7 @@ <Compile Include="Controllers\SBGL\SBTC\Sb_EquipWorkBeforeCheckBillController.cs" /> <Compile Include="Controllers\SBGL\Sb_EquipWorkBeforeCheckSBillController.cs" /> <Compile Include="Controllers\SBGL\Sb_EquipStockInCheckBillSController.cs" /> + <Compile Include="Controllers\SCGL\Gy_SourceWorkStationSetController.cs" /> <Compile Include="Controllers\SCGL\Sc_ComplementGoodBill_ZXBZController.cs" /> <Compile Include="Controllers\SCGL\鏃ヨ鍒掔鐞哱DataHelper.cs" /> <Compile Include="Controllers\SCGL\鏃ヨ鍒掔鐞哱JIT_Cg_PODemandPlanBillController.cs" /> @@ -460,11 +462,16 @@ <Compile Include="Controllers\Sc_MouldRepairSendWorkBillController.cs" /> <Compile Include="Controllers\Sc_ProcessMangementController.cs" /> <Compile Include="Controllers\Sc_ProcessReportController.cs" /> + <Compile Include="Controllers\浜轰簨绠$悊\鍏ヨ亴鐢宠\HR_EmpEngageRequestBillController.cs" /> + <Compile Include="Controllers\浜轰簨绠$悊\寮傚父鍙嶉鍗昞OA_ErrMsgBackBillController.cs" /> + <Compile Include="Controllers\浜轰簨绠$悊\绂昏亴鐢宠\HR_EmpDimissionBillController.cs" /> + <Compile Include="Controllers\浜轰簨绠$悊\鑱屽憳寮傚姩鍗昞HR_EmpChangeBillController.cs" /> <Compile Include="Controllers\浠撳瓨绠$悊\濮斿鐢ㄦ枡\WW_PPBomBillController.cs" /> <Compile Include="Controllers\浠撳瓨绠$悊\鎵爜寮傚父璁板綍\KF_PonderationBillController.cs" /> <Compile Include="Controllers\浠撳瓨绠$悊\鏉$爜鍑哄叆搴撹褰昞Kf_ICStockInOutBillController.cs" /> <Compile Include="Controllers\浠撳瓨绠$悊\鏉$爜搴撳瓨\KF_ICInventoryList_WMSBillController.cs" /> <Compile Include="Controllers\浠撳瓨绠$悊\鏉$爜鐢熸垚\Gy_BarCodeBill_OutController.cs" /> + <Compile Include="Controllers\浠撳瓨绠$悊\鏉$爜鐢熸垚\Gy_SplitBarCodeController.cs" /> <Compile Include="Controllers\浠撳瓨绠$悊\鏉$爜鐢熸垚\KF_BarCodeStatusChangeBillController.cs" /> <Compile Include="Controllers\浠撳瓨绠$悊\鏉$爜鐢熸垚\Sc_BarCodeController.cs" /> <Compile Include="Controllers\浠撳瓨绠$悊\璋冩嫧鐩樼偣\Kf_MoveStockRequestBillController.cs" /> @@ -473,6 +480,10 @@ <Compile Include="Controllers\浠撳瓨绠$悊\棰嗘枡鍙戣揣\Kf_StockOutRequestBillController.cs" /> <Compile Include="Controllers\浠撳瓨绠$悊\楠屾敹鍏ュ簱\Kf_StepFoldinBillController.cs" /> <Compile Include="Controllers\鍗氭棩鑷姩鎵爜绾縗ScanlineAPIController.cs" /> + <Compile Include="Controllers\鍝佽川绠$悊\浜х嚎璐ㄦ骞冲彴\Sc_ICMOBillQualityStatus_TmpController.cs" /> + <Compile Include="Controllers\鍝佽川绠$悊\浜х嚎杩斾慨骞冲彴\Sc_SourceLineRepairBillController.cs" /> + <Compile Include="Controllers\鍝佽川绠$悊\瀹㈣瘔澶勭悊鍗昞Crm_CustomerAppealBillController.cs" /> + <Compile Include="Controllers\鍝佽川绠$悊\宸℃鍗昞QC_PatrolProcCheckBillController.cs" /> <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_COMMONCONTACTBillController.cs" /> <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_CustLocationController.cs" /> <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_DutyBillController.cs" /> @@ -482,6 +493,7 @@ <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_MouldStatusController.cs" /> <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_OperatorController.cs" /> <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_PaymentConditionListBillController.cs" /> + <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_TemporaryAreaController.cs" /> <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_RateTypeController.cs" /> <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_RecConditionBillController.cs" /> <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_SettleStyleController.cs" /> @@ -499,6 +511,14 @@ <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_WorkStationBillController.cs" /> <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Xt_CheckFlowBillController.cs" /> <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Xt_CheckItemBillController.cs" /> + <Compile Include="Controllers\鍩虹璧勬枡\宸ヨ祫鍩虹璧勬枡\Gy_ProcCommPriceController.cs" /> + <Compile Include="Controllers\宸ヨ祫绠$悊\Pay_OutApplyBillController.cs" /> + <Compile Include="Controllers\宸ヨ祫绠$悊\Pay_OverApplyBillController.cs" /> + <Compile Include="Controllers\宸ヨ祫绠$悊\Pay_PayMentBillController.cs" /> + <Compile Include="Controllers\宸ヨ祫绠$悊\Pay_SalaryCalculateController.cs" /> + <Compile Include="Controllers\宸ヨ祫绠$悊\Pay_DuSubsidyItemBillController.cs" /> + <Compile Include="Controllers\宸ヨ祫绠$悊\Pay_ErrWorkTimesRequestBillController.cs" /> + <Compile Include="Controllers\宸ヨ祫绠$悊\Pay_ProcPriceRequestBillController.cs" /> <Compile Include="Controllers\宸ヨ祫绠$悊\Pay_MonthlySalaryReportController.cs" /> <Compile Include="Controllers\宸ヨ祫绠$悊\Pay_PieceRateWageReportController.cs" /> <Compile Include="Controllers\宸ヨ祫绠$悊\Gy_ClassTimePrjBillController.cs" /> @@ -570,6 +590,11 @@ <Compile Include="Controllers\鐢熶骇绠$悊\鎶ュ伐鍙板伐搴廫Sc_QualityReportStepBillController.cs" /> <Compile Include="Controllers\鐢熶骇绠$悊\鐢熶骇浠诲姟鍗昞Sc_ICMOBillController.cs" /> <Compile Include="Controllers\鐢熶骇绠$悊\璐ㄩ噺姹囨姤鍗昞Sc_QualityReportBillController.cs" /> + <Compile Include="Controllers\椤圭洰绠$悊\涓氱哗鎸囨爣\PM_YearEmployeeMoneyBillController.cs" /> + <Compile Include="Controllers\椤圭洰绠$悊\宸ヤ綔浠诲姟\PM_WorkTaskBillController.cs" /> + <Compile Include="Controllers\椤圭洰绠$悊\宸ョ▼椤圭洰\PM_ProjectBillController.cs" /> + <Compile Include="Controllers\椤圭洰绠$悊\鎶ヨ〃鍒嗘瀽\PM_ReportController.cs" /> + <Compile Include="Controllers\椤圭洰绠$悊\椤圭洰闃舵\Gy_ProjectStageController.cs" /> <Compile Include="Dapper\SqlHelper.cs" /> <Compile Include="Dapper\SqlPools.cs" /> <Compile Include="DbUntil\DataFormatUntil.cs" /> @@ -662,6 +687,7 @@ <Compile Include="Models\TechnologyParameter.cs" /> <Compile Include="Models\TechnologyParameterUnit.cs" /> <Compile Include="Models\TechParamByProc.cs" /> + <Compile Include="Models\WorkCenter.cs" /> <Compile Include="Models\Xt_CheckFlowMain.cs" /> <Compile Include="Models\Xt_CheckFlowSub.cs" /> <Compile Include="Models\Xt_CheckItem.cs" /> @@ -670,6 +696,7 @@ <Compile Include="Models\鍩虹璧勬枡\ConkType.cs" /> <Compile Include="Models\鍩虹璧勬枡\Gy_ClassTimePrj.cs" /> <Compile Include="Models\鍩虹璧勬枡\Gy_Duty.cs" /> + <Compile Include="Models\鍩虹璧勬枡\Gy_TemporaryArea.cs" /> <Compile Include="Models\鍩虹璧勬枡\Gy_StockPlace.cs" /> <Compile Include="Models\鍩虹璧勬枡\WorkDay.cs" /> <Compile Include="Models\鍩虹璧勬枡\PackType.cs" /> @@ -884,11 +911,6 @@ <Compile Include="Models\JsonResult.cs" /> <Compile Include="Models\Pensen.cs" /> <Compile Include="Properties\AssemblyInfo.cs" /> - <Compile Include="Web References\WebS2\Reference.cs"> - <AutoGen>True</AutoGen> - <DesignTime>True</DesignTime> - <DependentUpon>Reference.map</DependentUpon> - </Compile> <Compile Include="Web References\WebS\Reference.cs"> <AutoGen>True</AutoGen> <DesignTime>True</DesignTime> @@ -925,6 +947,7 @@ </ItemGroup> <ItemGroup> <Folder Include="App_Data\" /> + <Folder Include="bin\" /> <Folder Include="obj\x86\Debug\" /> <Folder Include="Views\Cg_PODemandPlanBill\" /> <Folder Include="Views\Cg_PurchaseReturn\" /> @@ -952,6 +975,8 @@ <Folder Include="Views\Gy_RoutingGroup\" /> <Folder Include="Views\Gy_SettleStyle\" /> <Folder Include="Views\Gy_SOPBill\" /> + <Folder Include="Views\Gy_SourceWorkStationSet\" /> + <Folder Include="Views\Gy_SplitBarCode\" /> <Folder Include="Views\Gy_Staff\" /> <Folder Include="Views\Gy_StdMinPickQty\" /> <Folder Include="Views\Gy_StockPlace_\" /> @@ -979,6 +1004,7 @@ <Folder Include="Views\ProductionPlanReport\" /> <Folder Include="Views\ProductionReturnBill\" /> <Folder Include="Views\QC_Management\" /> + <Folder Include="Views\QC_PatrolProcCheckBill\" /> <Folder Include="Views\Sb_EquipRepairSendWorkBill\" /> <Folder Include="Views\Sb_EquipSparepartsBill\" /> <Folder Include="Views\Sb_EquipSparepartsChangeBill\" /> @@ -997,10 +1023,15 @@ <Folder Include="Views\Sc_MouldScrapRequestBill\" /> <Folder Include="Views\Sc_MouldStatusChangeBill\" /> <Folder Include="Views\Sc_ProcessExchangeIssueBill\" /> + <Folder Include="Views\Sc_ProcessSendWork\" /> <Folder Include="Views\Sc_ProcExchRecordBackBill\" /> + <Folder Include="Views\Sc_ProcExchSendWorkBill\" /> + <Folder Include="Views\Sc_ProcExchWWSendWorkBill\" /> <Folder Include="Views\Sc_WorkBillAutoSortBillMain\" /> <Folder Include="Views\Sc_WorkBillSortBill\" /> <Folder Include="Views\Sc_WorkDemandPlanBill\" /> + <Folder Include="Views\Sup_AskPriceBill\" /> + <Folder Include="Views\Sup_QuotePriceBill\" /> <Folder Include="Views\Xt_BillSubType\" /> <Folder Include="Views\Xt_CheckFlowBill\" /> <Folder Include="Views\Xt_CheckItem\" /> @@ -1049,27 +1080,16 @@ </ProjectReference> </ItemGroup> <ItemGroup> - <WebReferenceUrl Include="http://47.96.97.237/WEBS-WMS/WebService1.asmx"> + <WebReferenceUrl Include="http://192.168.63.3/WEBS-WMS/WebService1.asmx"> <UrlBehavior>Dynamic</UrlBehavior> <RelPath>Web References\WebS\</RelPath> - <UpdateFromURL>http://47.96.97.237/WEBS-WMS/WebService1.asmx</UpdateFromURL> + <UpdateFromURL>http://192.168.63.3/WEBS-WMS/WebService1.asmx</UpdateFromURL> <ServiceLocationURL> </ServiceLocationURL> <CachedDynamicPropName> </CachedDynamicPropName> <CachedAppSettingsObjectName>Settings</CachedAppSettingsObjectName> <CachedSettingsPropName>WebAPI_WebS_WebService1</CachedSettingsPropName> - </WebReferenceUrl> - <WebReferenceUrl Include="http://localhost:9099/WebService1.asmx"> - <UrlBehavior>Dynamic</UrlBehavior> - <RelPath>Web References\WebS2\</RelPath> - <UpdateFromURL>http://localhost:9099/WebService1.asmx</UpdateFromURL> - <ServiceLocationURL> - </ServiceLocationURL> - <CachedDynamicPropName> - </CachedDynamicPropName> - <CachedAppSettingsObjectName>Settings</CachedAppSettingsObjectName> - <CachedSettingsPropName>WebAPI_WebS2_WebService1</CachedSettingsPropName> </WebReferenceUrl> </ItemGroup> <PropertyGroup> -- Gitblit v1.9.1