From 4c57c18db819292c1c6e29fec84ad5788a1c58a8 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期二, 16 一月 2024 12:26:33 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI

---
 WebTM/WebTM.csproj |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index f678029..d75c0a4 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -307,6 +307,7 @@
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\HBarPlanPrint_GXPG.html" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Kf_SellOutBillList.aspx" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Kf_SellOutBillList_BarCodeNote.aspx" />
+    <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_HPOInStockBackBill.aspx" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Sc_ICMOChangeBillList.aspx" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Sc_ProcessExchangeArrangement.aspx" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Kf_MateOutBillList.aspx" />
@@ -650,6 +651,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>
@@ -1747,6 +1749,13 @@
     <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Kf_SellOutBillList_BarCodeNote.aspx.designer.cs">
       <DependentUpon>xmlLBM_Kf_SellOutBillList_BarCodeNote.aspx</DependentUpon>
     </Compile>
+    <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_HPOInStockBackBill.aspx.cs">
+      <DependentUpon>xmlLBM_HPOInStockBackBill.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_HPOInStockBackBill.aspx.designer.cs">
+      <DependentUpon>xmlLBM_HPOInStockBackBill.aspx</DependentUpon>
+    </Compile>
     <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Sc_ICMOChangeBillList.aspx.cs">
       <DependentUpon>xmlLBM_Sc_ICMOChangeBillList.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>

--
Gitblit v1.9.1