From b67d9d05337e6b866a98707cfe6567420a2fc14d Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期二, 10 六月 2025 13:48:29 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/WebTM.csproj | 22 ++++++++++++++++++++++
1 files changed, 22 insertions(+), 0 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 02c46fa..9250933 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -470,6 +470,8 @@
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_WorkCenter_Excel.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_UnitConvertRateList.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Gy_StockPlaceList.aspx" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Sc_CustTagBarCodeList_Select.aspx" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Sc_CustTagBarCodeList.aspx" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_HPayMentBill.aspx" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_HPOOrderBillByID.aspx" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_HPOStockInBillByID.aspx" />
@@ -612,6 +614,10 @@
<Content Include="views\鐢熶骇绠＄悊\瀹濆伐鎺掍骇\JIT_LockRequestBill.html" />
<Content Include="views\鐢熶骇绠＄悊\瀹濆伐鎺掍骇\JIT_DayPlanPlatForm.html" />
<Content Include="views\鐢熶骇绠＄悊\瀹濆伐鎺掍骇\JIT_LockRequestBillList.html" />
+ <Content Include="views\鐢熶骇绠＄悊\瀹㈡埛鏍囩\Sc_CustomerTagInfoExcel.html" />
+ <Content Include="views\鐢熶骇绠＄悊\瀹㈡埛鏍囩\Sc_CustomerTagInfoEdit.html" />
+ <Content Include="views\鐢熶骇绠＄悊\瀹㈡埛鏍囩\Sc_CustomerTagBarCodeList.html" />
+ <Content Include="views\鐢熶骇绠＄悊\瀹㈡埛鏍囩\Sc_CustomerTagInfoList.html" />
<Content Include="views\鐢熶骇绠＄悊\寮傚父鍙嶉鍗昞OA_ErrMsgBackSignBill_BrushCard.html" />
<Content Include="views\鐢熶骇绠＄悊\寮傚父鍙嶉鍗昞Sc_MESExecptFeedBackBillResumeList.html" />
<Content Include="views\鐢熶骇绠＄悊\寮傚父鍙嶉鍗昞Sc_MESExecptFeedBackBillType.html" />
@@ -628,6 +634,7 @@
<Content Include="views\鐢熶骇绠＄悊\鎶ュ伐骞冲彴鍔熻兘椤礬Gy_ButtonList.html" />
<Content Include="views\鐢熶骇绠＄悊\鎶ュ伐骞冲彴鍔熻兘椤礬LineBind_Button.html" />
<Content Include="views\鐢熶骇绠＄悊\鏃ヨ鍒掑熀纭�璧勬枡\JIT_NeedMaterPlanConfigBill_Excel.html" />
+ <Content Include="views\鐢熶骇绠＄悊\鏃ヨ鍒掓姤琛╘JIT_DayPlanPlatFormHistoryNoteReport.html" />
<Content Include="views\鐢熶骇绠＄悊\鏃ヨ鍒掓姤琛╘JIT_FuHeFenXiReportDetail.html" />
<Content Include="views\鐢熶骇绠＄悊\娆犳枡杩愮畻\JIT_MaterialLevelShorAnalysis.html" />
<Content Include="views\鐢熶骇绠＄悊\娆犳枡杩愮畻\JIT_MaterialLevelShorAnalysisDetailReport.html" />
@@ -1395,6 +1402,7 @@
<Content Include="views\grf\鍙栨牱鍗�.grf" />
<Content Include="views\grf\15鐧芥爣鎵撳嵃.grf" />
<Content Include="views\grf\杩芥函鐮�.grf" />
+ <Content Include="views\grf\娉曞緥鏍囩.grf" />
<None Include="Web.Debug.config">
<DependentUpon>Web.config</DependentUpon>
</None>
@@ -2534,6 +2542,20 @@
<Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Gy_StockPlaceList.aspx.designer.cs">
<DependentUpon>xmlLBM_Gy_StockPlaceList.aspx</DependentUpon>
</Compile>
+ <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Sc_CustTagBarCodeList_Select.aspx.cs">
+ <DependentUpon>xmlLBM_Sc_CustTagBarCodeList_Select.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Sc_CustTagBarCodeList_Select.aspx.designer.cs">
+ <DependentUpon>xmlLBM_Sc_CustTagBarCodeList_Select.aspx</DependentUpon>
+ </Compile>
+ <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Sc_CustTagBarCodeList.aspx.cs">
+ <DependentUpon>xmlLBM_Sc_CustTagBarCodeList.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Sc_CustTagBarCodeList.aspx.designer.cs">
+ <DependentUpon>xmlLBM_Sc_CustTagBarCodeList.aspx</DependentUpon>
+ </Compile>
<Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_HGy_CardChangeType.aspx.cs">
<DependentUpon>xmlLBM_HGy_CardChangeType.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
--
Gitblit v1.9.1