From 4f69c8ca58cce719c44db7dc033748d5ad10ead8 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期四, 02 六月 2022 13:56:44 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI
---
WebTM/WebTM.csproj | 39 +++++++++++++++++++++++++++++++++++++++
1 files changed, 39 insertions(+), 0 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index e225d8f..e8d2189 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -206,6 +206,10 @@
<Content Include="views\grf\澧欏挃鏉＄爜.grf" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\grf\鐢熶骇鍗�.grf" />
<Content Include="views\grf\鐢熶骇鍗�.grf" />
+ <Content Include="views\grf\鐗╂枡鍚嶇О鏉＄爜.grf" />
+ <Content Include="views\grf\鍖呰鏂瑰紡鏉＄爜.grf" />
+ <Content Include="views\grf\鑺卞瀷鏉＄爜.grf" />
+ <Content Include="views\grf\宸ュ簭娴佽浆.grf" />
<None Include="Web.Debug.config">
<DependentUpon>Web.config</DependentUpon>
</None>
@@ -644,7 +648,9 @@
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_MouldProdOutStockBill.aspx" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_MouldTypeBill.aspx" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_QK_PackingBillList.aspx" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_QK_SPackingBillList.aspx" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Sc_ICMOBillList.aspx" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Sc_ProcessExchangeBillList.aspx" />
<Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_ConkReasonEdit.html" />
<Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_ConkReasonList.html" />
<Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_DotCheckEdit.html" />
@@ -799,6 +805,7 @@
<Content Include="views\鐢熶骇绠＄悊\浜ч噺姹囨姤鍗昞Sc_Add_ProductReportBillList.html" />
<Content Include="views\鐢熶骇绠＄悊\浜ч噺姹囨姤鍗昞Sc_ProductReportBillList.html" />
<Content Include="views\鐢熶骇绠＄悊\浜ч噺姹囨姤鍗昞Sc_ProductReportBillList_Web.html" />
+ <Content Include="views\鐢熶骇绠＄悊\鍗虫椂搴撳瓨\JIT_InventoryList.html" />
<Content Include="views\鐢熶骇绠＄悊\寮傚父鍙嶉鍗昞EXecptFeedMessage.html" />
<Content Include="views\鐢熶骇绠＄悊\寮傚父鍙嶉鍗昞Sc_Add_MESExecptFeedBackBillList.html" />
<Content Include="views\鐢熶骇绠＄悊\寮傚父鍙嶉鍗昞Sc_MESExecptFeedBackBillList.html" />
@@ -824,7 +831,14 @@
<Content Include="views\鐢熶骇绠＄悊\鎶ュ伐骞冲彴鍔熻兘椤礬LineBind.html" />
<Content Include="views\鐢熶骇绠＄悊\鎷ｆ枡閰嶉�佸崟\JIT_ComplementGoodsBill.html" />
<Content Include="views\鐢熶骇绠＄悊\鎷ｆ枡閰嶉�佸崟\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" />
+ <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" />
@@ -841,6 +855,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" />
@@ -849,12 +865,18 @@
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇瑁呯鍗昞QK_PackedBillList.html" />
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇瑁呯鍗昞QK_PackingBill.html" />
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇瑁呯鍗昞Sc_PackUnionBill_Fast.html" />
+ <Content Include="views\鐢熶骇绠＄悊\鐢熶骇璁″垝骞冲彴\JIT_DayPlanPlatForm.html" />
+ <Content Include="views\鐢熶骇绠＄悊\鐢熶骇璁″垝骞冲彴\JIT_DayPlanPlatFormImport.html" />
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇閫�搴撳崟\Sc_ProductionReturnList.html" />
<Content Include="views\鐢熶骇绠＄悊\缁勬墭鍗曠紪杈慭Sc_GroupOrderBillEdit_Fast.html" />
<Content Include="views\鐢熶骇绠＄悊\缁勮鍗昞Sc_GroupOrderBillList.html" />
+ <Content Include="views\鐢熶骇绠＄悊\瑕佹枡璁″垝\JIT_NeedMaterPlanBillEdit.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" />
@@ -1055,6 +1077,8 @@
<Content Include="views\楠屾敹鍏ュ簱\濮斿鍏ュ簱\Kf_EntrustInBill_FastList.html" />
<Content Include="views\楠屾敹鍏ュ簱\濮斿鍏ュ簱\Kf_EntrustInBillList.html" />
<Content Include="views\楠屾敹鍏ュ簱\濮斿鍏ュ簱\Kf_EntrustOutBackBill.html" />
+ <Content Include="views\楠屾敹鍏ュ簱\濮斿鍑哄簱\Kf_EntrustOutBill_Fast.html" />
+ <Content Include="views\楠屾敹鍏ュ簱\濮斿鍑哄簱\Kf_EntrustOutBill_FastList.html" />
<Content Include="Web.config" />
<None Include="Properties\PublishProfiles\Web.pubxml" />
</ItemGroup>
@@ -1294,12 +1318,26 @@
<Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_QK_PackingBillList.aspx.designer.cs">
<DependentUpon>xmlLBM_QK_PackingBillList.aspx</DependentUpon>
</Compile>
+ <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_QK_SPackingBillList.aspx.cs">
+ <DependentUpon>xmlLBM_QK_SPackingBillList.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_QK_SPackingBillList.aspx.designer.cs">
+ <DependentUpon>xmlLBM_QK_SPackingBillList.aspx</DependentUpon>
+ </Compile>
<Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Sc_ICMOBillList.aspx.cs">
<DependentUpon>xmlLBM_Sc_ICMOBillList.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Sc_ICMOBillList.aspx.designer.cs">
<DependentUpon>xmlLBM_Sc_ICMOBillList.aspx</DependentUpon>
+ </Compile>
+ <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Sc_ProcessExchangeBillList.aspx.cs">
+ <DependentUpon>xmlLBM_Sc_ProcessExchangeBillList.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Sc_ProcessExchangeBillList.aspx.designer.cs">
+ <DependentUpon>xmlLBM_Sc_ProcessExchangeBillList.aspx</DependentUpon>
</Compile>
<Compile Include="views\鐢熶骇宸ュ簭绠＄悊\宸ュ簭姹囨姤鍗昞xmlLBM_ProcessReport.aspx.cs">
<DependentUpon>xmlLBM_ProcessReport.aspx</DependentUpon>
@@ -1312,6 +1350,7 @@
<ItemGroup>
<Folder Include="views\浠撳瓨绠＄悊\璋冩嫧鍗曟牳瀵筡" />
<Folder Include="views\浠撳瓨绠＄悊\璋冩嫧鍗曠ń鏍竆" />
+ <Folder Include="views\鐢熶骇绠＄悊\鏃ヨ鍒掓姤琛╘" />
</ItemGroup>
<PropertyGroup>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
--
Gitblit v1.9.1