From 5e5bef3f5b55a7e052f0d271328b1d670b5f9384 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期三, 18 五月 2022 09:13:11 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI
---
WebTM/WebTM.csproj | 28 ++++++----------------------
1 files changed, 6 insertions(+), 22 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index d625846..28cdb6f 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -206,8 +206,8 @@
<Content Include="views\grf\澧欏挃鏉＄爜.grf" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\grf\鐢熶骇鍗�.grf" />
<Content Include="views\grf\鐢熶骇鍗�.grf" />
- <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>
@@ -646,10 +646,8 @@
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_MouldProdMoveStockBill.aspx" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_MouldProdOutStockBill.aspx" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_MouldTypeBill.aspx" />
- <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_QK_BZPackingBillList.aspx" />
- <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_QK_HXPackingBillList.aspx" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_QK_PackingBillList.aspx" />
- <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_QK_WLPackingBillList.aspx" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_QK_SPackingBillList.aspx" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Sc_ICMOBillList.aspx" />
<Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_ConkReasonEdit.html" />
<Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_ConkReasonList.html" />
@@ -1311,20 +1309,6 @@
<Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_MouldTypeBill.aspx.designer.cs">
<DependentUpon>xmlLBM_MouldTypeBill.aspx</DependentUpon>
</Compile>
- <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_QK_BZPackingBillList.aspx.cs">
- <DependentUpon>xmlLBM_QK_BZPackingBillList.aspx</DependentUpon>
- <SubType>ASPXCodeBehind</SubType>
- </Compile>
- <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_QK_BZPackingBillList.aspx.designer.cs">
- <DependentUpon>xmlLBM_QK_BZPackingBillList.aspx</DependentUpon>
- </Compile>
- <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_QK_HXPackingBillList.aspx.cs">
- <DependentUpon>xmlLBM_QK_HXPackingBillList.aspx</DependentUpon>
- <SubType>ASPXCodeBehind</SubType>
- </Compile>
- <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_QK_HXPackingBillList.aspx.designer.cs">
- <DependentUpon>xmlLBM_QK_HXPackingBillList.aspx</DependentUpon>
- </Compile>
<Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_QK_PackingBillList.aspx.cs">
<DependentUpon>xmlLBM_QK_PackingBillList.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
@@ -1332,12 +1316,12 @@
<Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_QK_PackingBillList.aspx.designer.cs">
<DependentUpon>xmlLBM_QK_PackingBillList.aspx</DependentUpon>
</Compile>
- <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_QK_WLPackingBillList.aspx.cs">
- <DependentUpon>xmlLBM_QK_WLPackingBillList.aspx</DependentUpon>
+ <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_QK_SPackingBillList.aspx.cs">
+ <DependentUpon>xmlLBM_QK_SPackingBillList.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
- <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_QK_WLPackingBillList.aspx.designer.cs">
- <DependentUpon>xmlLBM_QK_WLPackingBillList.aspx</DependentUpon>
+ <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_QK_SPackingBillList.aspx.designer.cs">
+ <DependentUpon>xmlLBM_QK_SPackingBillList.aspx</DependentUpon>
</Compile>
<Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Sc_ICMOBillList.aspx.cs">
<DependentUpon>xmlLBM_Sc_ICMOBillList.aspx</DependentUpon>
--
Gitblit v1.9.1