From 859899d82327ebf529aaa1135e681716502b62c3 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期三, 26 三月 2025 15:04:22 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/WebTM.csproj | 21 +++++++++++++++++++++
1 files changed, 21 insertions(+), 0 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index ccd31a4..e9a053e 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -105,6 +105,7 @@
<Content Include="layuiadmin\ext\tableFilter.js" />
<Content Include="layuiadmin\ext\tableMerge.js" />
<Content Include="layuiadmin\grwebapp.js" />
+ <Content Include="layuiadmin\layui\css\layui2.10.0.css" />
<Content Include="layuiadmin\layui\layui.js" />
<Content Include="layuiadmin\layui\layui2.10.0.js" />
<Content Include="layuiadmin\modules\treeTable.js" />
@@ -455,6 +456,8 @@
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Sc_ICMOReportBillList.aspx" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_QC_TakeSampleCheckBillMainList.aspx" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Xs_OutDoorBillList.aspx" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_HPOStockInChangeBillList.aspx" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_HPOOrderChangeBillList.aspx" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Xs_SeOrderBill_StockInCodeNote.aspx" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlSRM_Web_BarCodeBillList.aspx" />
<Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_DotCheckItemMethod_Excel.html" />
@@ -769,6 +772,10 @@
<Content Include="views\閲囪喘绠＄悊\閲囪喘鎶ヨ〃\Cg_POOrderInStockSumReport.html" />
<Content Include="views\閲囪喘绠＄悊\閲囪喘璁㈠崟\Cg_POOrderBillCheckQuery.html" />
<Content Include="views\閲囪喘绠＄悊\閲囪喘璁㈠崟\Cg_POOrderBillQuery.html" />
+ <Content Include="views\閲囪喘绠＄悊\閲囪喘璁㈠崟鍙樻洿鍗昞Cg_POOrderChangeBill.html" />
+ <Content Include="views\閲囪喘绠＄悊\閲囪喘璁㈠崟鍙樻洿鍗昞Cg_POOrderChangeBillList.html" />
+ <Content Include="views\閲囪喘绠＄悊\閲囪喘璋冧环鍗昞Cg_POStockInChangeBill.html" />
+ <Content Include="views\閲囪喘绠＄悊\閲囪喘璋冧环鍗昞Cg_POStockInChangeBillList.html" />
<Content Include="views\閿�鍞鐞哱鍑洪棬纭鍗昣鏂癨Xs_OutDoorBill.html" />
<Content Include="views\閿�鍞鐞哱鍑洪棬纭鍗昣鏂癨Xs_OutDoorBillList.html" />
<Content Include="views\閿�鍞鐞哱鍙戣揣閫氱煡鍗昞Xs_SeOutStockBillQuery.html" />
@@ -2590,6 +2597,20 @@
<Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Xs_OutDoorBillList.aspx.designer.cs">
<DependentUpon>xmlLBM_Xs_OutDoorBillList.aspx</DependentUpon>
</Compile>
+ <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_HPOStockInChangeBillList.aspx.cs">
+ <DependentUpon>xmlLBM_HPOStockInChangeBillList.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_HPOStockInChangeBillList.aspx.designer.cs">
+ <DependentUpon>xmlLBM_HPOStockInChangeBillList.aspx</DependentUpon>
+ </Compile>
+ <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_HPOOrderChangeBillList.aspx.cs">
+ <DependentUpon>xmlLBM_HPOOrderChangeBillList.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_HPOOrderChangeBillList.aspx.designer.cs">
+ <DependentUpon>xmlLBM_HPOOrderChangeBillList.aspx</DependentUpon>
+ </Compile>
<Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Xs_SellOutChangeBillList.aspx.cs">
<DependentUpon>xmlLBM_Xs_SellOutChangeBillList.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
--
Gitblit v1.9.1