From 008b87701b0b3d6a18fad024ee426f1688fb5ff4 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期四, 27 三月 2025 16:14:05 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/WebTM.csproj | 11 +++++++++++
1 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 6ec2bb1..5f85a76 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -310,6 +310,7 @@
<Content Include="views\WMS鎵爜妯″潡\濮斿棰嗘枡\Kf_EntrustOutBill_Check_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\瀹㈡埛鏉＄爜鎵弿\Gy_getCusBarCodeBillList.html" />
<Content Include="views\WMS鎵爜妯″潡\瀹㈡埛鏉＄爜鎵弿\Gy_getCusBarCodeBillList_BarCodeList.html" />
+ <Content Include="views\WMS鎵爜妯″潡\瀹㈡埛鏉＄爜鎵弿\Gy_getCusBarCodeBillList_BarCodeList_Batch.html" />
<Content Include="views\WMS鎵爜妯″潡\瀹㈡埛鏉＄爜鎵弿\Gy_getCusBarCodeBill_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\瀹㈡埛鏉＄爜鎵弿\Gy_getCusBarCodeBillList_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\搴撳瓨鏌ヨ\KF_ICInventoryByCLD_PDA.html" />
@@ -450,6 +451,7 @@
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_HPOStockInBill.aspx" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_HPOInStockBillByID.aspx" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_HSeOutStockBillListByID.aspx" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Kf_ProductReceiveMaterialBillList.aspx" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Kf_SellOutBillListByID.aspx" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Sc_ICMOBillListTK.aspx" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Sc_ICMOReportBillList2.aspx" />
@@ -778,6 +780,7 @@
<Content Include="views\閲囪喘绠＄悊\閲囪喘鎶ヨ〃\Cg_POMaterialPriceReport.html" />
<Content Include="views\閲囪喘绠＄悊\閲囪喘鎶ヨ〃\Cg_POOrderBillProcessSumReport.html" />
<Content Include="views\閲囪喘绠＄悊\閲囪喘鎶ヨ〃\Cg_POOrderInStockSumReport.html" />
+ <Content Include="views\閲囪喘绠＄悊\閲囪喘鏍搁攢\Cg_POStockInBillList_Sec.html" />
<Content Include="views\閲囪喘绠＄悊\閲囪喘璁㈠崟\Cg_POOrderBillCheckQuery.html" />
<Content Include="views\閲囪喘绠＄悊\閲囪喘璁㈠崟\Cg_POOrderBillQuery.html" />
<Content Include="views\閲囪喘绠＄悊\閲囪喘璁㈠崟鍙樻洿鍗昞Cg_POOrderChangeBill.html" />
@@ -796,6 +799,7 @@
<Content Include="views\閿�鍞鐞哱閿�鍞姤浠峰崟\Xs_SeQuotationBillMain.html" />
<Content Include="views\閿�鍞鐞哱閿�鍞姤浠峰崟\Xs_SeQuotationBillMainList.html" />
<Content Include="views\閿�鍞鐞哱閿�鍞姤琛╘Xs_SeOrderOutStockSumReport.html" />
+ <Content Include="views\閿�鍞鐞哱閿�鍞牳閿�\XS_SellOutBillList_Sec.html" />
<Content Include="views\閿�鍞鐞哱閿�鍞鍗昞Xs_SeOrderBillQuery.html" />
<Content Include="views\椤圭洰绠＄悊\鍩虹寤烘ā\Add_Edit_PM_CustomerProInfoBill.html" />
<Content Include="views\椤圭洰绠＄悊\鍩虹寤烘ā\Add_Edit_Gy_TaskClass.html" />
@@ -2542,6 +2546,13 @@
<Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Kf_ICStockBackBillList.aspx.designer.cs">
<DependentUpon>xmlLBM_Kf_ICStockBackBillList.aspx</DependentUpon>
</Compile>
+ <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Kf_ProductReceiveMaterialBillList.aspx.cs">
+ <DependentUpon>xmlLBM_Kf_ProductReceiveMaterialBillList.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Kf_ProductReceiveMaterialBillList.aspx.designer.cs">
+ <DependentUpon>xmlLBM_Kf_ProductReceiveMaterialBillList.aspx</DependentUpon>
+ </Compile>
<Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Kf_SellOutBillListByID.aspx.cs">
<DependentUpon>xmlLBM_Kf_SellOutBillListByID.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
--
Gitblit v1.9.1