From 81ad9c5cd22045e4739d70d8001a0fcf6941dace Mon Sep 17 00:00:00 2001
From: zzr99 <1940172413@qq.com>
Date: 星期二, 19 四月 2022 10:43:59 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI

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

diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 830dc5c..4abfb9f 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -63,6 +63,7 @@
     <Reference Include="System.EnterpriseServices" />
   </ItemGroup>
   <ItemGroup>
+    <Content Include="HtmlPage1.html" />
     <Content Include="layuiadmin\echarts.min.js" />
     <Content Include="layuiadmin\layui\css\global.css" />
     <Content Include="layuiadmin\layui\css\layui - 澶嶅埗.css" />
@@ -821,6 +822,12 @@
     <Content Include="views\鐢熶骇绠$悊\鎶ュ伐骞冲彴鍔熻兘椤礬LineBind.html" />
     <Content Include="views\鐢熶骇绠$悊\鎷f枡閰嶉�佸崟\JIT_ComplementGoodsBill.html" />
     <Content Include="views\鐢熶骇绠$悊\鎷f枡閰嶉�佸崟\JIT_ComplementGoodsList.html" />
+    <Content Include="views\鐢熶骇绠$悊\鏃ヨ鍒掑熀纭�璧勬枡\Cg_PODemandPlanConfigBillList.html" />
+    <Content Include="views\鐢熶骇绠$悊\鏃ヨ鍒掑熀纭�璧勬枡\Cg_PODemandPlanConfigBill_Add.html" />
+    <Content Include="views\鐢熶骇绠$悊\鏃ヨ鍒掑熀纭�璧勬枡\Gy_WorkWarehouseBillList.html" />
+    <Content Include="views\鐢熶骇绠$悊\鏃ヨ鍒掑熀纭�璧勬枡\Gy_WorkWarehouseBill_Add.html" />
+    <Content Include="views\鐢熶骇绠$悊\鏃ヨ鍒掑熀纭�璧勬枡\JIT_NeedMaterPlanConfigBillList.html" />
+    <Content Include="views\鐢熶骇绠$悊\鏃ヨ鍒掑熀纭�璧勬枡\JIT_NeedMaterPlanConfigBill_Add.html" />
     <Content Include="views\鐢熶骇绠$悊\鐢熶骇涓婃枡鍗昞Sc_MaterToSourceBillList - 澶嶅埗.html" />
     <Content Include="views\鐢熶骇绠$悊\鐢熶骇涓婃枡鍗昞Sc_MaterToSourceBillList.html" />
     <Content Include="views\鐢熶骇绠$悊\鐢熶骇鍋滃伐鍗昞Sc_Add_MESStopWorkBillList - 澶嶅埗.html" />
@@ -837,6 +844,7 @@
     <Content Include="views\鐢熶骇绠$悊\鐢熶骇寮�宸ュ崟\Sc_Add_MESBeginWorkBillList.html" />
     <Content Include="views\鐢熶骇绠$悊\鐢熶骇寮�宸ュ崟\Sc_MESBeginWorkBillList.html" />
     <Content Include="views\鐢熶骇绠$悊\鐢熶骇鎷嗙鍗昞Sc_PackSplitBill_Fast.html" />
+    <Content Include="views\鐢熶骇绠$悊\鐢熶骇姹囨姤鍗昞Sc_ICMOReportBill_FastNewList.html" />
     <Content Include="views\鐢熶骇绠$悊\鐢熶骇姹囨姤鍗昞Sc_ICMOReportBill_FastNew.html" />
     <Content Include="views\鐢熶骇绠$悊\鐢熶骇姹囨姤鍗昞Sc_Add_ICMOReportBillList.html" />
     <Content Include="views\鐢熶骇绠$悊\鐢熶骇鐗╂枡娓呭崟\sc_Gy_ICBomBillMainList.html" />
@@ -845,6 +853,7 @@
     <Content Include="views\鐢熶骇绠$悊\鐢熶骇瑁呯鍗昞QK_PackingBill.html" />
     <Content Include="views\鐢熶骇绠$悊\鐢熶骇瑁呯鍗昞Sc_PackUnionBill_Fast.html" />
     <Content Include="views\鐢熶骇绠$悊\鐢熶骇閫�搴撳崟\Sc_ProductionReturnList.html" />
+    <Content Include="views\鐢熶骇绠$悊\缁勬墭鍗曠紪杈慭Sc_GroupOrderBillEdit_Fast.html" />
     <Content Include="views\鐢熶骇绠$悊\缁勮鍗昞Sc_GroupOrderBillList.html" />
     <Content Include="views\鐢熶骇绠$悊\璐ㄩ噺姹囨姤鍗昞Sc_QualityReportBill.html" />
     <Content Include="views\鐢熶骇绠$悊\璐ㄩ噺姹囨姤鍗昞Sc_QualityReportBillList.html" />
@@ -954,6 +963,8 @@
     <Content Include="views\楠屾敹鍏ュ簱\浜у搧鍏ュ簱\Kf_ProductInBillList.html" />
     <Content Include="views\楠屾敹鍏ュ簱\鍏朵粬鍏ュ簱\Kf_OtherInBillList.html" />
     <Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱Kf_ProductInBillList.html" />
+    <Content Include="views\楠屾敹鍏ュ簱\鍏朵粬鍏ュ簱\Kf_OtherOutBill_Check_New.html" />
+    <Content Include="views\楠屾敹鍏ュ簱\鍏朵粬鍏ュ簱\Kf_OtherOutBill_CheckList_New.html" />
     <Content Include="views\楠屾敹鍏ュ簱\澶栬喘鍏ュ簱\Add_Edit_Kf_POStockInBillList.html" />
     <Content Include="views\楠屾敹鍏ュ簱\澶栬喘鍏ュ簱\Kf_POStockInBackBillList.html" />
     <Content Include="views\楠屾敹鍏ュ簱\澶栬喘鍏ュ簱\Kf_POStockInBillList.html" />

--
Gitblit v1.9.1