From 6a9fa2b8b34af2f93ebfb8934431c9037b11cd79 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期一, 19 一月 2026 16:11:42 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/WebTM.csproj | 22 ++++++++--------------
1 files changed, 8 insertions(+), 14 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 9c3f7a9..880130b 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -192,6 +192,9 @@
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_EnvironmentTestItem.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_ErrMsgBackType.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_EnvironmentTestSchemeBillList.html" />
+ <Content Include="views\WMS鎵爜妯″潡\鐢熶骇棰嗘枡\Kf_MateOutBackBill_Check_PDA.html" />
+ <Content Include="views\WMS鎵爜妯″潡\鐢熶骇棰嗘枡\Kf_MateOutBackBill_CheckList_PDA.html" />
+ <Content Include="views\WMS鎵爜妯″潡\搴撳瓨杞Щ\KF_ICInventory_WorkShop_PDA.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_Driver.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_ItemMoney.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_CarList.html" />
@@ -476,6 +479,8 @@
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Cg_ContractTransportBillList.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_HGy_BarCodeBill_ZB.aspx" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_HGy_BarCodeBill_MiddleBox.aspx" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Cj_StationOutBillList_HZ.aspx" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Sc_ProcessExchangeBillList_HZ.aspx" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Sc_ProcessExchangeBillList_stock.aspx" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlzuotuo_xiaowei.aspx" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_HGy_BarCodeBill_XinDa.aspx" />
@@ -976,6 +981,8 @@
<Content Include="views\璁惧绠＄悊\璁惧寮�鏈哄崟\Sb_EquipBeginBillList.html" />
<Content Include="views\璐ㄩ噺绠＄悊\宸℃璁板綍鍗昞MES_QC_PatrolProcCheckOtherBill_PDA.html" />
<Content Include="views\杞﹂棿绠＄悊\鍚姩鐐规鍗昞Sc_WorkDotCheckBillList_Day.html" />
+ <Content Include="views\杞﹂棿绠＄悊\鍛樺伐绛惧埌璁板綍鍗昞Add_Edit_Sc_EmployeeSignInNoteBill.html" />
+ <Content Include="views\杞﹂棿绠＄悊\鍛樺伐绛惧埌璁板綍鍗昞Sc_EmployeeSignInNoteBill.html" />
<Content Include="views\杞﹂棿绠＄悊\濮斿宸ュ簭鍙戝嚭鍗昞Cj_StationEntrustInBillSync.html" />
<Content Include="views\杞﹂棿绠＄悊\濮斿宸ュ簭鎺ユ敹鍗昞Cj_StationEntrustOutBillSync.html" />
<Content Include="views\杞﹂棿绠＄悊\濮斿宸ュ簭鎺ユ敹鍗昞Sc_ProcessExchangeIssueBillList_PDA.html" />
@@ -993,6 +1000,7 @@
<Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Cj_HeatTreatmentTemperatureCurveChart.html" />
<Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Cj_SPCOscillationCurve.html" />
<Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Cj_TemperatureCurveDryingMachine.html" />
+ <Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\KF_ICInventory_WorkShop.html" />
<Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Kf_PressurizedWaterNoOutReport.html" />
<Content Include="views\杞﹂棿绠＄悊\鍚姩鐐规鍗昞Gy_WorkBeginDotCheckListBill.html" />
<Content Include="views\杞﹂棿绠＄悊\鍚姩鐐规鍗昞Gy_WorkBeginDotCheckListBillList.html" />
@@ -2707,20 +2715,6 @@
<Compile Include="App_Data\MssqlReportData.cs" />
<Compile Include="App_Data\ReportData.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
- <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_HGy_BarCodeBill_ZB.aspx.cs">
- <DependentUpon>xmlLBM_HGy_BarCodeBill_ZB.aspx</DependentUpon>
- <SubType>ASPXCodeBehind</SubType>
- </Compile>
- <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_HGy_BarCodeBill_ZB.aspx.designer.cs">
- <DependentUpon>xmlLBM_HGy_BarCodeBill_ZB.aspx</DependentUpon>
- </Compile>
- <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_HGy_BarCodeBill_MiddleBox.aspx.cs">
- <DependentUpon>xmlLBM_HGy_BarCodeBill_MiddleBox.aspx</DependentUpon>
- <SubType>ASPXCodeBehind</SubType>
- </Compile>
- <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_HGy_BarCodeBill_MiddleBox.aspx.designer.cs">
- <DependentUpon>xmlLBM_HGy_BarCodeBill_MiddleBox.aspx</DependentUpon>
- </Compile>
<Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Sc_ProcessExchangeBillList_stock.aspx.cs">
<DependentUpon>xmlLBM_Sc_ProcessExchangeBillList_stock.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
--
Gitblit v1.9.1