From a5ad9f3d31609053bd0142de77a35d6aac1eb1bd Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期五, 06 二月 2026 14:36:48 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/WebTM.csproj | 27 +++++++++++++++++++++++++++
1 files changed, 27 insertions(+), 0 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index d23fb1c..1e5ed7d 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -192,6 +192,8 @@
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_EnvironmentTestItem.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_ErrMsgBackType.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_EnvironmentTestSchemeBillList.html" />
+ <Content Include="views\WMS鎵爜妯″潡\濮斿棰嗘枡\Kf_EntrustOutBackBill_CheckList_PDA.html" />
+ <Content Include="views\WMS鎵爜妯″潡\濮斿棰嗘枡\Kf_EntrustOutBackBill_Check_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\鐢熶骇棰嗘枡\Kf_MateOutBackBill_Check_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\鐢熶骇棰嗘枡\Kf_MateOutBackBill_CheckList_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\搴撳瓨杞Щ\KF_ICInventory_WorkShop_PDA.html" />
@@ -482,6 +484,7 @@
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_CostItemFixRate.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_CostItemAverageType.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_CostItemAverageType.html" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_HGy_BarCodeBill_XBarcode.aspx" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_HGy_BarCodeBill_ZB.aspx" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_HGy_BarCodeBill_MiddleBox.aspx" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Cj_StationOutBillList_HZ.aspx" />
@@ -649,8 +652,13 @@
<Content Include="views\搴旀敹绠＄悊\鎶ヨ〃鍒嗘瀽\Xs_SellOutCompareToProductReport.html" />
<Content Include="views\搴旀敹绠＄悊\鎶ヨ〃鍒嗘瀽\Xs_SeOrderBarCodeInAndOutStockDetailReport.html" />
<Content Include="views\搴旀敹绠＄悊\鎶ヨ〃鍒嗘瀽\YS_CusShouldIncomeMaterEntryReport.html" />
+<<<<<<< HEAD
+ <Content Include="views\鎴愭湰绠＄悊\鎴愭湰璐圭敤鍗昞CB_ItemMoneyBillList.html" />
+ <Content Include="views\鎴愭湰绠＄悊\鎴愭湰璐圭敤鍗昞CB_ItemMoneyBillEdit.html" />
+=======
<Content Include="views\鎴愭湰绠＄悊\璐圭敤鍗曞紩鍏CB_CostProjectImport.html" />
<Content Include="views\鎴愭湰绠＄悊\璐圭敤鍗曞紩鍏CB_ItemMoneyBillImport.html" />
+>>>>>>> 3744dfa85c558f1131afa9cf3cb6054884678c3c
<Content Include="views\鏉＄爜鏄庣粏\Kf_MateOutBillList_CodeDetail.html" />
<Content Include="views\妗堜緥浠ｇ爜\鍗庤繙\HY_HistogramReport_ForPCSCheckNote.html" />
<Content Include="views\妗堜緥浠ｇ爜\鍗庤繙\HY_HistogramReport.html" />
@@ -966,6 +974,7 @@
<Content Include="views\杞﹂棿绠＄悊\鍏抽敭浠剁粦瀹歕Sc_KeyElementBindingList.html" />
<Content Include="views\杞﹂棿绠＄悊\鍏抽敭浠剁粦瀹歕Sc_KeyElementBinding.html" />
<Content Include="views\杞﹂棿绠＄悊\鍗曞搧杩囩珯\SingleItemTransitList.html" />
+ <Content Include="views\杞﹂棿绠＄悊\鍗曞搧杩囩珯_灏忓崼\Cj_zuituoxiaowei_cacheList.html" />
<Content Include="views\杞﹂棿绠＄悊\鍗曞搧杩囩珯_灏忓崼\Cj_ProcessItemStationPlatform_ShippingExport.html" />
<Content Include="views\杞﹂棿绠＄悊\鍗曞搧杩囩珯_灏忓崼\Cj_SaveSNByICMO.html" />
<Content Include="views\杞﹂棿绠＄悊\鍗曞搧杩囩珯_灏忓崼\Cj_ProcessItemStationPlatform_generateSNCode.html" />
@@ -2725,6 +2734,24 @@
<Compile Include="App_Data\MssqlReportData.cs" />
<Compile Include="App_Data\ReportData.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
+ <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_HGy_BarCodeBill_MiddleBox.aspx.cs">
+ <DependentUpon>xmlLBM_HGy_BarCodeBill_MiddleBox.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_HGy_BarCodeBill_MiddleBox.aspx.designer.cs">
+ <DependentUpon>xmlLBM_HGy_BarCodeBill_MiddleBox.aspx</DependentUpon>
+ </Compile>
+ <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_HGy_BarCodeBill_XBarcode.aspx.cs">
+ <DependentUpon>xmlLBM_HGy_BarCodeBill_XBarcode.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <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_Sc_ProcessExchangeBillList_HZ.aspx.cs">
<DependentUpon>xmlLBM_Sc_ProcessExchangeBillList_HZ.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
--
Gitblit v1.9.1