From 99660c0a8a0532cbec865dbd86aff2d15ca80fdb Mon Sep 17 00:00:00 2001
From: ch <37327@LLOOCCY>
Date: 星期三, 07 九月 2022 13:25:34 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/WebAPI.csproj | 105 ++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 100 insertions(+), 5 deletions(-)
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index 8b72bc5..0138426 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -22,6 +22,8 @@
<TargetFrameworkProfile />
<Use64BitIISExpress />
<UseGlobalApplicationHostFile />
+ <NuGetPackageImportStamp>
+ </NuGetPackageImportStamp>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -53,6 +55,12 @@
</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="Grpc.Core, Version=2.0.0.0, Culture=neutral, PublicKeyToken=d754f35622e28bad, processorArchitecture=MSIL">
+ <HintPath>..\packages\Grpc.Core.2.45.0\lib\net45\Grpc.Core.dll</HintPath>
+ </Reference>
+ <Reference Include="Grpc.Core.Api, Version=2.0.0.0, Culture=neutral, PublicKeyToken=d754f35622e28bad, processorArchitecture=MSIL">
+ <HintPath>..\packages\Grpc.Core.Api.2.45.0\lib\net45\Grpc.Core.Api.dll</HintPath>
</Reference>
<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>
@@ -87,6 +95,9 @@
<HintPath>..\packages\Swashbuckle.Core.5.0.0\lib\net40\Swashbuckle.Core.dll</HintPath>
<Private>True</Private>
</Reference>
+ <Reference Include="System.Buffers, Version=4.0.2.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+ <HintPath>..\packages\System.Buffers.4.4.0\lib\netstandard1.1\System.Buffers.dll</HintPath>
+ </Reference>
<Reference Include="System.Data.DataSetExtensions">
<Private>True</Private>
</Reference>
@@ -94,11 +105,17 @@
<HintPath>..\packages\System.IdentityModel.Tokens.Jwt.4.0.0\lib\net45\System.IdentityModel.Tokens.Jwt.dll</HintPath>
<Private>True</Private>
</Reference>
+ <Reference Include="System.Memory, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+ <HintPath>..\packages\System.Memory.4.5.3\lib\netstandard1.1\System.Memory.dll</HintPath>
+ </Reference>
<Reference Include="System.Net.Http">
<Private>True</Private>
</Reference>
<Reference Include="System.Net.Http.Formatting, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.AspNet.WebApi.Client.5.2.7\lib\net45\System.Net.Http.Formatting.dll</HintPath>
+ </Reference>
+ <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.4.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+ <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.5.2\lib\netstandard1.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
</Reference>
<Reference Include="System.Runtime.Serialization">
<Private>True</Private>
@@ -216,6 +233,7 @@
<Content Include="Index.html" />
<Content Include="Views\Scripts\bootstrap.js" />
<Content Include="Views\Scripts\bootstrap.min.js" />
+ <Content Include="Config\kdapi.config" />
<None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
@@ -288,7 +306,7 @@
</Content>
<None Include="Web References\WebS\Reference.map">
<Generator>MSDiscoCodeGenerator</Generator>
- <LastGenOutput>Reference.cs</LastGenOutput>
+ <LastGenOutput>Reference1.cs</LastGenOutput>
</None>
<None Include="Web References\WebS\WebService1.disco" />
<Content Include="Web.config">
@@ -333,6 +351,7 @@
<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_grdAlignment_WMESController.cs" />
<Compile Include="Controllers\BaseSet\Xt_ORGANIZATIONSController.cs" />
<Compile Include="Controllers\BLL\Xt_AccountPeriodController.cs" />
<Compile Include="Controllers\BLL\Xt_BillTypeController.cs" />
@@ -349,11 +368,32 @@
<Compile Include="Controllers\CGGL\WW_EntrustOrderBillController.cs" />
<Compile Include="Controllers\CGGL\Cg_POInStockBillController.cs" />
<Compile Include="Controllers\CGGL\Cg_POInStockBackBillController.cs" />
+ <Compile Include="Controllers\CJGL\Cj_CallGoodsBillBackController.cs" />
+ <Compile Include="Controllers\CJGL\Cj_CallGoodsBillMainController.cs" />
+ <Compile Include="Controllers\CJGL\Cj_ComplementGoodsBillController.cs" />
<Compile Include="Controllers\CJGL\Cj_NoPassProcController.cs" />
+ <Compile Include="Controllers\CJGL\Cj_SendGoodsBillController.cs" />
+ <Compile Include="Controllers\CJGL\ProductionPlanReportController.cs" />
<Compile Include="Controllers\CJGL\Sc_ProcessExchangeBillController.cs" />
<Compile Include="Controllers\CJGL\Cj_StationOutBillController.cs" />
<Compile Include="Controllers\CJGL\Cj_StationInBillController.cs" />
<Compile Include="Controllers\CJGL\Cj_StationEntrustOutBillController.cs" />
+ <Compile Include="Controllers\CJGL\Sc_WorkBillAutoSortBillMainController.cs" />
+ <Compile Include="Controllers\SCGL\鏃ヨ鍒掔鐞哱DataHelper.cs" />
+ <Compile Include="Controllers\SCGL\鏃ヨ鍒掔鐞哱JIT_Cg_PODemandPlanBillController.cs" />
+ <Compile Include="Controllers\SCGL\Sc_CallGoodsBackRequestBillController.cs" />
+ <Compile Include="Controllers\SCGL\Sc_ComplementGoodBillController.cs" />
+ <Compile Include="Controllers\SCGL\Sc_ComplementGoodsController.cs" />
+ <Compile Include="Controllers\SCGL\Sc_ICBomBillController.cs" />
+ <Compile Include="Controllers\SCGL\鏃ヨ鍒掔鐞哱JIT_DayPlanPlatFormBillController.cs" />
+ <Compile Include="Controllers\SCGL\鏃ヨ鍒掔鐞哱JIT_DayPlanPlatFormImportController.cs" />
+ <Compile Include="Controllers\SCGL\鏃ヨ鍒掔鐞哱JIT_ICMOSortBillController.cs" />
+ <Compile Include="Controllers\SCGL\鏃ヨ鍒掔鐞哱NpoiHelper.cs" />
+ <Compile Include="Controllers\SCGL\鏃ヨ鍒掔鐞哱Sc_JIT_ComplementGoodBillController.cs" />
+ <Compile Include="Controllers\SCGL\鏃ヨ鍒掔鐞哱JIT_CompleteController..cs" />
+ <Compile Include="Controllers\SCGL\鏃ヨ鍒掔鐞哱Sc_WorkBillSortBillController.cs" />
+ <Compile Include="Controllers\SCGL\鏃ヨ鍒掔鐞哱Sc_WorkDemandPlanBillController.cs" />
+ <Compile Include="Controllers\Sc_PckSplitBillController.cs" />
<Compile Include="Controllers\GZGL\Gy_DuSubsidyItemBillController.cs" />
<Compile Include="Controllers\GZGL\Gy_WorkPayTypeBillController.cs" />
<Compile Include="Controllers\GZGL\Gy_WorkTypeBillController.cs" />
@@ -378,16 +418,21 @@
<Compile Include="Controllers\SCGL\Sc_PackUnionBillController.cs" />
<Compile Include="Controllers\Sc_MouldRepairSendWorkBillController.cs" />
<Compile Include="Controllers\Sc_ProcessMangementController.cs" />
+ <Compile Include="Controllers\Sc_ProcessReportController.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\浠撳瓨绠＄悊\鏉＄爜鐢熸垚\Sc_BarCodeController.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_WorkStationBillController.cs" />
+ <Compile Include="Controllers\宸ヨ祫绠＄悊\Pay_MonthlySalaryReportController.cs" />
+ <Compile Include="Controllers\宸ヨ祫绠＄悊\Pay_PieceRateWageReportController.cs" />
<Compile Include="Controllers\宸ヨ祫绠＄悊\Gy_ClassTimePrjBillController.cs" />
<Compile Include="Controllers\宸ヨ祫绠＄悊\Gy_ClassTimePrjSubController.cs" />
<Compile Include="Controllers\宸ヨ祫绠＄悊\Pay_OtherBalBillController.cs" />
@@ -478,10 +523,12 @@
<Compile Include="DLL\ClsSb_EquipMaintainBill.cs" />
<Compile Include="DLL\ClsSb_EquipMaintainRuleBill.cs" />
<Compile Include="DLL\ClsSb_EquipRepairCheckBill.cs" />
+ <Compile Include="DLL\ClsSb_EquipRepairSendWorkBill.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_ICMOStepBillWorkQtyStatus_Tmp.cs" />
<Compile Include="DLL\ClsSc_MESBeginWorkBill.cs" />
<Compile Include="DLL\ClsSc_MESEndWorkBill.cs" />
<Compile Include="DLL\ClsSc_MESReturnStepWorkBill.cs" />
@@ -493,6 +540,8 @@
<Compile Include="DLL\ClsSc_MouldOtherInBill.cs" />
<Compile Include="DLL\ClsSc_MouldMoveStockStepOutBill.cs" />
<Compile Include="DLL\ClsSc_PackUnionBill.cs" />
+ <Compile Include="DLL\ClsSc_PHPCruxBillBill.cs" />
+ <Compile Include="DLL\ClsSc_ProcessPlan.cs" />
<Compile Include="DLL\ClsWW_PPBomBill.cs" />
<Compile Include="DLL\宸ヨ祫绠＄悊\ClsPay_GroupBalBill.cs" />
<Compile Include="DLL\宸ヨ祫绠＄悊\ClsGy_GroupEmpBill.cs" />
@@ -500,18 +549,39 @@
<Compile Include="HttpClient.cs" />
<Compile Include="InvokeHelper.cs" />
<Compile Include="Log.cs" />
+ <Compile Include="Models\ClsSc_AssemblyBillMain.cs" />
+ <Compile Include="Models\ClsSc_AssemblyBillSub.cs" />
+ <Compile Include="Models\JIT_Cg_PODemandPlanBillMain.cs" />
+ <Compile Include="Models\JIT_Cg_PODemandPlanBillSub.cs" />
+ <Compile Include="Models\Cg_PODemandPlanConfigBillSub.cs" />
<Compile Include="Models\ClsGy_StockCheckItemBill.cs" />
+ <Compile Include="Models\ClsQK_PackingBill.cs" />
+ <Compile Include="Models\ClsSb_EquipRepairSendWorkBillMain.cs" />
+ <Compile Include="Models\ClsSb_EquipRepairSendWorkBillSub.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_ProcessPlanMain.cs" />
+ <Compile Include="Models\ClsSc_ProcessPlanSub.cs" />
<Compile Include="Models\ClsSc_ProcessReportMain.cs" />
<Compile Include="Models\ClsSc_ProcessReportSub.cs" />
<Compile Include="Models\ClsWW_PPBomBillMain.cs" />
<Compile Include="Models\ClsWW_PPBomBillSub.cs" />
+ <Compile Include="Models\Cls_InventoryAnalysisList.cs" />
<Compile Include="Models\GetWeekList.cs" />
+ <Compile Include="Models\Gy_WorkWarehouseBillMainSub.cs" />
+ <Compile Include="Models\HBarCodeList.cs" />
+ <Compile Include="Models\HSouceOrderList.cs" />
+ <Compile Include="Models\JIT_NeedMaterPlanConfigBillSub.cs" />
<Compile Include="Models\jsonScanline.cs" />
<Compile Include="Models\ScanLineCode.cs" />
+ <Compile Include="Models\Sc_WorkBillSortBillMain.cs" />
+ <Compile Include="Models\Sc_WorkBillSortBillSub.cs" />
+ <Compile Include="Models\Sc_WorkDemandPlanBillMain.cs" />
+ <Compile Include="Models\Sc_WorkDemandPlanBillSub.cs" />
+ <Compile Include="Models\鍔ㄦ�佸垪\OptionListModel.cs" />
+ <Compile Include="Models\鍩虹璧勬枡\Gy_ClassTimePrj.cs" />
<Compile Include="Models\宸ヨ祫绠＄悊\ClsGy_ClassTimePrj_Model.cs" />
<Compile Include="Models\宸ヨ祫绠＄悊\ClsPay_GroupBalBillEmp.cs" />
<Compile Include="Models\宸ヨ祫绠＄悊\ClsPay_GroupBalBillMain.cs" />
@@ -674,10 +744,8 @@
<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" />
@@ -696,6 +764,7 @@
<Compile Include="Service\ProcessDal.cs" />
<Compile Include="Service\YqnDal.cs" />
<Compile Include="Service\YqnQbService.cs" />
+ <Compile Include="Utility\Util.cs" />
<Compile Include="Web References\WebS\Reference.cs">
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
@@ -758,9 +827,19 @@
<ItemGroup>
<Folder Include="App_Data\" />
<Folder Include="obj\x86\Debug\" />
+ <Folder Include="Views\Cg_PODemandPlanBill\" />
<Folder Include="Views\Cg_PurchaseReturn\" />
+ <Folder Include="Views\Cj_CallGoodsBillBack\" />
+ <Folder Include="Views\Cj_CallGoodsBillMain\" />
+ <Folder Include="Views\Cj_ComplementGoodsBill\" />
+ <Folder Include="Views\Cj_SendGoodsBill\" />
<Folder Include="Views\Gy_EquipType\" />
+ <Folder Include="Views\Gy_ICBomBill\" />
<Folder Include="Views\Gy_RoutingGroup\" />
+ <Folder Include="Views\Gy_WorkStation\" />
+ <Folder Include="Views\JIT_DayPlanPlatFormBill\" />
+ <Folder Include="Views\JIT_DayPlanPlatFormImport\" />
+ <Folder Include="Views\JIT_ICMOSortBillList\" />
<Folder Include="Views\KF_ICInventoryList_WMSBill\" />
<Folder Include="Views\Kf_ICStockBillMain\" />
<Folder Include="Views\Kf_ICStockInOutBill\" />
@@ -769,11 +848,20 @@
<Folder Include="Views\kf_StepFoldinBill\" />
<Folder Include="Views\Kf_StepFoldOutBill\" />
<Folder Include="Views\MoveStockBill\" />
+ <Folder Include="Views\ProductionPlanReport\" />
<Folder Include="Views\ProductionReturnBill\" />
<Folder Include="Views\QC_Management\" />
<Folder Include="Views\Sb_EquipRepairSendWorkBill\" />
+ <Folder Include="Views\Sc_CallGoodsBackRequestBill\" />
+ <Folder Include="Views\Sc_ComplementGoodBill\" />
+ <Folder Include="Views\Sc_ComplementGoods\" />
+ <Folder Include="Views\Sc_JIT_ComplementGoodBill\" />
<Folder Include="Views\Sc_MouldRepairOutBill\" />
<Folder Include="Views\Sc_MouldRepairSendWorkBill\" />
+ <Folder Include="Views\Sc_WorkBillAutoSortBillMain\" />
+ <Folder Include="Views\Sc_WorkBillSortBill\" />
+ <Folder Include="Views\Sc_WorkDemandPlanBill\" />
+ <Folder Include="Views\Xt_grdAlignment_WMES\" />
</ItemGroup>
<ItemGroup>
<WCFMetadata Include="Service References\" />
@@ -788,10 +876,10 @@
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
- <WebReferenceUrl Include="http://localhost/WEBS-WMS/WebService1.asmx">
+ <WebReferenceUrl Include="http://47.96.97.237/WEBS-WMS/WebService1.asmx">
<UrlBehavior>Dynamic</UrlBehavior>
<RelPath>Web References\WebS\</RelPath>
- <UpdateFromURL>http://localhost/WEBS-WMS/WebService1.asmx</UpdateFromURL>
+ <UpdateFromURL>http://47.96.97.237/WEBS-WMS/WebService1.asmx</UpdateFromURL>
<ServiceLocationURL>
</ServiceLocationURL>
<CachedDynamicPropName>
@@ -864,6 +952,13 @@
</FlavorProperties>
</VisualStudio>
</ProjectExtensions>
+ <Import Project="..\packages\Grpc.Core.2.45.0\build\net45\Grpc.Core.targets" Condition="Exists('..\packages\Grpc.Core.2.45.0\build\net45\Grpc.Core.targets')" />
+ <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+ <PropertyGroup>
+ <ErrorText>杩欏彴璁＄畻鏈轰笂缂哄皯姝ら」鐩紩鐢ㄧ殑 NuGet 绋嬪簭鍖呫�備娇鐢ㄢ�淣uGet 绋嬪簭鍖呰繕鍘熲�濆彲涓嬭浇杩欎簺绋嬪簭鍖呫�傛湁鍏虫洿澶氫俊鎭紝璇峰弬瑙� http://go.microsoft.com/fwlink/?LinkID=322105銆傜己灏戠殑鏂囦欢鏄� {0}銆�</ErrorText>
+ </PropertyGroup>
+ <Error Condition="!Exists('..\packages\Grpc.Core.2.45.0\build\net45\Grpc.Core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Grpc.Core.2.45.0\build\net45\Grpc.Core.targets'))" />
+ </Target>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
--
Gitblit v1.9.1