From 43a843bc96530149741647cf6bc54b28a2cadba5 Mon Sep 17 00:00:00 2001
From: ch <37327@LLOOCCY>
Date: 星期日, 02 一月 2022 19:14:26 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI
---
WebTM/WebTM.csproj | 13 +++++++++++++
1 files changed, 13 insertions(+), 0 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 46f3c65..abaa193 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -124,7 +124,9 @@
<Content Include="views\PublicPage\transfer.html" />
<Content Include="views\ReportHtml.html" />
<Content Include="views\test\testRenderAutomationList.html" />
+ <Content Include="views\video\jingbao.wav" />
<Content Include="views\浠撳瓨绠＄悊\浠撳簱璋冩嫧\Kf_MoveStockStepOutBill_Fast.html" />
+ <Content Include="views\浠撳瓨绠＄悊\鍒嗘寮忚皟鍏ュ崟\Fb_StepFoldinBillList.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_OrderBackInfo.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_OrderBackInfo.html.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_OrderLev.html" />
@@ -167,6 +169,7 @@
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\grf\鍣ㄥ叿閲囪喘鍏ュ簱鍗�.grf" />
<Content Include="views\grf\璁惧妗ｆ.grf" />
<Content Include="views\grf\鍣ㄥ叿妗ｆ.grf" />
+ <Content Include="views\grf\閿�鍞��璐у崟.grf" />
<None Include="Web.Debug.config">
<DependentUpon>Web.config</DependentUpon>
</None>
@@ -578,6 +581,7 @@
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_EquipTypeBill.aspx" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Gy_Material.aspx" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_DepartmentList.html" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_ICStockBill.aspx" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_MouldDotCheckBill.aspx" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_MouldDotCheckPlanBill.aspx" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_MouldFileMainBill.aspx" />
@@ -609,6 +613,7 @@
<Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_StockCheckItemEdit.html" />
<Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_StockCheckItemList.html" />
<Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\InventoryAnalysis.html" />
+ <Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Sc_MouldStockBillMain_Temp.html" />
<Content Include="views\鍩虹璧勬枡\宸ヨ祫鍩虹璧勬枡\Gy_ProcPriceList.html" />
<Content Include="views\鍩虹璧勬枡\宸ヨ祫鍩虹璧勬枡\Gy_Group_Add_Edit.html" />
<Content Include="views\鍩虹璧勬枡\宸ヨ祫鍩虹璧勬枡\Gy_ProcPrice.html" />
@@ -780,6 +785,7 @@
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇姹囨姤鍗昞Sc_ICMOReportBill_FastNew.html" />
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇姹囨姤鍗昞Sc_Add_ICMOReportBillList.html" />
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇缁勮杩芥函鍗昞Sc_AssemblyBillList.html" />
+ <Content Include="views\鐢熶骇绠＄悊\鐢熶骇閫�搴撳崟\Sc_ProductionReturnList.html" />
<Content Include="views\鐢熶骇绠＄悊\缁勮鍗昞Sc_GroupOrderBillList.html" />
<Content Include="views\鐢熶骇绠＄悊\璐ㄩ噺姹囨姤鍗昞Sc_QualityReportBill.html" />
<Content Include="views\鐢熶骇绠＄悊\璐ㄩ噺姹囨姤鍗昞Sc_QualityReportBillList.html" />
@@ -1011,6 +1017,13 @@
<Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Gy_Department_Edit.aspx.designer.cs">
<DependentUpon>xmlLBM_Gy_Department_Edit.aspx</DependentUpon>
</Compile>
+ <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_ICStockBill.aspx.cs">
+ <DependentUpon>xmlLBM_ICStockBill.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_ICStockBill.aspx.designer.cs">
+ <DependentUpon>xmlLBM_ICStockBill.aspx</DependentUpon>
+ </Compile>
<Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_MouldDotCheckBill.aspx.cs">
<DependentUpon>xmlLBM_MouldDotCheckBill.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
--
Gitblit v1.9.1