From cfe55175359d72d55f63615d7a4b16ff48c9aadb Mon Sep 17 00:00:00 2001 From: 杨乐 <yang.le.192@qq.com> Date: 星期四, 13 一月 2022 10:43:38 +0800 Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API --- WebAPI/WebAPI.csproj | 309 ++++++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 269 insertions(+), 40 deletions(-) diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj index 68265bd..5d819cc 100644 --- a/WebAPI/WebAPI.csproj +++ b/WebAPI/WebAPI.csproj @@ -32,6 +32,7 @@ <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> <Prefer32Bit>false</Prefer32Bit> + <PlatformTarget>AnyCPU</PlatformTarget> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <DebugType>pdbonly</DebugType> @@ -47,29 +48,14 @@ <HintPath>..\packages\Antlr.3.4.1.9004\lib\Antlr3.Runtime.dll</HintPath> <Private>True</Private> </Reference> - <Reference Include="BLL, Version=1.0.0.0, Culture=neutral, processorArchitecture=x86"> - <SpecificVersion>False</SpecificVersion> - <HintPath>DLL\BLL.dll</HintPath> - </Reference> - <Reference Include="DAL, Version=1.0.0.0, Culture=neutral, processorArchitecture=x86"> - <SpecificVersion>False</SpecificVersion> - <HintPath>DLL\DAL.dll</HintPath> + <Reference Include="BouncyCastle.Crypto, Version=1.8.9.0, Culture=neutral, PublicKeyToken=0e99375e54769942, processorArchitecture=MSIL"> + <HintPath>..\packages\Portable.BouncyCastle.1.8.9\lib\net40\BouncyCastle.Crypto.dll</HintPath> </Reference> <Reference Include="Dapper, Version=1.50.2.0, Culture=neutral, processorArchitecture=MSIL"> <HintPath>..\packages\Dapper.1.50.2\lib\net45\Dapper.dll</HintPath> </Reference> - <Reference Include="DBUtility, Version=1.0.0.0, Culture=neutral, processorArchitecture=x86"> - <SpecificVersion>False</SpecificVersion> - <HintPath>DLL\DBUtility.dll</HintPath> - </Reference> - <Reference Include="Kingdee.BOS.WebApi.Client"> - <HintPath>..\..\..\..\LMES\LMES\LMES\OCX\Kingdee.BOS.WebApi.Client.dll</HintPath> - </Reference> - <Reference Include="Kingdee.BOS.WebApi.FormService"> - <HintPath>..\..\..\..\LMES\LMES\LMES\OCX\Kingdee.BOS.WebApi.FormService.dll</HintPath> - </Reference> - <Reference Include="Kingdee.BOS.WebApi.ServicesStub"> - <HintPath>..\..\..\..\LMES\LMES\LMES\OCX\Kingdee.BOS.WebApi.ServicesStub.dll</HintPath> + <Reference Include="ICSharpCode.SharpZipLib, Version=1.3.2.10, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL"> + <HintPath>..\packages\SharpZipLib.1.3.2\lib\net45\ICSharpCode.SharpZipLib.dll</HintPath> </Reference> <Reference Include="Microsoft.Azure.AppService.ApiApps.Service, Version=0.9.16.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"> <HintPath>..\packages\Microsoft.Azure.AppService.ApiApps.Service.0.9.16\lib\net45\Microsoft.Azure.AppService.ApiApps.Service.dll</HintPath> @@ -82,24 +68,20 @@ <HintPath>..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath> <Private>True</Private> </Reference> - <Reference Include="Model, Version=1.0.0.0, Culture=neutral, processorArchitecture=x86"> - <SpecificVersion>False</SpecificVersion> - <HintPath>DLL\璋冪敤宸ョ▼鏂囦欢\Model.dll</HintPath> - </Reference> <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL"> <HintPath>..\packages\Newtonsoft.Json.6.0.4\lib\net45\Newtonsoft.Json.dll</HintPath> </Reference> - <Reference Include="Pub_Class, Version=1.0.0.0, Culture=neutral, processorArchitecture=x86"> - <SpecificVersion>False</SpecificVersion> - <HintPath>DLL\Pub_Class.dll</HintPath> + <Reference Include="NPOI, Version=2.5.5.0, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL"> + <HintPath>..\packages\NPOI.2.5.5\lib\net45\NPOI.dll</HintPath> </Reference> - <Reference Include="Pub_Control, Version=1.0.7135.29962, Culture=neutral, processorArchitecture=x86"> - <SpecificVersion>False</SpecificVersion> - <HintPath>DLL\Pub_Control.dll</HintPath> + <Reference Include="NPOI.OOXML, Version=2.5.5.0, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL"> + <HintPath>..\packages\NPOI.2.5.5\lib\net45\NPOI.OOXML.dll</HintPath> </Reference> - <Reference Include="SQLHelper, Version=1.0.0.0, Culture=neutral, processorArchitecture=x86"> - <SpecificVersion>False</SpecificVersion> - <HintPath>DLL\SQLHelper.dll</HintPath> + <Reference Include="NPOI.OpenXml4Net, Version=2.5.5.0, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL"> + <HintPath>..\packages\NPOI.2.5.5\lib\net45\NPOI.OpenXml4Net.dll</HintPath> + </Reference> + <Reference Include="NPOI.OpenXmlFormats, Version=2.5.5.0, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL"> + <HintPath>..\packages\NPOI.2.5.5\lib\net45\NPOI.OpenXmlFormats.dll</HintPath> </Reference> <Reference Include="Swashbuckle.Core, Version=1.0.0.0, Culture=neutral, PublicKeyToken=cd1bb07a5ac7c7bc, processorArchitecture=MSIL"> <HintPath>..\packages\Swashbuckle.Core.5.0.0\lib\net40\Swashbuckle.Core.dll</HintPath> @@ -299,10 +281,10 @@ <Content Include="Web References\WebS\ClsKf_ICStockBill_WMS.datasource"> <DependentUpon>Reference.map</DependentUpon> </Content> - <Content Include="Web References\WebS\Reference.map"> + <None Include="Web References\WebS\Reference.map"> <Generator>MSDiscoCodeGenerator</Generator> <LastGenOutput>Reference.cs</LastGenOutput> - </Content> + </None> <None Include="Web References\WebS\WebService1.disco" /> <Content Include="Web.config"> <SubType>Designer</SubType> @@ -314,6 +296,16 @@ <Compile Include="App_Start\RouteConfig.cs" /> <Compile Include="App_Start\SwaggerConfig.cs" /> <Compile Include="App_Start\WebApiConfig.cs" /> + <Compile Include="Controllers\BaseSet\Gy_BarCodeBillController.cs" /> + <Compile Include="Controllers\BaseSet\Gy_RoutingGroupController.cs" /> + <Compile Include="Controllers\BaseSet\Pay_PeriodInfoSetController.cs" /> + <Compile Include="Controllers\BaseSet\Gy_OrderBackInfoController.cs" /> + <Compile Include="Controllers\BaseSet\Gy_OrderLevController.cs" /> + <Compile Include="Controllers\BaseSet\Gy_WorkTypeController.cs" /> + <Compile Include="Controllers\BaseSet\Gy_WorkPayTypeController.cs" /> + <Compile Include="Controllers\BaseSet\Xt_DataDictionary_ProcController.cs" /> + <Compile Include="Controllers\BaseSet\Xt_DataDictionary_TableController.cs" /> + <Compile Include="Controllers\BaseSet\Gy_ModelTypeController.cs" /> <Compile Include="Controllers\BaseSet\Gy_QCCheckClassController.cs" /> <Compile Include="Controllers\BaseSet\Gy_CheckItemController.cs" /> <Compile Include="Controllers\BaseSet\Gy_MaintenanceAcceptItemController.cs" /> @@ -335,6 +327,7 @@ <Compile Include="Controllers\BaseSet\Gy_SupplierController.cs" /> <Compile Include="Controllers\BaseSet\Gy_PropertyController.cs" /> <Compile Include="Controllers\BaseSet\Gy_WarehouseController.cs" /> + <Compile Include="Controllers\BaseSet\Xt_DataDictionary_ViewController.cs" /> <Compile Include="Controllers\BaseSet\Xt_ORGANIZATIONSController.cs" /> <Compile Include="Controllers\BLL\Xt_AccountPeriodController.cs" /> <Compile Include="Controllers\BLL\Xt_BillTypeController.cs" /> @@ -344,6 +337,9 @@ <Compile Include="Controllers\BLL\Xt_UserController.cs" /> <Compile Include="Controllers\BLL\Xt_SystemLogController.cs" /> <Compile Include="Controllers\CellWidthController.cs" /> + <Compile Include="Controllers\CGGL\Cg_PurchaseReturnController.cs" /> + <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\WW_EntrustOrderBillController.cs" /> <Compile Include="Controllers\CGGL\Cg_POInStockBillController.cs" /> @@ -353,13 +349,60 @@ <Compile Include="Controllers\CJGL\Cj_StationOutBillController.cs" /> <Compile Include="Controllers\CJGL\Cj_StationInBillController.cs" /> <Compile Include="Controllers\CJGL\Cj_StationEntrustOutBillController.cs" /> + <Compile Include="Controllers\GZGL\Gy_DuSubsidyItemBillController.cs" /> + <Compile Include="Controllers\GZGL\Gy_WorkPayTypeBillController.cs" /> + <Compile Include="Controllers\GZGL\Gy_WorkTypeBillController.cs" /> <Compile Include="Controllers\JHGL\Gy_RoutingBillController.cs" /> + <Compile Include="Controllers\Kf_ICStockBillMainController.cs" /> + <Compile Include="Controllers\MJGL\Sc_MouldMaintainRuleBillController.cs" /> + <Compile Include="Controllers\MJGL\Sc_MouldMoveStockStepInBillListController .cs" /> + <Compile Include="Controllers\MJGL\Sc_MouldProdMoveBillListController.cs" /> + <Compile Include="Controllers\MJGL\Sc_MouldMoveStockStepOutBillController.cs" /> + <Compile Include="Controllers\MJGL\Sc_MouldProdInBillController.cs" /> + <Compile Include="Controllers\MJGL\Sc_MouldRepairChangeBillController.cs" /> + <Compile Include="Controllers\MJGL\Sc_MouldRepairOutBillController.cs" /> <Compile Include="Controllers\MJGL\Sc_MouldScrapInBillController.cs" /> <Compile Include="Controllers\MJGL\Sc_MouldOtherOutBillController.cs" /> <Compile Include="Controllers\MJJY\Mj_PDA_MoudlCheckController.cs" /> + <Compile Include="Controllers\MoveStockBillController.cs" /> + <Compile Include="Controllers\Open_PrintTemController.cs" /> + <Compile Include="Controllers\ReportStepPlatFormController.cs" /> + <Compile Include="Controllers\SBGL\Sb_EquipRepairSendWorkBillController.cs" /> + <Compile Include="Controllers\SCGL\Sc_ProductionReturnBillController.cs" /> + <Compile Include="Controllers\SCGL\Sc_PackUnionBillController.cs" /> + <Compile Include="Controllers\Sc_MouldRepairSendWorkBillController.cs" /> + <Compile Include="Controllers\Sc_ProcessMangementController.cs" /> + <Compile Include="Controllers\浠撳瓨绠$悊\鎵爜寮傚父璁板綍\KF_PonderationBillController.cs" /> + <Compile Include="Controllers\浠撳瓨绠$悊\鏉$爜鍑哄叆搴撹褰昞Kf_ICStockInOutBillController.cs" /> + <Compile Include="Controllers\浠撳瓨绠$悊\鏉$爜搴撳瓨\KF_ICInventoryList_WMSBillController.cs" /> + <Compile Include="Controllers\浠撳瓨绠$悊\璋冩嫧鐩樼偣\Kf_MoveStockRequestBillController.cs" /> + <Compile Include="Controllers\浠撳瓨绠$悊\棰嗘枡鍙戣揣\apiController.cs" /> + <Compile Include="Controllers\浠撳瓨绠$悊\棰嗘枡鍙戣揣\Kf_StepFoldOutBillController.cs" /> + <Compile Include="Controllers\浠撳瓨绠$悊\楠屾敹鍏ュ簱\Kf_StepFoldinBillController.cs" /> + <Compile Include="Controllers\鍗氭棩鑷姩鎵爜绾縗ScanlineAPIController.cs" /> + <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_StockCheckItemBillController.cs" /> + <Compile Include="Controllers\宸ヨ祫绠$悊\Gy_ClassTimePrjBillController.cs" /> + <Compile Include="Controllers\宸ヨ祫绠$悊\Gy_ClassTimePrjSubController.cs" /> + <Compile Include="Controllers\宸ヨ祫绠$悊\Pay_OtherBalBillController.cs" /> + <Compile Include="Controllers\宸ヨ祫绠$悊\Pay_GroupBalBillController.cs" /> + <Compile Include="Controllers\PurchaseOrderController.cs" /> + <Compile Include="Controllers\QC_POStockInCheckBillController.cs" /> + <Compile Include="Controllers\宸ヨ祫绠$悊\Gy_GroupEmpBillController.cs" /> + <Compile Include="Controllers\宸ヨ祫绠$悊\Pay_WorkTimesBillController.cs" /> + <Compile Include="Controllers\宸ヨ祫绠$悊\Pay_SingleBalBillController.cs" /> <Compile Include="Controllers\ProductionOrderController.cs" /> <Compile Include="Controllers\PublicPageMethodController.cs" /> + <Compile Include="Controllers\ReportFromController.cs" /> + <Compile Include="Controllers\GG_NoticeController.cs" /> <Compile Include="Controllers\ReportPlatFormController.cs" /> + <Compile Include="Controllers\SBGL\Gy_EquipFileMainController.cs" /> + <Compile Include="Controllers\SBGL\Gy_EquipTypeController.cs" /> + <Compile Include="Controllers\SBGL\Sb_EquipDotCheckRuleBillController.cs" /> + <Compile Include="Controllers\SBGL\Sb_EquipMaintainRuleBillController.cs" /> + <Compile Include="Controllers\SCGL\Sc_MESProductReportBillController.cs" /> + <Compile Include="Controllers\SCGL\Sc_MESTransFerWorkBillController.cs" /> + <Compile Include="Controllers\Sc_MouldRepairOutBillController.cs" /> + <Compile Include="Controllers\Sc_MouldRepairInBillListController.cs" /> <Compile Include="Controllers\Sc_MouldController.cs" /> <Compile Include="Controllers\Sc_GroupOrderBillController.cs" /> <Compile Include="Controllers\QC_ManagementController.cs" /> @@ -374,44 +417,106 @@ <Compile Include="Controllers\SCGL\Sc_MESBeginWorkBillController.cs" /> <Compile Include="Controllers\SCGL\QC_LastPieceCheckBillController.cs" /> <Compile Include="Controllers\SCGL\QC_OutCompCheckBillController.cs" /> - <Compile Include="Controllers\SCGL\Sc_QualityReportBillController.cs" /> + <Compile Include="Controllers\SCGL\Sc_ICMOReportBillController.cs" /> <Compile Include="Controllers\Sc_MouldOtherInBillController.cs" /> - <Compile Include="Controllers\Sc_ProcessMangementController.cs" /> <Compile Include="Controllers\CJGL\Cj_StationEntrustInBillController.cs" /> <Compile Include="Controllers\LMESController.cs" /> <Compile Include="Controllers\LookingForBillController.cs" /> <Compile Include="Controllers\NewApiController.cs" /> - <Compile Include="Controllers\SCGL\Sc_ICMOReportBillController.cs" /> <Compile Include="Controllers\SCGL\Sc_PPBomBillController.cs" /> - <Compile Include="Controllers\Sc_CheckToolsRepairWorkBillController.cs" /> + <Compile Include="Controllers\Sc_CheckToolsRepairWorkBillListController.cs" /> <Compile Include="Controllers\XSGL\Xs_SeOutStockBackBillController.cs" /> <Compile Include="Controllers\XSGL\Xs_SeOutStockBillController.cs" /> <Compile Include="Controllers\XSGL\Xs_SeOrderBillController.cs" /> + <Compile Include="Controllers\浠撳瓨绠$悊\棰嗘枡鍙戣揣\Kf_MateOutBackBillController.cs" /> + <Compile Include="Controllers\浠撳瓨绠$悊\棰嗘枡鍙戣揣\Kf_MateOutBillController.cs" /> + <Compile Include="Controllers\浠撳瓨绠$悊\楠屾敹鍏ュ簱\Kf_EntrustOutBackBillController.cs" /> <Compile Include="Controllers\鍝佽川绠$悊\宸ュ簭妫�楠屽崟\QC_ProcessCheckBillController.cs" /> <Compile Include="Controllers\鍝佽川绠$悊\棣栦欢妫�楠屽崟\QC_FirstPieceCheckBillController.cs" /> + <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_ConkReasonBillController.cs" /> + <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_DotCheckBillController.cs" /> + <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_MaintainBillController.cs" /> + <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_RepairBillController.cs" /> + <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_RepairCheckBillController.cs" /> + <Compile Include="Controllers\鍩虹璧勬枡\宸ヨ祫鍩虹璧勬枡\Gy_ProcPriceController.cs" /> + <Compile Include="Controllers\鐢熶骇绠$悊\鎶ュ伐鍙板伐搴廫Sc_MaterToSourceStepBillController.cs" /> + <Compile Include="Controllers\鐢熶骇绠$悊\鎶ュ伐鍙板伐搴廫Sc_MESBeginStepWorkBillController.cs" /> + <Compile Include="Controllers\鐢熶骇绠$悊\鎶ュ伐鍙板伐搴廫Sc_MESEndStepWorkBillController.cs" /> + <Compile Include="Controllers\鐢熶骇绠$悊\鎶ュ伐鍙板伐搴廫Sc_MESProductReportStepBillController.cs" /> + <Compile Include="Controllers\鐢熶骇绠$悊\鎶ュ伐鍙板伐搴廫Sc_MESReturnStepWorkBillController.cs" /> + <Compile Include="Controllers\鐢熶骇绠$悊\鎶ュ伐鍙板伐搴廫Sc_MESStopStepWorkBillController.cs" /> + <Compile Include="Controllers\鐢熶骇绠$悊\鎶ュ伐鍙板伐搴廫Sc_QualityReportStepBillController.cs" /> + <Compile Include="Controllers\鐢熶骇绠$悊\鐢熶骇浠诲姟鍗昞Sc_ICMOBillController.cs" /> + <Compile Include="Controllers\鐢熶骇绠$悊\璐ㄩ噺姹囨姤鍗昞Sc_QualityReportBillController.cs" /> <Compile Include="Dapper\SqlHelper.cs" /> <Compile Include="Dapper\SqlPools.cs" /> <Compile Include="DbUntil\DataFormatUntil.cs" /> <Compile Include="DLL\ClsGy_BadReason_Ctl.cs" /> + <Compile Include="DLL\ClsGy_DuSubsidyItemBill.cs" /> + <Compile Include="DLL\ClsGy_EquipFileMain.cs" /> + <Compile Include="DLL\ClsGy_EquipTypeBill.cs" /> <Compile Include="DLL\ClsGy_Material_Ctl.cs" /> + <Compile Include="DLL\ClsGy_Source_Ctl.cs" /> + <Compile Include="DLL\ClsGy_WorkPayTypeBill.cs" /> + <Compile Include="DLL\ClsGy_WorkTypeBill.cs" /> + <Compile Include="DLL\ClsKf_MateOutBackBill.cs" /> + <Compile Include="DLL\ClsKf_MateOutBill.cs" /> + <Compile Include="DLL\ClsKf_SellOutBackBill.cs" /> + <Compile Include="DLL\ClsOA_ErrMsgBackBill.cs" /> + <Compile Include="DLL\ClsOA_InformBill.cs" /> <Compile Include="DLL\ClsQC_NoPassProdCheckBill.cs" /> <Compile Include="DLL\ClsQC_PatrolProcCheckBill.cs" /> <Compile Include="DLL\ClsSb_EquipConkBookBill.cs" /> <Compile Include="DLL\ClsSb_EquipDotCheckBill.cs" /> <Compile Include="DLL\ClsSb_EquipMaintainBill.cs" /> + <Compile Include="DLL\ClsSb_EquipMaintainRuleBill.cs" /> <Compile Include="DLL\ClsSb_EquipRepairCheckBill.cs" /> <Compile Include="DLL\ClsSb_EquipRepairWorkBill.cs" /> + <Compile Include="DLL\ClsSb_MouldRepairWorkBill.cs" /> <Compile Include="DLL\ClsSc_ICMOBillWorkQtyStatus_Tmp.cs" /> <Compile Include="DLL\ClsSc_ICMOReportBill.cs" /> <Compile Include="DLL\ClsSc_MESBeginWorkBill.cs" /> <Compile Include="DLL\ClsSc_MESEndWorkBill.cs" /> + <Compile Include="DLL\ClsSc_MESReturnStepWorkBill.cs" /> <Compile Include="DLL\ClsSc_MESStopWorkBill.cs" /> <Compile Include="DLL\ClsSc_MouldDotCheckBill.cs" /> <Compile Include="DLL\ClsSc_MouldLifeChangeBill.cs" /> <Compile Include="DLL\ClsSc_MouldMaintainBill.cs" /> + <Compile Include="DLL\ClsSc_MouldOtherOutBill.cs" /> + <Compile Include="DLL\ClsSc_MouldOtherInBill.cs" /> + <Compile Include="DLL\ClsSc_MouldMoveStockStepOutBill.cs" /> + <Compile Include="DLL\ClsSc_PackUnionBill.cs" /> + <Compile Include="DLL\宸ヨ祫绠$悊\ClsPay_GroupBalBill.cs" /> + <Compile Include="DLL\宸ヨ祫绠$悊\ClsGy_GroupEmpBill.cs" /> + <Compile Include="DLL\宸ヨ祫绠$悊\ClsPay_WorkTimesBill.cs" /> + <Compile Include="HttpClient.cs" /> + <Compile Include="InvokeHelper.cs" /> + <Compile Include="Log.cs" /> + <Compile Include="Models\ClsGy_StockCheckItemBill.cs" /> + <Compile Include="Models\ClsSb_MouldRepairWorkBillMain.cs" /> + <Compile Include="Models\ClsSb_MouldRepairWorkBillSub.cs" /> + <Compile Include="Models\ClsSc_PackUnionBillMain.cs" /> + <Compile Include="Models\ClsSc_PackUnionBillSub.cs" /> + <Compile Include="Models\ClsSc_ProcessReportMain.cs" /> + <Compile Include="Models\ClsSc_ProcessReportSub.cs" /> + <Compile Include="Models\GetWeekList.cs" /> + <Compile Include="Models\jsonScanline.cs" /> + <Compile Include="Models\ScanLineCode.cs" /> + <Compile Include="Models\宸ヨ祫绠$悊\ClsGy_ClassTimePrj_Model.cs" /> + <Compile Include="Models\宸ヨ祫绠$悊\ClsPay_GroupBalBillEmp.cs" /> + <Compile Include="Models\宸ヨ祫绠$悊\ClsPay_GroupBalBillMain.cs" /> + <Compile Include="Models\宸ヨ祫绠$悊\ClsPay_GroupBalBillSub.cs" /> + <Compile Include="DLL\宸ヨ祫绠$悊\ClsPay_SingleBalBill.cs" /> <Compile Include="DLL\ClsSc_MouldProdBackBill.cs" /> + <Compile Include="DLL\宸ヨ祫绠$悊\ClsPay_OtherBalBill.cs" /> + <Compile Include="DLL\ClsSc_MouldProdInBill.cs" /> + <Compile Include="DLL\ClsSc_MouldMoveStockStepInBill.cs" /> + <Compile Include="DLL\ClsSc_MouldProdMoveBill.cs" /> <Compile Include="DLL\ClsSc_MouldProdOutBill.cs" /> + <Compile Include="DLL\ClsSc_MouldRepairChangeBill.cs" /> <Compile Include="DLL\ClsSc_MouldRepairCheckBill.cs" /> + <Compile Include="DLL\ClsSc_MouldRepairInBill.cs" /> + <Compile Include="DLL\ClsSc_MouldRepairOutBill.cs" /> <Compile Include="DLL\ClsSc_MouldScrapInBill.cs" /> <Compile Include="DLL\ClsSc_MouldScrapOutBill.cs" /> <Compile Include="DLL\ClsSc_ProcessReport.cs" /> @@ -419,15 +524,79 @@ <Compile Include="DLL\ClsWW_EntrustProcessReportBill.cs" /> <Compile Include="DLL\ClsWW_EntrustProcessSendOutBill.cs" /> <Compile Include="DLL\ClsWW_EntrustWorkOrderBill.cs" /> + <Compile Include="DLL\ClsSb_EquipDotCheckRuleBill.cs" /> + <Compile Include="LogService.cs" /> <Compile Include="Models\ApiConfig.cs" /> <Compile Include="Models\ApiResult.cs" /> <Compile Include="Models\CheckItem.cs" /> + <Compile Include="Models\ClsGy_DotCheck.cs" /> + <Compile Include="Models\ClsGy_Maintain.cs" /> + <Compile Include="Models\ClsGy_Repair.cs" /> + <Compile Include="Models\ClsGy_RepairCheck.cs" /> + <Compile Include="Models\ClsKf_ICStockBillMain.cs" /> + <Compile Include="Models\ClsKf_ICStockBillScheme.cs" /> + <Compile Include="Models\ClsKf_ICStockBillSub.cs" /> + <Compile Include="Models\ClsKf_MateOutBillMain.cs" /> + <Compile Include="Models\ClsKf_MateOutBillScheme.cs" /> + <Compile Include="Models\ClsKf_MateOutBillSub.cs" /> + <Compile Include="Models\ClsOA_ErrMsgBackBillMain.cs" /> + <Compile Include="Models\ClsOA_ErrMsgBackBillSub.cs" /> + <Compile Include="Models\ClsOA_ErrMsgBackBillSub2.cs" /> + <Compile Include="Models\ClsOA_InformBillMain.cs" /> + <Compile Include="Models\ClsOA_InformBillSub.cs" /> + <Compile Include="Models\宸ヨ祫绠$悊\ClsPay_OtherBalBillMain.cs" /> + <Compile Include="Models\宸ヨ祫绠$悊\ClsPay_OtherBalBillSub.cs" /> + <Compile Include="Models\宸ヨ祫绠$悊\ClsGy_GroupEmpListMain.cs" /> + <Compile Include="Models\宸ヨ祫绠$悊\ClsPay_SingleBalBillMain.cs" /> + <Compile Include="Models\宸ヨ祫绠$悊\ClsGy_GroupEmpListSub.cs" /> + <Compile Include="Models\宸ヨ祫绠$悊\ClsPay_SingleBalBillSub.cs" /> + <Compile Include="Models\ClsSb_EquipDotCheckRuleBillMain.cs" /> + <Compile Include="Models\ClsSb_EquipDotCheckRuleBillSub.cs" /> + <Compile Include="Models\ClsSb_EquipMaintainRuleBillMain.cs" /> + <Compile Include="Models\ClsSb_EquipMaintainRuleBillSub.cs" /> + <Compile Include="Models\ClsSb_EquipMaintainRuleBillSub_Item.cs" /> + <Compile Include="Models\Pay_PeriodInfoSet.cs" /> + <Compile Include="Models\Gy_OrderBackInfo.cs" /> + <Compile Include="Models\Gy_OrderLevList.cs" /> + <Compile Include="Models\ClsGy_EquipFileMain.cs" /> + <Compile Include="Models\ClsGy_EquipFileType.cs" /> <Compile Include="Models\ClsGy_Material_Model.cs" /> <Compile Include="Models\ClsSb_EquipDotCheckBillMain.cs" /> <Compile Include="Models\ClsSb_EquipDotCheckBillSub.cs" /> <Compile Include="Models\ClsSb_EquipMaintainBillMain.cs" /> <Compile Include="Models\ClsSb_EquipMaintainBillSub.cs" /> <Compile Include="Models\ClsSb_EquipRepairWorkBillMain.cs" /> + <Compile Include="Models\ClsSc_MouldProdBillMain.cs" /> + <Compile Include="Models\ClsSc_MouldProdBillSub.cs" /> + <Compile Include="Models\ClsSc_MouldRepairChangeBillMain.cs" /> + <Compile Include="Models\ClsSc_MouldRepairChangeBillSub.cs" /> + <Compile Include="Models\ClsSc_MouldRepairInBillMain.cs" /> + <Compile Include="Models\ClsSc_MouldRepairInBillSub.cs" /> + <Compile Include="Models\ClsSc_MouldRepairOutBillMain.cs" /> + <Compile Include="Models\ClsSc_MouldRepairOutBillSub.cs" /> + <Compile Include="Models\ClsGy_ProcPrice.cs" /> + <Compile Include="Models\Gy_WorkType.cs" /> + <Compile Include="Models\Gy_WorkPayType.cs" /> + <Compile Include="Models\QC_POStockInCheckBillSub.cs" /> + <Compile Include="Models\QC_POStockInCheckBill.cs" /> + <Compile Include="Models\UserPower.cs" /> + <Compile Include="Models\Xt_DataDictionary_Proc.cs" /> + <Compile Include="Models\Xt_DataDictionary_View.cs" /> + <Compile Include="Models\Xt_DataDictionary_Table.cs" /> + <Compile Include="Models\Gy_User.cs" /> + <Compile Include="Models\Gy_UserSupper.cs" /> + <Compile Include="Models\Menu.cs" /> + <Compile Include="Models\ModelConvertHelper.cs" /> + <Compile Include="Models\Pay_OtherBalBill.cs" /> + <Compile Include="Models\Pay_GroupBalBill.cs" /> + <Compile Include="Models\Pay_GroupBalBillSub.cs" /> + <Compile Include="Models\Pay_WorkTimesBillSub.cs" /> + <Compile Include="Models\Pay_WorkTimesBill.cs" /> + <Compile Include="Models\Pay_SingleBalBill.cs" /> + <Compile Include="Models\Pay_OtherBalBillSub.cs" /> + <Compile Include="Models\Pay_SingleBalBillSub.cs" /> + <Compile Include="Models\ToHierarchy.cs" /> + <Compile Include="Models\Xt_ORGANIZATIONS.cs" /> <Compile Include="Models\ClsSb_EquipRepairWorkBillSub.cs" /> <Compile Include="Models\ClsSc_ICMOBillWorkQtyStatus_Tmp.cs" /> <Compile Include="Models\ClsSc_ICMOReportBillMain.cs" /> @@ -451,6 +620,7 @@ <Compile Include="Models\Gy_Mould.cs" /> <Compile Include="Models\Gy_MouldSub.cs" /> <Compile Include="Models\Sc_MouldStockBillMain.cs" /> + <Compile Include="Models\Sc_ICMOBillQualityStatus_Tmp.cs" /> <Compile Include="Models\Sc_MouldStockBillSub.cs" /> <Compile Include="Models\Xt_AccountPeriod.cs" /> <Compile Include="Models\xtgnb.cs" /> @@ -493,7 +663,14 @@ <Compile Include="Models\WWSendOutBillViewModel.cs" /> <Compile Include="Models\WW_EntrustProcSendWorkViewModel.cs" /> <Compile Include="Models\WW_EntrustWorkOrderViewModel.cs" /> + <Compile Include="Models\鍩虹璧勬枡\Gy_ClassTimePrjSub.cs" /> + <Compile Include="Models\鍩虹璧勬枡\Gy_ClassTimePrj.cs" /> + <Compile Include="Models\鍩虹璧勬枡\Gy_Employee.cs" /> + <Compile Include="Models\鍩虹璧勬枡\Gy_Process.cs" /> + <Compile Include="Models\鍩虹璧勬枡\Gy_ClassTimePrj.cs" /> <Compile Include="Models\鍩虹璧勬枡\Warehouse.cs" /> + <Compile Include="Models\宸ヨ祫绠$悊\ClsPay_WorkTimesBillMain.cs" /> + <Compile Include="Models\宸ヨ祫绠$悊\ClsPay_WorkTimesBillSub.cs" /> <Compile Include="Properties\Resources.Designer.cs"> <AutoGen>True</AutoGen> <DesignTime>True</DesignTime> @@ -513,7 +690,6 @@ <DesignTime>True</DesignTime> <DependentUpon>Reference.map</DependentUpon> </Compile> - <Compile Include="WebServer.cs" /> <Compile Include="Code\Common.cs" /> <Compile Include="Code\Test2.cs" /> <Compile Include="Code\TestDAL.cs" /> @@ -521,7 +697,6 @@ <Compile Include="Controllers\EntrustOutController.cs" /> <Compile Include="Controllers\Kf_EntrustInBillController.cs" /> <Compile Include="Controllers\MateOutController.cs" /> - <Compile Include="Controllers\MoveStockBillController.cs" /> <Compile Include="Controllers\OtherOutBillController.cs" /> <Compile Include="Controllers\OtherInStockController.cs" /> <Compile Include="Controllers\POStockInBackBillController.cs" /> @@ -541,6 +716,7 @@ <Compile Include="Models\JsonResult.cs" /> <Compile Include="Models\Pensen.cs" /> <Compile Include="Properties\AssemblyInfo.cs" /> + <Compile Include="WebServer.cs" /> </ItemGroup> <ItemGroup> <Content Include="packages.config"> @@ -571,8 +747,22 @@ </ItemGroup> <ItemGroup> <Folder Include="App_Data\" /> + <Folder Include="Views\Cg_PurchaseReturn\" /> + <Folder Include="Views\Gy_EquipType\" /> + <Folder Include="Views\Gy_RoutingGroup\" /> + <Folder Include="Views\KF_ICInventoryList_WMSBill\" /> + <Folder Include="Views\Kf_ICStockBillMain\" /> + <Folder Include="Views\Kf_ICStockInOutBill\" /> + <Folder Include="Views\Kf_MoveStockRequestBill\" /> + <Folder Include="Views\KF_PonderationBill\" /> + <Folder Include="Views\kf_StepFoldinBill\" /> + <Folder Include="Views\Kf_StepFoldOutBill\" /> <Folder Include="Views\MoveStockBill\" /> + <Folder Include="Views\ProductionReturnBill\" /> <Folder Include="Views\QC_Management\" /> + <Folder Include="Views\Sb_EquipRepairSendWorkBill\" /> + <Folder Include="Views\Sc_MouldRepairOutBill\" /> + <Folder Include="Views\Sc_MouldRepairSendWorkBill\" /> </ItemGroup> <ItemGroup> <WCFMetadata Include="Service References\" /> @@ -599,10 +789,49 @@ <CachedSettingsPropName>WebAPI_WebS_WebService1</CachedSettingsPropName> </WebReferenceUrl> </ItemGroup> + <ItemGroup> + <ProjectReference Include="..\BLL\BLL.csproj"> + <Project>{0bf3d95a-4a7b-45fb-92fb-9a5bb374b750}</Project> + <Name>BLL</Name> + </ProjectReference> + <ProjectReference Include="..\DAL\DAL.csproj"> + <Project>{7c30e3c9-58b7-420a-ab92-0a5117b82dda}</Project> + <Name>DAL</Name> + </ProjectReference> + <ProjectReference Include="..\DBUtility\DBUtility.csproj"> + <Project>{f2098f1b-4fa1-49bb-91ea-ab3522008f28}</Project> + <Name>DBUtility</Name> + </ProjectReference> + <ProjectReference Include="..\Model\Model.csproj"> + <Project>{5061b703-b7a6-4e82-a9aa-f73fd80520bf}</Project> + <Name>Model</Name> + </ProjectReference> + <ProjectReference Include="..\Pub_Class\Pub_Class.csproj"> + <Project>{0de3c6c4-9c87-4b8c-ac86-ac15b7afe731}</Project> + <Name>Pub_Class</Name> + </ProjectReference> + <ProjectReference Include="..\Pub_Control\Pub_Control.csproj"> + <Project>{f7838319-779c-4ad9-a59f-5dcb5757f335}</Project> + <Name>Pub_Control</Name> + </ProjectReference> + <ProjectReference Include="..\SQLHelper\SQLHelper.csproj"> + <Project>{0a4ef483-d8d3-49a5-8378-974ef7993365}</Project> + <Name>SQLHelper</Name> + </ProjectReference> + </ItemGroup> <PropertyGroup> <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion> <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath> </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'"> + <PlatformTarget>x86</PlatformTarget> + <OutputPath>bin\</OutputPath> + <DefineConstants>TRACE;DEBUG</DefineConstants> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'"> + <PlatformTarget>x86</PlatformTarget> + <OutputPath>bin\</OutputPath> + </PropertyGroup> <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> <Import Project="$(VSToolsPath)\WebApplications\Microsoft.WebApplication.targets" Condition="'$(VSToolsPath)' != ''" /> <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" Condition="false" /> -- Gitblit v1.9.1