From f50cd9cfde1cdfc8e5b2205a63bdb2694da28e1c Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期二, 14 四月 2026 16:55:19 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/WebTM.csproj | 18 ++++++++++++++++++
1 files changed, 18 insertions(+), 0 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 646764a..e9c25a3 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -119,7 +119,11 @@
<Content Include="layuiadmin\layui\layui.js" />
<Content Include="layuiadmin\layui\layui2.10.0.js" />
<Content Include="layuiadmin\modules\dropdown-disable.js" />
+ <Content Include="layuiadmin\modules\numinput.js" />
+ <Content Include="layuiadmin\modules\timerManager.js" />
<Content Include="layuiadmin\modules\treeTable.js" />
+ <Content Include="layuiadmin\qrcode\qrcode.js" />
+ <Content Include="layuiadmin\qrcode\qrcode.min.js" />
<Content Include="layuiadmin\resize\ResizeLeftRight.css" />
<Content Include="layuiadmin\resize\ResizeLeftRight.js" />
<Content Include="layuiadmin\QueryScheme.js" />
@@ -194,6 +198,7 @@
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_EnvironmentTestSchemeBillList.html" />
<Content Include="views\WMS鎵爜妯″潡\濮斿棰嗘枡\Kf_EntrustOutBackBill_CheckList_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\濮斿棰嗘枡\Kf_EntrustOutBackBill_Check_PDA.html" />
+ <Content Include="views\WMS鎵爜妯″潡\搴撳瓨鏌ヨ\KF_ICInventory_WorkShop_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\鐢熶骇鍏ュ簱\Kf_ProductInBackBill_CheckList_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\鐢熶骇鍏ュ簱\Kf_ProductInBackBill_Check_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\鐢熶骇棰嗘枡\Kf_MateOutBackBill_Check_PDA.html" />
@@ -203,6 +208,7 @@
<Content Include="views\WMS鎵爜妯″潡\閲囪喘鍏ュ簱\Kf_POStockInBackBill_Check_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\閿�鍞嚭搴揬Kf_SellOutBackBill_CheckList_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\閿�鍞嚭搴揬Kf_SellOutBackBill_Check_PDA.html" />
+ <Content Include="views\浠撳瓨绠＄悊\鏉＄爜鐢熸垚\Gy_BarCodeBill_HuaZhou.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_Car.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_CostCenter.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_CostItem.html" />
@@ -622,6 +628,8 @@
<Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_CarTypeEdit.html" />
<Content Include="views\鍩虹璧勬枡\宸ヨ祫鍩虹璧勬枡\Gy_WorkType_Excel.html" />
<Content Include="views\鍩虹璧勬枡\鎴愭湰鍩虹璧勬枡\Add_Edit_Gy_CostAverageType.html" />
+ <Content Include="views\鍩虹璧勬枡\鎴愭湰鍩虹璧勬枡\Cb_OtherOutBill_CostSubjectDetail.html" />
+ <Content Include="views\鍩虹璧勬枡\鎴愭湰鍩虹璧勬枡\Cb_OtherOutBill_CostSubjectDetail_excelimport.html" />
<Content Include="views\鍩虹璧勬枡\鎴愭湰鍩虹璧勬枡\CB_Wip_excelImport.html" />
<Content Include="views\鍩虹璧勬枡\鎴愭湰鍩虹璧勬枡\Gy_CostAverageTypeList.html" />
<Content Include="views\鍩虹璧勬枡\鐢熶骇鍩虹璧勬枡\Add_Edit_Gy_ProcMul.html" />
@@ -639,6 +647,7 @@
<Content Include="views\鍩虹璧勬枡\閫氱敤鍩虹璧勬枡\Gy_CommonBaseData.html" />
<Content Include="views\鍩虹璧勬枡\閫氱敤鍩虹璧勬枡\Gy_CommonBaseDataCheck.html" />
<Content Include="views\鍩虹璧勬枡\閫氱敤鍩虹璧勬枡\Gy_GeneralLookDown.html" />
+ <Content Include="views\鍩虹璧勬枡\閲囪喘鍩虹璧勬枡\Gy_Supplier2_JD.html" />
<Content Include="views\鍩虹璧勬枡\閲囪喘鍩虹璧勬枡\Gy_Supplier_Excel.html" />
<Content Include="views\鍩虹璧勬枡\閿�鍞熀纭�璧勬枡\Gy_MateNumRelation.html" />
<Content Include="views\鍩虹璧勬枡\閿�鍞熀纭�璧勬枡\Gy_MateNumRelationList.html" />
@@ -679,6 +688,8 @@
<Content Include="views\妗堜緥浠ｇ爜\鍗庤繙\HY_HistogramReport_ForPCSCheckNote.html" />
<Content Include="views\妗堜緥浠ｇ爜\鍗庤繙\HY_HistogramReport.html" />
<Content Include="views\妗堜緥浠ｇ爜\鍗庤繙\HY_InterfaceTest.html" />
+ <Content Include="views\妯℃不鍏风鐞哱鍣ㄥ叿鎶ヨ〃\Sc_MouldDailyUseReport.html" />
+ <Content Include="views\妯℃不鍏风鐞哱鍣ㄥ叿鎶ヨ〃\Sc_MouldMonthUseReport.html" />
<Content Include="views\妯℃不鍏风鐞哱鍣ㄥ叿鎶ヨ〃\Sc_MoldMainoverdueWarnReport.html" />
<Content Include="views\妯℃不鍏风鐞哱鍣ㄥ叿棰嗙敤鐢宠鍗昞Sc_MouldOutRequestBillEdit.html" />
<Content Include="views\妯℃不鍏风鐞哱鍣ㄥ叿棰嗙敤鐢宠鍗昞Sc_MouldOutRequestBillList.html" />
@@ -883,6 +894,7 @@
<Content Include="views\璁惧绠＄悊\璁惧宸ヨ壓鍙傛暟璁㈠崟鐐规琛╘SB_EquipICMOTechParamBillEdit.html" />
<Content Include="views\璁惧绠＄悊\璁惧寮�鏈哄崟\Sb_EquipBeginBillList_PDA.html" />
<Content Include="views\璁惧绠＄悊\璁惧寮�鏈哄崟\Sb_EquipBeginBill_PDA.html" />
+ <Content Include="views\璁惧绠＄悊\璁惧鎶ヨ〃\Sb_EquipDailyRunStateReport.html" />
<Content Include="views\璁惧绠＄悊\璁惧鎶ヨ〃\Sb_EquipDotCheckTaskReport.html" />
<Content Include="views\璁惧绠＄悊\璁惧鎶ヨ〃\SB_EquipICMOTechParamReport.html" />
<Content Include="views\璁惧绠＄悊\璁惧鎶ヨ〃\Sb_EquipMentCollectionTechParam_Temp.html" />
@@ -991,6 +1003,7 @@
<Content Include="views\杞﹂棿绠＄悊\鍏抽敭浠剁粦瀹歕Sc_KeyElementBindingList.html" />
<Content Include="views\杞﹂棿绠＄悊\鍏抽敭浠剁粦瀹歕Sc_KeyElementBinding.html" />
<Content Include="views\杞﹂棿绠＄悊\鍗曞搧杩囩珯\SingleItemTransitList.html" />
+ <Content Include="views\杞﹂棿绠＄悊\鍗曞搧杩囩珯_灏忓崼\Cj_BarCodePrint.html" />
<Content Include="views\杞﹂棿绠＄悊\鍗曞搧杩囩珯_灏忓崼\Cj_zuituoxiaowei_cacheList.html" />
<Content Include="views\杞﹂棿绠＄悊\鍗曞搧杩囩珯_灏忓崼\Cj_ProcessItemStationPlatform_ShippingExport.html" />
<Content Include="views\杞﹂棿绠＄悊\鍗曞搧杩囩珯_灏忓崼\Cj_SaveSNByICMO.html" />
@@ -1045,6 +1058,7 @@
<Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Mes_OrderProcFlowAllReport_ICMO.html" />
<Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Qc_PreventErrMouldCheckReport.html" />
<Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Sc_AllowedPrintProcExchangeBillList.html" />
+ <Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Sc_ProcDailyRunStateReport.html" />
<Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Sc_StationOutVarianceReport.html" />
<Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Kf_WorkShopICStockBillList.html" />
<Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Sc_WorkShopXJICInventoryList.html" />
@@ -2753,6 +2767,10 @@
<Compile Include="App_Data\MssqlReportData.cs" />
<Compile Include="App_Data\ReportData.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
+ <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Cj_StationOutBillList_HZ.aspx.cs">
+ <DependentUpon>xmlLBM_Cj_StationOutBillList_HZ.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
<Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Gy_WorkStationList.aspx.cs">
<DependentUpon>xmlLBM_Gy_WorkStationList.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
--
Gitblit v1.9.1