From 42eed0b0d21fe04eb375393e2d2fe098bdea6f0b Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期三, 18 六月 2025 20:52:43 +0800
Subject: [PATCH] 销售出库调整

---
 WebTM/WebTM.csproj |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index ae74ea3..5ece8ec 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -403,6 +403,7 @@
     <Content Include="views\浠撳瓨绠$悊\浠撳簱璋冩嫧\Add_Edit_Kf_MoveStockBill.html" />
     <Content Include="views\浠撳瓨绠$悊\鍒嗘寮忚皟鍏ュ崟\Fb_StepFoldinBillEdit.html" />
     <Content Include="views\浠撳瓨绠$悊\鏉$爜搴撳瓨\KF_PonderationBillMain_Temp.html" />
+    <Content Include="views\浠撳瓨绠$悊\鏉$爜鎶ヨ〃\Kf_StockInOutEntryByPageReport.html" />
     <Content Include="views\浠撳瓨绠$悊\鏉$爜鎶ヨ〃\KF_StockInOutEntryReport.html" />
     <Content Include="views\浠撳瓨绠$悊\鏉$爜鎶ヨ〃\KF_StockInOutRecordReport.html" />
     <Content Include="views\浠撳瓨绠$悊\鏉$爜鎶ヨ〃\Kf_SellOutBarTraceReport.html" />
@@ -616,6 +617,7 @@
     <Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱Gy_MouldFile_Excel.html" />
     <Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱Sc_MouldMaintainRuleBill_Excel.html" />
     <Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱Sc_MouldMaintainRuleBillList_PDA.html" />
+    <Content Include="views\鐢熶骇绠$悊\涓夊崌鎺掍骇\JIT_DayPlanPlatForm_Sec.html" />
     <Content Include="views\鐢熶骇绠$悊\涓夊崌鎺掍骇\JIT_DayPlanPlatForm.html" />
     <Content Include="views\鐢熶骇绠$悊\涓夊崌鎺掍骇\JIT_DayPlanPlatFormImport_SS_Sec.html" />
     <Content Include="views\鐢熶骇绠$悊\涓夊崌鎺掍骇\JIT_DayPlanPlatFormImport_SS.html" />
@@ -653,11 +655,8 @@
     <Content Include="views\鐢熶骇绠$悊\鏃ヨ鍒掑熀纭�璧勬枡\JIT_NeedMaterPlanConfigBill_Excel.html" />
     <Content Include="views\鐢熶骇绠$悊\鏃ヨ鍒掓姤琛╘JIT_DayPlanPlatFormHistoryNoteReport.html" />
     <Content Include="views\鐢熶骇绠$悊\鏃ヨ鍒掓姤琛╘JIT_FuHeFenXiReportDetail.html" />
-<<<<<<< HEAD
     <Content Include="views\鐢熶骇绠$悊\鏃ヨ鍒掓姤琛╘ReportMOMaterReadysBillTotalList.html" />
-=======
     <Content Include="views\鐢熶骇绠$悊\娆犳枡杩愮畻\JIT_MaterialLevelShorAnalysisReport_His.html" />
->>>>>>> 0adef152d8494601c9665fd2d690774c662a02fd
     <Content Include="views\鐢熶骇绠$悊\娆犳枡杩愮畻\JIT_MaterialLevelShorAnalysis.html" />
     <Content Include="views\鐢熶骇绠$悊\娆犳枡杩愮畻\JIT_MaterialLevelShorAnalysisDetailReport.html" />
     <Content Include="views\鐢熶骇绠$悊\娆犳枡杩愮畻\JIT_MaterialLevelShorAnalysisReport.html" />
@@ -878,6 +877,7 @@
     <Content Include="views\閲囪喘绠$悊\閲囪喘鎶ヨ〃\Cg_POMaterialPriceReport.html" />
     <Content Include="views\閲囪喘绠$悊\閲囪喘鎶ヨ〃\Cg_POOrderBillProcessSumReport.html" />
     <Content Include="views\閲囪喘绠$悊\閲囪喘鎶ヨ〃\Cg_POOrderInStockSumReport.html" />
+    <Content Include="views\閲囪喘绠$悊\閲囪喘鎶ヨ〃\Cg_PoOrderInStockSumReport_QX.html" />
     <Content Include="views\閲囪喘绠$悊\閲囪喘鏍搁攢\Cg_POStockInBillList_Sec.html" />
     <Content Include="views\閲囪喘绠$悊\閲囪喘璁㈠崟\Cg_POOrderBillCheckQuery.html" />
     <Content Include="views\閲囪喘绠$悊\閲囪喘璁㈠崟\Cg_POOrderBillQuery.html" />
@@ -897,6 +897,7 @@
     <Content Include="views\閿�鍞鐞哱閿�鍞悎鍚孿Xs_ContractBillList.html" />
     <Content Include="views\閿�鍞鐞哱閿�鍞姤浠峰崟\Xs_SeQuotationBillMain.html" />
     <Content Include="views\閿�鍞鐞哱閿�鍞姤浠峰崟\Xs_SeQuotationBillMainList.html" />
+    <Content Include="views\閿�鍞鐞哱閿�鍞姤琛╘Xs_SeOrderOutStockSumReport_QX.html" />
     <Content Include="views\閿�鍞鐞哱閿�鍞姤琛╘Xs_SeOrderOutStockSumReport.html" />
     <Content Include="views\閿�鍞鐞哱閿�鍞牳閿�\XS_SellOutBillList_Sec.html" />
     <Content Include="views\閿�鍞鐞哱閿�鍞鍗昞Xs_SeOrderBillQuery.html" />

--
Gitblit v1.9.1