From 66692fe72e71ba61e7435d7fb258429eee44b8b5 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期日, 24 四月 2022 17:01:34 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/WebAPI.csproj | 41 +++++++++++++++++++++++++++++++++++++++--
1 files changed, 39 insertions(+), 2 deletions(-)
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index c9ba6e0..c840fc0 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -349,11 +349,24 @@
<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\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\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\Sc_JIT_ComplementGoodBillController.cs" />
+ <Compile Include="Controllers\SCGL\鏃ヨ鍒掔鐞哱JIT_CompleteController..cs" />
+ <Compile Include="Controllers\SCGL\Sc_WorkBillSortBillController.cs" />
<Compile Include="Controllers\Sc_PckSplitBillController.cs" />
<Compile Include="Controllers\GZGL\Gy_DuSubsidyItemBillController.cs" />
<Compile Include="Controllers\GZGL\Gy_WorkPayTypeBillController.cs" />
@@ -384,6 +397,7 @@
<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" />
@@ -505,7 +519,11 @@
<Compile Include="HttpClient.cs" />
<Compile Include="InvokeHelper.cs" />
<Compile Include="Log.cs" />
+ <Compile Include="Models\Cg_PODemandPlanBillMain.cs" />
+ <Compile Include="Models\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" />
@@ -518,9 +536,16 @@
<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\宸ヨ祫绠＄悊\ClsGy_ClassTimePrj_Model.cs" />
<Compile Include="Models\宸ヨ祫绠＄悊\ClsPay_GroupBalBillEmp.cs" />
<Compile Include="Models\宸ヨ祫绠＄悊\ClsPay_GroupBalBillMain.cs" />
@@ -767,8 +792,14 @@
<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\KF_ICInventoryList_WMSBill\" />
<Folder Include="Views\Kf_ICStockBillMain\" />
@@ -781,8 +812,14 @@
<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\" />
</ItemGroup>
<ItemGroup>
<WCFMetadata Include="Service References\" />
@@ -797,10 +834,10 @@
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
- <WebReferenceUrl Include="http://localhost/WEBS-WMS/WebService1.asmx">
+ <WebReferenceUrl Include="http://localhost:8098/WebService1.asmx">
<UrlBehavior>Dynamic</UrlBehavior>
<RelPath>Web References\WebS\</RelPath>
- <UpdateFromURL>http://localhost/WEBS-WMS/WebService1.asmx</UpdateFromURL>
+ <UpdateFromURL>http://localhost:8098/WebService1.asmx</UpdateFromURL>
<ServiceLocationURL>
</ServiceLocationURL>
<CachedDynamicPropName>
--
Gitblit v1.9.1