From 3b5b27c8efa2bfb66eec07a1efd7a1f47cc029e6 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期三, 30 十一月 2022 15:20:06 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI
---
WebTM/WebTM.csproj | 24 +++++++++++++++++++++++-
1 files changed, 23 insertions(+), 1 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 28c0c73..3217f97 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -111,12 +111,17 @@
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_QCCheckProjectListView.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_RoutingBillList.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_RoutingGroup.html" />
+ <Content Include="views\Baseset\鍩虹璧勬枡\Gy_TechnologyParameterList.html" />
+ <Content Include="views\Baseset\鍩虹璧勬枡\Gy_TechParameterUnitList.html" />
+ <Content Include="views\Baseset\鍩虹璧勬枡\Gy_StockPlaceListNew.html" />
+ <Content Include="views\Baseset\鍩虹璧勬枡\Gy_UnitGroup.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_WarehouseListNew.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_WasterWHList.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_WHList.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_WWBadWHList.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_WWWasterWHList.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_WarehouseList_JIT.html" />
+ <Content Include="views\Baseset\鍩虹璧勬枡\OtherOutRequestBillList.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Sc_ICMOBillListView2.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Sc_ProcessExchangeBillListView.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_QCCheckItemListView.html" />
@@ -182,12 +187,13 @@
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_ConkType.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_PackType.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_PackType.html" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Sc_ProcessExchangeBillList_SubList.aspx" />
<Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_MateMouldList.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_TechnologyParameterUnitList.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_TechnologyParameterUnit_Add_Edit_.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_TechnologyParameter_Add_Edit_.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_TechParamByProcList.html" />
- <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_TechParamByProcList_Add_Edit_.html" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_TechParamByProc.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_WorkCenterDyCol.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_WorkPayType.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_WorkStationList.html" />
@@ -718,6 +724,7 @@
<Content Include="views\鍩虹璧勬枡\鏁版嵁瀛楀吀\Xt_DataDictionary_TableList.html" />
<Content Include="views\鍩虹璧勬枡\鐢熶骇鍩虹璧勬枡\Add_Edit_Gy_Process.html" />
<Content Include="views\鍩虹璧勬枡\鐢熶骇鍩虹璧勬枡\Gy_SOPBill.html" />
+ <Content Include="views\鍩虹璧勬枡\鐢熶骇鍩虹璧勬枡\Gy_SOPBillEdit.html" />
<Content Include="views\鍩虹璧勬枡\鐢熶骇鍩虹璧勬枡\Gy_SOPBillList.html" />
<Content Include="views\鍩虹璧勬枡\閲囪喘鍩虹璧勬枡\Gy_Supplier_Edit.html" />
<Content Include="views\鍩虹璧勬枡\閿�鍞熀纭�璧勬枡\Gy_Customer_Edit.html" />
@@ -912,6 +919,7 @@
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇涓婃枡鍗昞Sc_MaterToSourceBillList - 澶嶅埗.html" />
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇涓婃枡鍗昞Sc_MaterToSourceBillList.html" />
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇浠诲姟鍗昞Sc_ICMOBillEdit.html" />
+ <Content Include="views\鐢熶骇绠＄悊\鐢熶骇浠诲姟鍗昞Sc_ICMOBillEdit_NoTable.html" />
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇浠诲姟鍗昞Sc_ICMOBillImport.html" />
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇鍋滃伐鍗昞Sc_Add_MESStopWorkBillList - 澶嶅埗.html" />
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇鍋滃伐鍗昞Sc_Add_MESStopWorkBillList.html" />
@@ -1027,6 +1035,7 @@
<Content Include="views\璐ㄩ噺绠＄悊\浜у搧鍏ュ簱妫�楠屽崟\QC_LastPieceCheckBillList.html" />
<Content Include="views\璐ㄩ噺绠＄悊\鍑哄巶妫�楠屽崟\QC_OutCompCheckBillList.html" />
<Content Include="views\璐ㄩ噺绠＄悊\宸℃璁板綍鍗昞QC_PatrolProcCheckBillList.html" />
+ <Content Include="views\璐ㄩ噺绠＄悊\鏉ユ枡妫�楠屽崟\Kf_SCStockInCheckBill_Fast.html" />
<Content Include="views\璐ㄩ噺绠＄悊\鏉ユ枡妫�楠屽崟\Kf_QCStockInCheckBill_Fast.html" />
<Content Include="views\璐ㄩ噺绠＄悊\鏉ユ枡妫�楠屽崟\QC_Add_Edit_POStockInCheckBillList.html" />
<Content Include="views\璐ㄩ噺绠＄悊\鏉ユ枡妫�楠屽崟\QC_Add_Edit_POStockInCheckBill.html" />
@@ -1086,6 +1095,10 @@
<Content Include="views\棰嗘枡鍙戣揣\濮斿鍑哄簱\Kf_EntrustOutBillList.html" />
<Content Include="views\棰嗘枡鍙戣揣\鏀舵枡鍏ュ簱\Kf_ReciveBill_Check.html" />
<Content Include="views\棰嗘枡鍙戣揣\鏀舵枡鍏ュ簱\Kf_ReciveBill_Fast.html" />
+ <Content Include="views\棰嗘枡鍙戣揣\鐢熶骇琛ユ枡\Kf_MateReplenishOutBill_Check_New.html" />
+ <Content Include="views\棰嗘枡鍙戣揣\鐢熶骇琛ユ枡\Kf_MateReplenishOutBill_CheckList_New.html" />
+ <Content Include="views\棰嗘枡鍙戣揣\閿�鍞嚭搴揬Kf_SellOutBill_CheckList_New.html" />
+ <Content Include="views\棰嗘枡鍙戣揣\閿�鍞嚭搴揬Kf_SellOutBill_Check_New.html" />
<Content Include="views\棰嗘枡鍙戣揣\棰嗘枡鍑哄簱\Kf_MateOutBackBillEdit.html" />
<Content Include="views\棰嗘枡鍙戣揣\棰嗘枡鍑哄簱\Kf_MateOutBackBill_Fast.html" />
<Content Include="views\棰嗘枡鍙戣揣\棰嗘枡鍑哄簱\Kf_MateOutBillLEdit.html" />
@@ -1093,6 +1106,7 @@
<Content Include="views\棰嗘枡鍙戣揣\棰嗘枡鍑哄簱\Kf_MateOutBill_FastCheck.html" />
<Content Include="views\棰嗘枡鍙戣揣\棰嗘枡鍑哄簱\Kf_MateOutBill_CheckList_New.html" />
<Content Include="views\棰嗘枡鍙戣揣\棰嗘枡鍑哄簱\Kf_MateOutBill_Check_New.html" />
+ <Content Include="views\楠屾敹鍏ュ簱\浜у搧鍏ュ簱\Kf_ICStockBillSub_WMS_List.html" />
<Content Include="views\楠屾敹鍏ュ簱\浜у搧鍏ュ簱\Kf_ProductInBillList.html" />
<Content Include="views\楠屾敹鍏ュ簱\鍏朵粬鍏ュ簱\Kf_OtherInBillList.html" />
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱Kf_ProductInBillList.html" />
@@ -1465,6 +1479,13 @@
<Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Sc_ProcessExchangeBillList.aspx.designer.cs">
<DependentUpon>xmlLBM_Sc_ProcessExchangeBillList.aspx</DependentUpon>
</Compile>
+ <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Sc_ProcessExchangeBillList_SubList.aspx.cs">
+ <DependentUpon>xmlLBM_Sc_ProcessExchangeBillList_SubList.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Sc_ProcessExchangeBillList_SubList.aspx.designer.cs">
+ <DependentUpon>xmlLBM_Sc_ProcessExchangeBillList_SubList.aspx</DependentUpon>
+ </Compile>
<Compile Include="views\鐢熶骇宸ュ簭绠＄悊\宸ュ簭姹囨姤鍗昞xmlLBM_ProcessReport.aspx.cs">
<DependentUpon>xmlLBM_ProcessReport.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
@@ -1474,6 +1495,7 @@
</Compile>
</ItemGroup>
<ItemGroup>
+ <Folder Include="Files\" />
<Folder Include="views\浠撳瓨绠＄悊\璋冩嫧鍗曟牳瀵筡" />
<Folder Include="views\浠撳瓨绠＄悊\璋冩嫧鍗曠ń鏍竆" />
</ItemGroup>
--
Gitblit v1.9.1