From 494c68c9ad1cc3b085c27e87865269c4593c24e8 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期五, 25 十一月 2022 09:08:48 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/WebAPI.csproj | 84 ++++++++++++++++++++++++++++++------------
1 files changed, 60 insertions(+), 24 deletions(-)
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index 5d17222..6cfa500 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -189,6 +189,7 @@
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
<Private>True</Private>
</Reference>
+ <Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml">
<Private>True</Private>
</Reference>
@@ -298,16 +299,16 @@
<Content Include="Web References\WebS\ClsGy_Warehouse_Model.datasource">
<DependentUpon>Reference.map</DependentUpon>
</Content>
- <Content Include="Web References\WebS\ClsKf_ICStockBill_WMS.datasource">
- <DependentUpon>Reference.map</DependentUpon>
- </Content>
<Content Include="Web References\WebS\ClsKf_ICStockBill_Mould.datasource">
<DependentUpon>Reference.map</DependentUpon>
</Content>
- <None Include="Web References\WebS\Reference.map">
+ <Content Include="Web References\WebS\ClsKf_ICStockBill_WMS.datasource">
+ <DependentUpon>Reference.map</DependentUpon>
+ </Content>
+ <Content Include="Web References\WebS\Reference.map">
<Generator>MSDiscoCodeGenerator</Generator>
- <LastGenOutput>Reference1.cs</LastGenOutput>
- </None>
+ <LastGenOutput>Reference.cs</LastGenOutput>
+ </Content>
<None Include="Web References\WebS\WebService1.disco" />
<Content Include="Web.config">
<SubType>Designer</SubType>
@@ -320,6 +321,9 @@
<Compile Include="App_Start\SwaggerConfig.cs" />
<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_WorkDayController.cs" />
+ <Compile Include="Controllers\BaseSet\Gy_PackTypeController.cs" />
<Compile Include="Controllers\BaseSet\Gy_RoutingGroupController.cs" />
<Compile Include="Controllers\BaseSet\Gy_TechnologyController.cs" />
<Compile Include="Controllers\BaseSet\Gy_TechnologyParUnitController.cs" />
@@ -376,6 +380,7 @@
<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\Mes_OrderProcFlowAllReportController.cs" />
<Compile Include="Controllers\CJGL\ProductionPlanReportController.cs" />
<Compile Include="Controllers\CJGL\Sc_ProcessExchangeBillController.cs" />
<Compile Include="Controllers\CJGL\Cj_StationOutBillController.cs" />
@@ -383,6 +388,8 @@
<Compile Include="Controllers\CJGL\Cj_StationEntrustOutBillController.cs" />
<Compile Include="Controllers\CJGL\Sc_WorkBillAutoSortBillMainController.cs" />
<Compile Include="Controllers\Gy_MateMouldController.cs" />
+ <Compile Include="Controllers\Pay_ReportController.cs" />
+ <Compile Include="Controllers\SCGL\Sc_ComplementGoodBill_ZXBZController.cs" />
<Compile Include="Controllers\SCGL\鏃ヨ鍒掔鐞哱DataHelper.cs" />
<Compile Include="Controllers\SCGL\鏃ヨ鍒掔鐞哱JIT_Cg_PODemandPlanBillController.cs" />
<Compile Include="Controllers\SCGL\Sc_CallGoodsBackRequestBillController.cs" />
@@ -433,8 +440,14 @@
<Compile Include="Controllers\浠撳瓨绠＄悊\棰嗘枡鍙戣揣\Kf_StepFoldOutBillController.cs" />
<Compile Include="Controllers\浠撳瓨绠＄悊\楠屾敹鍏ュ簱\Kf_StepFoldinBillController.cs" />
<Compile Include="Controllers\鍗氭棩鑷姩鎵爜绾縗ScanlineAPIController.cs" />
+ <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_DutyBillController.cs" />
+ <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_SOPBillController.cs" />
+ <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_SOPBillEditController.cs" />
+ <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_SOPBillListController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_StockCheckItemBillController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_WorkStationBillController.cs" />
+ <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Xt_CheckFlowBillController.cs" />
+ <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Xt_CheckItemBillController.cs" />
<Compile Include="Controllers\宸ヨ祫绠＄悊\Pay_MonthlySalaryReportController.cs" />
<Compile Include="Controllers\宸ヨ祫绠＄悊\Pay_PieceRateWageReportController.cs" />
<Compile Include="Controllers\宸ヨ祫绠＄悊\Gy_ClassTimePrjBillController.cs" />
@@ -496,6 +509,7 @@
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_RepairBillController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_RepairCheckBillController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\宸ヨ祫鍩虹璧勬枡\Gy_ProcPriceController.cs" />
+ <Compile Include="Controllers\鏉＄爜绠＄悊\WEBSController.cs" />
<Compile Include="Controllers\鐢熶骇绠＄悊\鎶ュ伐鍙板伐搴廫Sc_MaterToSourceStepBillController.cs" />
<Compile Include="Controllers\鐢熶骇绠＄悊\鎶ュ伐鍙板伐搴廫Sc_MESBeginStepWorkBillController.cs" />
<Compile Include="Controllers\鐢熶骇绠＄悊\鎶ュ伐鍙板伐搴廫Sc_MESEndStepWorkBillController.cs" />
@@ -558,6 +572,9 @@
<Compile Include="Models\ClsSc_AssemblyBillMain.cs" />
<Compile Include="Models\ClsSc_AssemblyBillSub.cs" />
<Compile Include="Models\Employee.cs" />
+ <Compile Include="Models\Gy_UserCustomer.cs" />
+ <Compile Include="Models\Gy_UserMater.cs" />
+ <Compile Include="Models\Gy_UserUser.cs" />
<Compile Include="Models\JIT_Cg_PODemandPlanBillMain.cs" />
<Compile Include="Models\JIT_Cg_PODemandPlanBillSub.cs" />
<Compile Include="Models\Cg_PODemandPlanConfigBillSub.cs" />
@@ -587,12 +604,22 @@
<Compile Include="Models\Sc_WorkBillSortBillSub.cs" />
<Compile Include="Models\Sc_WorkDemandPlanBillMain.cs" />
<Compile Include="Models\Sc_WorkDemandPlanBillSub.cs" />
+ <Compile Include="Models\SOPBill.cs" />
+ <Compile Include="Models\SOPBillSub.cs" />
<Compile Include="Models\TechnologyParameter.cs" />
<Compile Include="Models\TechnologyParameterUnit.cs" />
<Compile Include="Models\TechParamByProc.cs" />
+ <Compile Include="Models\Xt_CheckFlowMain.cs" />
+ <Compile Include="Models\Xt_CheckFlowSub.cs" />
+ <Compile Include="Models\Xt_CheckItem.cs" />
<Compile Include="Models\鍏跺畠\ReciveBill_FastModel.cs" />
<Compile Include="Models\鍔ㄦ�佸垪\OptionListModel.cs" />
+ <Compile Include="Models\鍩虹璧勬枡\ConkType.cs" />
<Compile Include="Models\鍩虹璧勬枡\Gy_ClassTimePrj.cs" />
+ <Compile Include="Models\鍩虹璧勬枡\Gy_Duty.cs" />
+ <Compile Include="Models\鍩虹璧勬枡\WorkDay.cs" />
+ <Compile Include="Models\鍩虹璧勬枡\PackType.cs" />
+ <Compile Include="Models\鍩虹璧勬枡\WorkStation.cs" />
<Compile Include="Models\宸ヨ祫绠＄悊\ClsGy_ClassTimePrj_Model.cs" />
<Compile Include="Models\宸ヨ祫绠＄悊\ClsPay_GroupBalBillEmp.cs" />
<Compile Include="Models\宸ヨ祫绠＄悊\ClsPay_GroupBalBillMain.cs" />
@@ -778,11 +805,6 @@
<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>
- <DependentUpon>Reference.map</DependentUpon>
- </Compile>
<Compile Include="Code\Common.cs" />
<Compile Include="Code\Test2.cs" />
<Compile Include="Code\TestDAL.cs" />
@@ -808,6 +830,11 @@
<Compile Include="Models\JsonResult.cs" />
<Compile Include="Models\Pensen.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
+ <Compile Include="Web References\WebS\Reference.cs">
+ <AutoGen>True</AutoGen>
+ <DesignTime>True</DesignTime>
+ <DependentUpon>Reference.map</DependentUpon>
+ </Compile>
<Compile Include="WebServer.cs" />
</ItemGroup>
<ItemGroup>
@@ -846,10 +873,14 @@
<Folder Include="Views\Cj_CallGoodsBillMain\" />
<Folder Include="Views\Cj_ComplementGoodsBill\" />
<Folder Include="Views\Cj_SendGoodsBill\" />
+ <Folder Include="Views\Gy_ConkType\" />
+ <Folder Include="Views\Gy_DutyBill\" />
<Folder Include="Views\Gy_EquipType\" />
<Folder Include="Views\Gy_ICBomBill\" />
<Folder Include="Views\Gy_MateMould\" />
+ <Folder Include="Views\Gy_PackType\" />
<Folder Include="Views\Gy_RoutingGroup\" />
+ <Folder Include="Views\Gy_SOPBill\" />
<Folder Include="Views\Gy_WorkStation\" />
<Folder Include="Views\JIT_DayPlanPlatFormBill\" />
<Folder Include="Views\JIT_DayPlanPlatFormImport\" />
@@ -861,13 +892,16 @@
<Folder Include="Views\KF_PonderationBill\" />
<Folder Include="Views\kf_StepFoldinBill\" />
<Folder Include="Views\Kf_StepFoldOutBill\" />
+ <Folder Include="Views\Mes_OrderProcFlowAllReport\" />
<Folder Include="Views\MoveStockBill\" />
+ <Folder Include="Views\Pay_Report\" />
<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_ComplementGoodBill_ZXBZ\" />
<Folder Include="Views\Sc_ComplementGoods\" />
<Folder Include="Views\Sc_JIT_ComplementGoodBill\" />
<Folder Include="Views\Sc_MouldRepairOutBill\" />
@@ -875,6 +909,8 @@
<Folder Include="Views\Sc_WorkBillAutoSortBillMain\" />
<Folder Include="Views\Sc_WorkBillSortBill\" />
<Folder Include="Views\Sc_WorkDemandPlanBill\" />
+ <Folder Include="Views\Xt_CheckFlowBill\" />
+ <Folder Include="Views\Xt_CheckItem\" />
<Folder Include="Views\Xt_grdAlignment_WMES\" />
</ItemGroup>
<ItemGroup>
@@ -888,19 +924,6 @@
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
</EmbeddedResource>
- </ItemGroup>
- <ItemGroup>
- <WebReferenceUrl Include="http://47.96.97.237/WEBS-WMS/WebService1.asmx">
- <UrlBehavior>Dynamic</UrlBehavior>
- <RelPath>Web References\WebS\</RelPath>
- <UpdateFromURL>http://47.96.97.237/WEBS-WMS/WebService1.asmx</UpdateFromURL>
- <ServiceLocationURL>
- </ServiceLocationURL>
- <CachedDynamicPropName>
- </CachedDynamicPropName>
- <CachedAppSettingsObjectName>Settings</CachedAppSettingsObjectName>
- <CachedSettingsPropName>WebAPI_WebS_WebService1</CachedSettingsPropName>
- </WebReferenceUrl>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\BLL\BLL.csproj">
@@ -932,6 +955,19 @@
<Name>SQLHelper</Name>
</ProjectReference>
</ItemGroup>
+ <ItemGroup>
+ <WebReferenceUrl Include="http://192.168.80.90:9090/WEBS/WebService1.asmx">
+ <UrlBehavior>Dynamic</UrlBehavior>
+ <RelPath>Web References\WebS\</RelPath>
+ <UpdateFromURL>http://192.168.80.90:9090/WEBS/WebService1.asmx</UpdateFromURL>
+ <ServiceLocationURL>
+ </ServiceLocationURL>
+ <CachedDynamicPropName>
+ </CachedDynamicPropName>
+ <CachedAppSettingsObjectName>Settings</CachedAppSettingsObjectName>
+ <CachedSettingsPropName>WebAPI_WebS_WebService1</CachedSettingsPropName>
+ </WebReferenceUrl>
+ </ItemGroup>
<PropertyGroup>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
--
Gitblit v1.9.1