From 4721683ab6756b47ee3c0cf82b0a27e0be643f48 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期一, 06 一月 2025 15:56:49 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI

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

diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index c7fa0b5..1bb9e33 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -285,6 +285,7 @@
     <Content Include="views\WMS鎵爜妯″潡\鍏朵粬鍏ュ簱\Kf_OtherInBill_PDA.html" />
     <Content Include="views\WMS鎵爜妯″潡\鍏朵粬鍏ュ簱\Kf_OtherInBillList_PDA.html" />
     <Content Include="views\WMS鎵爜妯″潡\鍏朵粬鍏ュ簱\Kf_OtherInBill_CheckList_PDA.html" />
+    <Content Include="views\WMS鎵爜妯″潡\鍏朵粬鍑哄簱\Kf_OtherOutBill_Check_PDA.html" />
     <Content Include="views\WMS鎵爜妯″潡\鍏朵粬鍑哄簱\Kf_OtherOutBill_CheckList_PDA.html" />
     <Content Include="views\WMS鎵爜妯″潡\鍏朵粬鍑哄簱\Kf_OtherOutBill_PDA.html" />
     <Content Include="views\WMS鎵爜妯″潡\鍏朵粬鍑哄簱\Kf_OtherOutBackBillList_PDA.html" />
@@ -296,10 +297,12 @@
     <Content Include="views\WMS鎵爜妯″潡\濮斿鍏ュ簱\Kf_EntrustInBackBillList_PDA.html" />
     <Content Include="views\WMS鎵爜妯″潡\濮斿鍏ュ簱\Kf_EntrustInBillList_PDA.html" />
     <Content Include="views\WMS鎵爜妯″潡\濮斿鍏ュ簱\Kf_EntrustInBill_PDA.html" />
+    <Content Include="views\WMS鎵爜妯″潡\濮斿琛ユ枡\Kf_EntrustReplenishOutBill_Check_PDA.html" />
     <Content Include="views\WMS鎵爜妯″潡\濮斿琛ユ枡\Kf_EntrustReplenishOutBill_CheckList_PDA.html" />
     <Content Include="views\WMS鎵爜妯″潡\濮斿棰嗘枡\Kf_EntrustOutBackBillList_PDA.html" />
     <Content Include="views\WMS鎵爜妯″潡\濮斿棰嗘枡\Kf_EntrustOutBillList_PDA.html" />
     <Content Include="views\WMS鎵爜妯″潡\濮斿棰嗘枡\Kf_EntrustOutBill_CheckList_PDA.html" />
+    <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_getCusBarCodeBill_PDA.html" />
@@ -318,6 +321,7 @@
     <Content Include="views\WMS鎵爜妯″潡\鐢熶骇鍏ュ簱\Kf_ProductInBillList_PDA.html" />
     <Content Include="views\WMS鎵爜妯″潡\鐢熶骇姹囨姤\Sc_ICMOReportBill_PDA.html" />
     <Content Include="views\WMS鎵爜妯″潡\鐢熶骇姹囨姤\Sc_ICMOReportBillList_PDA.html" />
+    <Content Include="views\WMS鎵爜妯″潡\鐢熶骇琛ユ枡\Kf_MateReplenishOutBill_Check_PDA.html" />
     <Content Include="views\WMS鎵爜妯″潡\鐢熶骇琛ユ枡\Kf_MateReplenishOutBillList_PDA.html" />
     <Content Include="views\WMS鎵爜妯″潡\鐢熶骇琛ユ枡\Kf_MateReplenishOutBill_PDA.html" />
     <Content Include="views\WMS鎵爜妯″潡\鐢熶骇琛ユ枡\Kf_MateReplenishOutBill_CheckList_PDA.html" />
@@ -368,6 +372,8 @@
     <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_StockInOutEntryReport.html" />
+    <Content Include="views\浠撳瓨绠$悊\鏉$爜鎶ヨ〃\KF_StockInOutRecordReport.html" />
     <Content Include="views\浠撳瓨绠$悊\鏉$爜鎶ヨ〃\Kf_SellOutBarTraceReport.html" />
     <Content Include="views\浠撳瓨绠$悊\鏉$爜鎶ヨ〃\KF_ICinventoryQueryReport.html" />
     <Content Include="views\浠撳瓨绠$悊\鏉$爜鎶ヨ〃\Kf_StockInOutSumQueryReport.html" />
@@ -2162,6 +2168,7 @@
     <Content Include="views\椤圭洰绠$悊\鍩虹寤烘ā\Gy_ProjectClass.html" />
     <Content Include="views\椤圭洰绠$悊\鍩虹寤烘ā\Gy_TaskClass.html" />
     <Content Include="views\椤圭洰绠$悊\宸ヤ綔浠诲姟\PM_WorkTaskBill_AutoLoadBillMain.html" />
+    <Content Include="views\椤圭洰绠$悊\宸ヤ綔浠诲姟\PM_WorkTaskBill_AutoLoadBillMain_20241226.html" />
     <Content Include="views\椤圭洰绠$悊\宸ョ▼椤圭洰\PM_CustomerProInfoBillMainList.html" />
     <Content Include="views\椤圭洰绠$悊\宸ヤ綔浠诲姟\PM_WorkTaskMoneyBOMBill.html" />
     <Content Include="views\椤圭洰绠$悊\宸ヤ綔浠诲姟\PM_WorkTaskMoneyBOMBillList.html" />

--
Gitblit v1.9.1