From db584320d54adf6398b861c88ab85e5947e669f5 Mon Sep 17 00:00:00 2001
From: zzr99 <1940172413@qq.com>
Date: 星期五, 22 四月 2022 17:21:07 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI

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

diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 4abfb9f..8371784 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -822,6 +822,8 @@
     <Content Include="views\鐢熶骇绠$悊\鎶ュ伐骞冲彴鍔熻兘椤礬LineBind.html" />
     <Content Include="views\鐢熶骇绠$悊\鎷f枡閰嶉�佸崟\JIT_ComplementGoodsBill.html" />
     <Content Include="views\鐢熶骇绠$悊\鎷f枡閰嶉�佸崟\JIT_ComplementGoodsList.html" />
+    <Content Include="views\鐢熶骇绠$悊\鎻愭枡璁″垝\JIT_LiftMaterPlaBillnList.html" />
+    <Content Include="views\鐢熶骇绠$悊\鎻愭枡璁″垝\JIT_LiftMaterPlanBillEdit.html" />
     <Content Include="views\鐢熶骇绠$悊\鏃ヨ鍒掑熀纭�璧勬枡\Cg_PODemandPlanConfigBillList.html" />
     <Content Include="views\鐢熶骇绠$悊\鏃ヨ鍒掑熀纭�璧勬枡\Cg_PODemandPlanConfigBill_Add.html" />
     <Content Include="views\鐢熶骇绠$悊\鏃ヨ鍒掑熀纭�璧勬枡\Gy_WorkWarehouseBillList.html" />
@@ -844,6 +846,8 @@
     <Content Include="views\鐢熶骇绠$悊\鐢熶骇寮�宸ュ崟\Sc_Add_MESBeginWorkBillList.html" />
     <Content Include="views\鐢熶骇绠$悊\鐢熶骇寮�宸ュ崟\Sc_MESBeginWorkBillList.html" />
     <Content Include="views\鐢熶骇绠$悊\鐢熶骇鎷嗙鍗昞Sc_PackSplitBill_Fast.html" />
+    <Content Include="views\鐢熶骇绠$悊\鐢熶骇鏃ヨ鍒掑伐鍗昞JIT_DayPlanBillEdit.html" />
+    <Content Include="views\鐢熶骇绠$悊\鐢熶骇鏃ヨ鍒掑伐鍗昞JIT_DayPlanBillList.html" />
     <Content Include="views\鐢熶骇绠$悊\鐢熶骇姹囨姤鍗昞Sc_ICMOReportBill_FastNewList.html" />
     <Content Include="views\鐢熶骇绠$悊\鐢熶骇姹囨姤鍗昞Sc_ICMOReportBill_FastNew.html" />
     <Content Include="views\鐢熶骇绠$悊\鐢熶骇姹囨姤鍗昞Sc_Add_ICMOReportBillList.html" />
@@ -855,9 +859,12 @@
     <Content Include="views\鐢熶骇绠$悊\鐢熶骇閫�搴撳崟\Sc_ProductionReturnList.html" />
     <Content Include="views\鐢熶骇绠$悊\缁勬墭鍗曠紪杈慭Sc_GroupOrderBillEdit_Fast.html" />
     <Content Include="views\鐢熶骇绠$悊\缁勮鍗昞Sc_GroupOrderBillList.html" />
+    <Content Include="views\鐢熶骇绠$悊\瑕佹枡璁″垝\JIT_NeedMaterPlanBillList.html" />
     <Content Include="views\鐢熶骇绠$悊\璐ㄩ噺姹囨姤鍗昞Sc_QualityReportBill.html" />
     <Content Include="views\鐢熶骇绠$悊\璐ㄩ噺姹囨姤鍗昞Sc_QualityReportBillList.html" />
     <Content Include="views\鐢熶骇绠$悊\閫�鏂欑敵璇峰崟\JIT_CallGoodsBackRequestBillList.html" />
+    <Content Include="views\鐢熶骇绠$悊\榻愬鍒嗘瀽\JIT_CompleteMaterialDetailList.html" />
+    <Content Include="views\鐢熶骇绠$悊\榻愬鍒嗘瀽\JIT_CompleteDetailList.html" />
     <Content Include="views\绯荤粺绠$悊\浼氳鏈熼棿\Xt_AccountPeriodList.html" />
     <Content Include="views\绯荤粺绠$悊\浼氳鏈熼棿\Xt_AccountPeriod_Edit.html" />
     <Content Include="views\绯荤粺绠$悊\鍏憡\GG_NoticeBillList.html" />

--
Gitblit v1.9.1