From 5257299ce769be381da66f272635b12534e82ed1 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期五, 09 一月 2026 12:22:06 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/WebTM.csproj | 17 +++++++++++++++++
1 files changed, 17 insertions(+), 0 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index dd69725..cb44926 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -194,8 +194,10 @@
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_EnvironmentTestSchemeBillList.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_Driver.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_ItemMoney.html" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_CarList.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_DriverList.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Cg_ContractTransportBillEdit.html" />
+ <Content Include="views\鍖呰鍑哄叆搴撴槑缁哱Kf_PackStockDetailQuery.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_OperationBill_Report.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_MultipleCodes_Report.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_PlanImplementation_Report.html" />
@@ -472,6 +474,8 @@
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_MaterialPackingRelation_Edit.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_ItemMoney.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Cg_ContractTransportBillList.html" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_HGy_BarCodeBill_ZB.aspx" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_xiaoweizutuo.aspx" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_HGy_BarCodeBill_MiddleBox.aspx" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Sc_ProcessExchangeBillList_stock.aspx" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlzuotuo_xiaowei.aspx" />
@@ -701,6 +705,8 @@
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱Gy_BarCodeBillListLink.html" />
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱Sc_MouldMaintainRuleBill_Excel.html" />
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱Sc_MouldMaintainRuleBillList_PDA.html" />
+ <Content Include="views\鐗╂祦绠＄悊\杩愯緭瀹氫綅\Add_Edit_WL_YayBill.html" />
+ <Content Include="views\鐗╂祦绠＄悊\杩愯緭瀹氫綅\WL_YayBill.html" />
<Content Include="views\鐗╂祦绠＄悊\杩愯緭瀹氫綅\杞﹁締杞ㄨ抗琛╘Cg_CarTrajectoryBillList.html" />
<Content Include="views\鐗╂祦绠＄悊\杩愯緭瀹氫綅\杞﹁締杞ㄨ抗琛╘Cg_CarTrajectoryBillEdit.html">
<BrowseToURL>~/views/鐗╂祦绠＄悊/杩愯緭瀹氫綅/杞﹁締杞ㄨ抗琛�/Cg_CarTrajectoryBillEdit.html</BrowseToURL>
@@ -961,6 +967,7 @@
<Content Include="views\杞﹂棿绠＄悊\鍗曞搧杩囩珯_灏忓崼\Cj_ProcessItemStationPlatform_batch.html" />
<Content Include="views\杞﹂棿绠＄悊\鍗曞搧杩囩珯_灏忓崼\Cj_BlueToothBarCodePrint.html" />
<Content Include="views\杞﹂棿绠＄悊\鍗曞搧杩囩珯_灏忓崼\Cj_SachetBarCodePrint.html" />
+ <Content Include="views\杞﹂棿绠＄悊\鍗曞搧杩囩珯_灏忓崼\Cj_BarCodeBatchPrint.html" />
<Content Include="views\杞﹂棿绠＄悊\鍚姩鐐规鍗昞Gy_WorkBeginDotCheckListBill_Excel.html" />
<Content Include="views\杞﹂棿绠＄悊\鍚姩鐐规鍗昞Sc_WorkBeginDotCheckBill.html" />
<Content Include="views\杞﹂棿绠＄悊\鍚姩鐐规鍗昞Sc_WorkBeginDotCheckBillList.html" />
@@ -2701,6 +2708,16 @@
<Compile Include="App_Data\MssqlReportData.cs" />
<Compile Include="App_Data\ReportData.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
+ <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_HGy_BarCodeBill_ZB.aspx.cs">
+ <DependentUpon>xmlLBM_HGy_BarCodeBill_ZB.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_HGy_BarCodeBill_ZB.aspx.designer.cs">
+ <DependentUpon>xmlLBM_HGy_BarCodeBill_ZB.aspx</DependentUpon>
+ </Compile>
+ <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_xiaoweizutuo.aspx.designer.cs">
+ <DependentUpon>xmlLBM_xiaoweizutuo.aspx</DependentUpon>
+ </Compile>
<Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_HGy_BarCodeBill_MiddleBox.aspx.cs">
<DependentUpon>xmlLBM_HGy_BarCodeBill_MiddleBox.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
--
Gitblit v1.9.1