From 82acca8da21ca12e7a48478ccc72abb0aee9ceb6 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期五, 25 十月 2024 12:05:14 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/WebTM.csproj | 23 +++++++++++++++++++++++
1 files changed, 23 insertions(+), 0 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 5d2f2e3..8debef8 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -269,6 +269,8 @@
<Content Include="views\WMS鎵爜妯″潡\鍏朵粬鍑哄簱\Kf_OtherOutBillList_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\鍑洪棬纭鍗昞Xs_OutDoorCheckBillList_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\鍑洪棬纭鍗昞Xs_OutDoorCheckBill_PDA.html" />
+ <Content Include="views\WMS鎵爜妯″潡\鍑洪棬纭鍗昣鏂癨Xs_OutDoorBill_PDA.html" />
+ <Content Include="views\WMS鎵爜妯″潡\鍑洪棬纭鍗昣鏂癨Xs_OutDoorBillList_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\濮斿鍏ュ簱\Kf_EntrustInBackBillList_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\濮斿鍏ュ簱\Kf_EntrustInBillList_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\濮斿鍏ュ簱\Kf_EntrustInBill_PDA.html" />
@@ -381,9 +383,11 @@
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_HPOInStockBillByID.aspx" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_HSeOutStockBillListByID.aspx" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Kf_SellOutBillListByID.aspx" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Sc_ICMOBillListTK.aspx" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Sc_ICMOReportBillList2.aspx" />
<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_Xs_SeOrderBill_StockInCodeNote.aspx" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlSRM_Web_BarCodeBillList.aspx" />
<Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_DotCheckItemMethodEdit.html" />
@@ -408,6 +412,7 @@
<Content Include="views\宸ヨ祫绠＄悊\宸ヨ祫杩愮畻\Pay_SalaryCalculate_New.html" />
<Content Include="views\宸ヨ祫绠＄悊\鎶�鑳借�冩牳\HR_EmployeeSkillExamBill.html" />
<Content Include="views\宸ヨ祫绠＄悊\鎶�鑳借�冩牳\HR_EmployeeSkillExamBillList.html" />
+ <Content Include="views\搴旀敹绠＄悊\鎶ヨ〃鍒嗘瀽\Xs_OutDoorBillReport.html" />
<Content Include="views\搴旀敹绠＄悊\鎶ヨ〃鍒嗘瀽\Xs_SeOrderBarCodeInAndOutStockDetailReport.html" />
<Content Include="views\鏉＄爜鏄庣粏\Kf_MateOutBillList_CodeDetail.html" />
<Content Include="views\妯℃不鍏风鐞哱鍣ㄥ叿鎶ヨ〃\Sc_MouldLifeUsePicReport.html" />
@@ -466,6 +471,7 @@
<Content Include="views\璁″垝绠＄悊\Excel\Gy_Group_Excel.html" />
<Content Include="views\璁″垝绠＄悊\宸ヨ壓璺嚎\Gy_RoutingBillCheckQuery.html" />
<Content Include="views\璁″垝绠＄悊\宸ヨ壓璺嚎\Gy_RoutingBillCloseList.html" />
+ <Content Include="views\璁″垝绠＄悊\宸ヨ壓璺嚎\Gy_RoutingBillToInvalidatedList.html" />
<Content Include="views\璁″垝绠＄悊\宸ヨ壓璺嚎\Pay_ProcPriceTypeChangeReport.html" />
<Content Include="views\璁惧绠＄悊\Sb_Add_EquipRepairSignBillList.html" />
<Content Include="views\璁惧绠＄悊\Sb_EquipRepairSignBillList_PDA.html" />
@@ -552,6 +558,7 @@
<Content Include="views\杞﹂棿绠＄悊\浜х嚎\Sc_ProcessReportList_Last.html" />
<Content Include="views\杞﹂棿绠＄悊\浜х嚎\Sc_StationInBillList.html" />
<Content Include="views\杞﹂棿绠＄悊\浜х嚎\test.html" />
+ <Content Include="views\杞﹂棿绠＄悊\鍏抽敭浠剁粦瀹歕Sc_KeyElementBindingList.html" />
<Content Include="views\杞﹂棿绠＄悊\鍏抽敭浠剁粦瀹歕Sc_KeyElementBinding.html" />
<Content Include="views\杞﹂棿绠＄悊\鍗曞搧杩囩珯\SingleItemTransitList.html" />
<Content Include="views\杞﹂棿绠＄悊\鍚姩鐐规鍗昞Sc_WorkBeginDotCheckBill.html" />
@@ -599,6 +606,8 @@
<Content Include="views\閲囪喘绠＄悊\閲囪喘鎶ヨ〃\Cg_POOrderBillProcessSumReport.html" />
<Content Include="views\閲囪喘绠＄悊\閲囪喘璁㈠崟\Cg_POOrderBillCheckQuery.html" />
<Content Include="views\閲囪喘绠＄悊\閲囪喘璁㈠崟\Cg_POOrderBillQuery.html" />
+ <Content Include="views\閿�鍞鐞哱鍑洪棬纭鍗昣鏂癨Xs_OutDoorBill.html" />
+ <Content Include="views\閿�鍞鐞哱鍑洪棬纭鍗昣鏂癨Xs_OutDoorBillList.html" />
<Content Include="views\閿�鍞鐞哱鍙戣揣閫氱煡鍗昞Xs_SeOutStockBillQuery.html" />
<Content Include="views\閿�鍞鐞哱搴旀敹鍗昞Xs_ReceivableBillQuery.html" />
<Content Include="views\閿�鍞鐞哱鏀舵鍗昞YS_ReceiveBillQuery.html" />
@@ -2356,6 +2365,13 @@
<Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Pay_WorkTimesBillList.aspx.designer.cs">
<DependentUpon>xmlLBM_Pay_WorkTimesBillList.aspx</DependentUpon>
</Compile>
+ <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Sc_ICMOBillListTK.aspx.cs">
+ <DependentUpon>xmlLBM_Sc_ICMOBillListTK.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Sc_ICMOBillListTK.aspx.designer.cs">
+ <DependentUpon>xmlLBM_Sc_ICMOBillListTK.aspx</DependentUpon>
+ </Compile>
<Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Sc_ICMOReportBillList2.aspx.cs">
<DependentUpon>xmlLBM_Sc_ICMOReportBillList2.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
@@ -2384,6 +2400,13 @@
<Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_QC_TakeSampleCheckBillMainList.aspx.designer.cs">
<DependentUpon>xmlLBM_QC_TakeSampleCheckBillMainList.aspx</DependentUpon>
</Compile>
+ <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Xs_OutDoorBillList.aspx.cs">
+ <DependentUpon>xmlLBM_Xs_OutDoorBillList.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Xs_OutDoorBillList.aspx.designer.cs">
+ <DependentUpon>xmlLBM_Xs_OutDoorBillList.aspx</DependentUpon>
+ </Compile>
<Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Xs_SellOutChangeBillList.aspx.cs">
<DependentUpon>xmlLBM_Xs_SellOutChangeBillList.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
--
Gitblit v1.9.1