From 14d1953a72b762f1f5e93f07964fc9747a783ea5 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期一, 26 二月 2024 14:57:53 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/WebAPI.csproj | 20 +++++++++++++-------
1 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index 8b33756..aa05fca 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -342,8 +342,6 @@
<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" />
@@ -390,6 +388,7 @@
<Compile Include="Controllers\CGGL\WW_EntrustOrderBillController.cs" />
<Compile Include="Controllers\CGGL\Cg_POInStockBillController.cs" />
<Compile Include="Controllers\CGGL\Cg_POInStockBackBillController.cs" />
+ <Compile Include="Controllers\CGGL\Cg_PayableBillController.cs" />
<Compile Include="Controllers\CJGL\Cj_CallGoodsBillBackController.cs" />
<Compile Include="Controllers\CJGL\Cj_CallGoodsBillMainController.cs" />
<Compile Include="Controllers\CJGL\Cj_ComplementGoodsBillController.cs" />
@@ -427,6 +426,8 @@
<Compile Include="Controllers\SCGL\Sc_ComplementGoodBill_ZXBZController.cs" />
<Compile Include="Controllers\SCGL\Sc_ICMOBillWorkQtyStatus_TmpController.cs" />
<Compile Include="Controllers\SCGL\Sc_ICMOChangeBillController.cs" />
+ <Compile Include="Controllers\SCGL\Sc_MyTicketController.cs" />
+ <Compile Include="Controllers\SCGL\Sc_WorkBillMonthPlanController.cs" />
<Compile Include="Controllers\SCGL\鏃ヨ鍒掔鐞哱DataHelper.cs" />
<Compile Include="Controllers\SCGL\鏃ヨ鍒掔鐞哱JIT_Cg_PODemandPlanBillController.cs" />
<Compile Include="Controllers\SCGL\Sc_CallGoodsBackRequestBillController.cs" />
@@ -443,8 +444,6 @@
<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" />
<Compile Include="Controllers\JHGL\Gy_RoutingBillController.cs" />
<Compile Include="Controllers\Kf_ICStockBillMainController.cs" />
<Compile Include="Controllers\MateOutController.cs" />
@@ -467,6 +466,8 @@
<Compile Include="Controllers\Sc_MouldRepairSendWorkBillController.cs" />
<Compile Include="Controllers\Sc_ProcessMangementController.cs" />
<Compile Include="Controllers\Sc_ProcessReportController.cs" />
+ <Compile Include="Controllers\XSGL\Kf_ICStockBackBillController.cs" />
+ <Compile Include="Controllers\XSGL\Xs_ReceivableBillController.cs" />
<Compile Include="Controllers\XSGL\YS_ContactBalController.cs" />
<Compile Include="Controllers\XSGL\Xs_SeOrderChangeBillController.cs" />
<Compile Include="Controllers\XSGL\Xs_ExceptiveCheckRequestBillController.cs" />
@@ -532,6 +533,9 @@
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Xt_CheckItemBillController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Xt_FastICSchemeController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\宸ヨ祫鍩虹璧勬枡\Gy_ProcCommPriceController.cs" />
+ <Compile Include="Controllers\鍩虹璧勬枡\宸ヨ祫鍩虹璧勬枡\Gy_WorkTypeController.cs" />
+ <Compile Include="Controllers\鍩虹璧勬枡\宸ヨ祫鍩虹璧勬枡\Gy_WorkPayTypeController.cs" />
+ <Compile Include="Controllers\鍩虹璧勬枡\宸ヨ祫鍩虹璧勬枡\Gy_ClassTimePrjGroupController.cs" />
<Compile Include="Controllers\宸ヨ祫绠＄悊\Pay_OutApplyBillController.cs" />
<Compile Include="Controllers\宸ヨ祫绠＄悊\Pay_OverApplyBillController.cs" />
<Compile Include="Controllers\宸ヨ祫绠＄悊\Pay_PayMentBillController.cs" />
@@ -541,7 +545,7 @@
<Compile Include="Controllers\宸ヨ祫绠＄悊\Pay_ProcPriceRequestBillController.cs" />
<Compile Include="Controllers\宸ヨ祫绠＄悊\Pay_MonthlySalaryReportController.cs" />
<Compile Include="Controllers\宸ヨ祫绠＄悊\Pay_PieceRateWageReportController.cs" />
- <Compile Include="Controllers\宸ヨ祫绠＄悊\Gy_ClassTimePrjController.cs" />
+ <Compile Include="Controllers\鍩虹璧勬枡\宸ヨ祫鍩虹璧勬枡\Gy_ClassTimePrjController.cs" />
<Compile Include="Controllers\宸ヨ祫绠＄悊\Gy_ClassTimePrjSubController.cs" />
<Compile Include="Controllers\宸ヨ祫绠＄悊\Pay_OtherBalBillController.cs" />
<Compile Include="Controllers\宸ヨ祫绠＄悊\Pay_GroupBalBillController.cs" />
@@ -627,6 +631,7 @@
<Compile Include="DLL\ClsGy_AreaSet_Ctl.cs" />
<Compile Include="DLL\ClsGy_CusType_Ctl.cs" />
<Compile Include="DLL\ClsGy_StockCheckItem_Ctl.cs" />
+ <Compile Include="DLL\ClsGy_ProjectMoney_Ctl.cs" />
<Compile Include="DLL\ClsGy_SupType_Ctl.cs" />
<Compile Include="DLL\ClsGy_SellStyle_Ctl.cs" />
<Compile Include="DLL\ClsGy_PostSkill_Ctl.cs" />
@@ -1069,6 +1074,7 @@
<Folder Include="Views\Sc_ProcExchSendWorkBill\" />
<Folder Include="Views\Sc_ProcExchWWSendWorkBill\" />
<Folder Include="Views\Sc_WorkBillAutoSortBillMain\" />
+ <Folder Include="Views\Sc_WorkBillMonthPlan\" />
<Folder Include="Views\Sc_WorkBillSortBill\" />
<Folder Include="Views\Sc_WorkDemandPlanBill\" />
<Folder Include="Views\Sup_AskPriceBill\" />
@@ -1121,10 +1127,10 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
- <WebReferenceUrl Include="http://192.168.63.20/WEBS-WMS/WebService1.asmx">
+ <WebReferenceUrl Include="http://192.168.63.53/WEBS-WMS/WebService1.asmx">
<UrlBehavior>Dynamic</UrlBehavior>
<RelPath>Web References\WebS\</RelPath>
- <UpdateFromURL>http://192.168.63.20/WEBS-WMS/WebService1.asmx</UpdateFromURL>
+ <UpdateFromURL>http://192.168.63.53/WEBS-WMS/WebService1.asmx</UpdateFromURL>
<ServiceLocationURL>
</ServiceLocationURL>
<CachedDynamicPropName>
--
Gitblit v1.9.1