From 6b3640b2e831df35d489327d8fc4b7baaf4ed996 Mon Sep 17 00:00:00 2001
From: zgq <519541279@qq.com>
Date: 星期三, 21 七月 2021 20:02:07 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-API
---
WebAPI/WebAPI.csproj | 74 +++++++++++++++++++++++++++++++-----
1 files changed, 63 insertions(+), 11 deletions(-)
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index 5798f16..bcd2c02 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -319,6 +319,8 @@
<Compile Include="Controllers\BaseSet\Gy_MaintenanceAcceptItemController.cs" />
<Compile Include="Controllers\BaseSet\Gy_MaintenanceItemController.cs" />
<Compile Include="Controllers\BaseSet\Gy_MaintenanceModeController.cs" />
+ <Compile Include="Controllers\BaseSet\Gy_StockPlaceController.cs" />
+ <Compile Include="Controllers\BaseSet\Gy_EquipMentController.cs" />
<Compile Include="Controllers\BaseSet\Gy_WorkCenterController.cs" />
<Compile Include="Controllers\BaseSet\Gy_CurrencyController.cs" />
<Compile Include="Controllers\BaseSet\Gy_UnitController.cs" />
@@ -341,6 +343,7 @@
<Compile Include="Controllers\BLL\Xt_SystemParameterController.cs" />
<Compile Include="Controllers\BLL\Xt_UserController.cs" />
<Compile Include="Controllers\BLL\Xt_SystemLogController.cs" />
+ <Compile Include="Controllers\CellWidthController.cs" />
<Compile Include="Controllers\CGGL\Cg_POOrderBillController.cs" />
<Compile Include="Controllers\CGGL\WW_EntrustOrderBillController.cs" />
<Compile Include="Controllers\CGGL\Cg_POInStockBillController.cs" />
@@ -351,8 +354,13 @@
<Compile Include="Controllers\CJGL\Cj_StationInBillController.cs" />
<Compile Include="Controllers\CJGL\Cj_StationEntrustOutBillController.cs" />
<Compile Include="Controllers\JHGL\Gy_RoutingBillController.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\ProductionOrderController.cs" />
<Compile Include="Controllers\PublicPageMethodController.cs" />
+ <Compile Include="Controllers\ReportPlatFormController.cs" />
+ <Compile Include="Controllers\Sc_MouldController.cs" />
<Compile Include="Controllers\Sc_GroupOrderBillController.cs" />
<Compile Include="Controllers\QC_ManagementController.cs" />
<Compile Include="Controllers\SBGL\Sb_EquipDotCheckBillController.cs" />
@@ -366,8 +374,8 @@
<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\QC_ProcessCheckBillController.cs" />
<Compile Include="Controllers\SCGL\Sc_QualityReportBillController.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" />
@@ -379,6 +387,8 @@
<Compile Include="Controllers\XSGL\Xs_SeOutStockBackBillController.cs" />
<Compile Include="Controllers\XSGL\Xs_SeOutStockBillController.cs" />
<Compile Include="Controllers\XSGL\Xs_SeOrderBillController.cs" />
+ <Compile Include="Controllers\鍝佽川绠＄悊\宸ュ簭妫�楠屽崟\QC_ProcessCheckBillController.cs" />
+ <Compile Include="Controllers\鍝佽川绠＄悊\棣栦欢妫�楠屽崟\QC_FirstPieceCheckBillController.cs" />
<Compile Include="Dapper\SqlHelper.cs" />
<Compile Include="Dapper\SqlPools.cs" />
<Compile Include="DbUntil\DataFormatUntil.cs" />
@@ -386,12 +396,18 @@
<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_EquipRepairCheckBill.cs" />
<Compile Include="DLL\ClsSb_EquipRepairWorkBill.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_MESStopWorkBill.cs" />
+ <Compile Include="DLL\ClsSc_MouldDotCheckBill.cs" />
<Compile Include="DLL\ClsSc_MouldLifeChangeBill.cs" />
+ <Compile Include="DLL\ClsSc_MouldMaintainBill.cs" />
<Compile Include="DLL\ClsSc_MouldProdBackBill.cs" />
<Compile Include="DLL\ClsSc_MouldProdOutBill.cs" />
<Compile Include="DLL\ClsSc_MouldRepairCheckBill.cs" />
@@ -405,8 +421,38 @@
<Compile Include="Models\ApiConfig.cs" />
<Compile Include="Models\ApiResult.cs" />
<Compile Include="Models\CheckItem.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\ClsSb_EquipRepairWorkBillSub.cs" />
+ <Compile Include="Models\ClsSc_ICMOBillWorkQtyStatus_Tmp.cs" />
+ <Compile Include="Models\ClsSc_ICMOReportBillMain.cs" />
+ <Compile Include="Models\ClsSc_ICMOReportBillSub.cs" />
+ <Compile Include="Models\ClsSc_MESBeginWorkBillMain.cs" />
+ <Compile Include="Models\ClsSc_MESBeginWorkBillSub.cs" />
+ <Compile Include="Models\ClsSc_MESEndWorkBillMain.cs" />
+ <Compile Include="Models\ClsSc_MESEndWorkBillSub.cs" />
+ <Compile Include="Models\ClsSc_MESStopWorkBillMain.cs" />
+ <Compile Include="Models\ClsSc_MESStopWorkBillSub.cs" />
+ <Compile Include="Models\ClsSc_MouldScrapOutBillMain.cs">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Compile>
+ <Compile Include="Models\ClsSc_MouldDotCheckBillMain.cs" />
+ <Compile Include="Models\ClsSc_MouldDotCheckBillSub.cs" />
+ <Compile Include="Models\ClsSc_MouldMaintainBillMain.cs" />
+ <Compile Include="Models\ClsSc_MouldMaintainBillSub.cs" />
+ <Compile Include="Models\ClsSc_MouldStockBillMain.cs" />
+ <Compile Include="Models\ClsSc_MouldStockBillSub.cs" />
+ <Compile Include="Models\EquipMent.cs" />
+ <Compile Include="Models\Gy_Mould.cs" />
+ <Compile Include="Models\Gy_MouldSub.cs" />
+ <Compile Include="Models\Sc_MouldStockBillMain.cs" />
+ <Compile Include="Models\Sc_MouldStockBillSub.cs" />
+ <Compile Include="Models\Xt_AccountPeriod.cs" />
+ <Compile Include="Models\xtgnb.cs" />
+ <Compile Include="Models\SystemParameter.cs" />
<Compile Include="Models\ClsSc_ProcessSendWorkMain.cs" />
<Compile Include="Models\ClsWW_EntrustProcessReportBillMain.cs" />
<Compile Include="Models\ClsWW_EntrustProcessReportBillSub.cs" />
@@ -414,11 +460,18 @@
<Compile Include="Models\ClsWW_EntrustProcessSendOutBillSub.cs" />
<Compile Include="Models\ClsWW_EntrustWorkOrderBillMain.cs" />
<Compile Include="Models\ClsWW_EntrustWorkOrderBillSub.cs" />
+ <Compile Include="Models\Customer.cs" />
+ <Compile Include="Models\BillType.cs" />
+ <Compile Include="Models\QC_OutCompCheckBillMain.cs" />
+ <Compile Include="Models\QC_OutCompCheckBillSub.cs" />
+ <Compile Include="Models\Supplier.cs" />
<Compile Include="Models\DocumentsView.cs" />
<Compile Include="Models\Gy_Group.cs" />
<Compile Include="Models\Gy_WorkCenter.cs" />
<Compile Include="Models\MaintenanceAcceptItem.cs" />
<Compile Include="Models\MaintenanceMode.cs" />
+ <Compile Include="Models\QC_LastPieceCheckBillSub.cs" />
+ <Compile Include="Models\QC_LastPieceCheckBillMain.cs" />
<Compile Include="Models\QC_ProcessCheckBillSub.cs" />
<Compile Include="Models\QC_ProcessCheckBillMain.cs" />
<Compile Include="Models\Gy_RoutingBillSub.cs" />
@@ -516,7 +569,6 @@
</ItemGroup>
<ItemGroup>
<Folder Include="App_Data\" />
- <Folder Include="Controllers\PZGL\" />
<Folder Include="Views\MoveStockBill\" />
<Folder Include="Views\QC_Management\" />
</ItemGroup>
@@ -527,10 +579,16 @@
<WebReferences Include="Web References\" />
</ItemGroup>
<ItemGroup>
- <WebReferenceUrl Include="http://124.70.129.242:9090/WEBS-WMS/WebService1.asmx">
- <UrlBehavior>Static</UrlBehavior>
+ <EmbeddedResource Include="Properties\Resources.resx">
+ <Generator>ResXFileCodeGenerator</Generator>
+ <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+ </EmbeddedResource>
+ </ItemGroup>
+ <ItemGroup>
+ <WebReferenceUrl Include="http://localhost/WEBS-WMSTest/WebService1.asmx">
+ <UrlBehavior>Dynamic</UrlBehavior>
<RelPath>Web References\WebS\</RelPath>
- <UpdateFromURL>http://124.70.129.242:9090/WEBS-WMS/WebService1.asmx</UpdateFromURL>
+ <UpdateFromURL>http://localhost/WEBS-WMSTest/WebService1.asmx</UpdateFromURL>
<ServiceLocationURL>
</ServiceLocationURL>
<CachedDynamicPropName>
@@ -538,12 +596,6 @@
<CachedAppSettingsObjectName>Settings</CachedAppSettingsObjectName>
<CachedSettingsPropName>WebAPI_WebS_WebService1</CachedSettingsPropName>
</WebReferenceUrl>
- </ItemGroup>
- <ItemGroup>
- <EmbeddedResource Include="Properties\Resources.resx">
- <Generator>ResXFileCodeGenerator</Generator>
- <LastGenOutput>Resources.Designer.cs</LastGenOutput>
- </EmbeddedResource>
</ItemGroup>
<PropertyGroup>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
--
Gitblit v1.9.1