From da44d82e7f19e081f3c882c1e7934728e4ab534b Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期一, 18 八月 2025 11:13:00 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/WebTM.csproj | 36 ++++++++++++++++++++++++++++++++++++
1 files changed, 36 insertions(+), 0 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index a3286cc..1d328bd 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -138,6 +138,7 @@
<Content Include="layuiadmin\layui\font\iconfont.woff" />
<Content Include="layuiadmin\layui\font\iconfont.woff2" />
<Content Include="layuiadmin\json\Test.json" />
+ <Content Include="Download\WMS杞欢瀹夎鍖�.apk" />
<None Include="Properties\PublishProfiles\JFTM.pubxml" />
<Content Include="layuiadmin\layui\images\device.png" />
<Content Include="layuiadmin\layui\images\erro.png" />
@@ -183,6 +184,7 @@
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_ClassTimePrjList.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_ConveyCompList.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_ConveyTypeList.html" />
+ <Content Include="views\Baseset\鍩虹璧勬枡\Gy_DepartmentList_PDA.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_EnvironmentTestItem.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_ErrMsgBackType.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_EnvironmentTestSchemeBillList.html" />
@@ -251,6 +253,7 @@
<Content Include="views\indexMenu_PDA.html" />
<Content Include="views\indexMenu_PingBan.html" />
<Content Include="views\index_KaiBeiNaiTe.html" />
+ <Content Include="views\index_mobile_JiaNanAutoLogin.html" />
<Content Include="views\index_Mobile_KaiBeiNaiTe.html" />
<Content Include="views\index_Mobile_QiaoYi.html" />
<Content Include="views\index_pb.html" />
@@ -326,6 +329,8 @@
<Content Include="views\WMS鎵爜妯″潡\瀹㈡埛鏉＄爜鎵弿\Gy_getCusBarCodeBillList_BarCodeList_Batch.html" />
<Content Include="views\WMS鎵爜妯″潡\瀹㈡埛鏉＄爜鎵弿\Gy_getCusBarCodeBill_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\瀹㈡埛鏉＄爜鎵弿\Gy_getCusBarCodeBillList_PDA.html" />
+ <Content Include="views\WMS鎵爜妯″潡\灏忚溅閿佸畾\Kf_TrolleyPositionBill_PDA.html" />
+ <Content Include="views\WMS鎵爜妯″潡\搴撳瓨鏌ヨ\KF_ICInventory_WorkShopByCLD_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\搴撳瓨鏌ヨ\KF_ICInventoryByWorkShop_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\搴撳瓨鏌ヨ\KF_ICInventoryByCLD_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\鎵爜楠岃瘉\Gy_BarCodeConfirmBill_PDA.html" />
@@ -391,6 +396,8 @@
<Content Include="views\WMS鎵爜妯″潡\鐢熶骇绠＄悊\鐢熶骇缁勬墭鍗昞Sc_PackUnionBill_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\鐢熶骇璋冩嫧\璋冩嫧鎹㈡墭\Kf_MoveStockBill_HuanTuo_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\鐢熶骇璋冩嫧\璋冩嫧鎹㈡墭\Kf_MoveStockBillList_HuanTuo_PDA.html" />
+ <Content Include="views\WMS鎵爜妯″潡\閿�鍞嚭搴揬Kf_SellOutBillList_YP_QiaoYi_PDA.html" />
+ <Content Include="views\WMS鎵爜妯″潡\閿�鍞嚭搴揬Kf_SellOutBill_YP_QiaoYi_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\閿�鍞嚭搴揬Kf_SellOutBackBill_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\閿�鍞嚭搴揬Kf_SellOutBill_CheckList_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\閿�鍞嚭搴揬Kf_SellOutBill_Check_PDA.html" />
@@ -460,6 +467,7 @@
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\excel\Gy_QualityStd_Excel.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_AreaSet_ExtendDoubleClickReturn.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_BadPhenomena_Excel.html" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_BarCodeReport.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_PNLInfoEdit.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_BarCodeBill_PNL_TempEdit.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_PNLInfoList.html" />
@@ -518,6 +526,8 @@
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_HPOOrderChangeBillList.aspx" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Xs_SeOrderBill_StockInCodeNote.aspx" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlSRM_Web_BarCodeBillList.aspx" />
+ <Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_MatePrice.html" />
+ <Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_MatePriceEdit.html" />
<Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_PatrolCheckItemMethod_Excel.html" />
<Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_PatrolCheckItemClass_Excel.html" />
<Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_PatrolCheck_Excel.html" />
@@ -639,6 +649,7 @@
<Content Include="views\鐢熶骇绠＄悊\涓夊崌鎺掍骇\JIT_DayPlanPlatForm.html" />
<Content Include="views\鐢熶骇绠＄悊\涓夊崌鎺掍骇\JIT_DayPlanPlatFormImport_SS_Sec.html" />
<Content Include="views\鐢熶骇绠＄悊\涓夊崌鎺掍骇\JIT_DayPlanPlatFormImport_SS.html" />
+ <Content Include="views\鐢熶骇绠＄悊\鍑礉鏃ヨ鍒掑鍏JIT_DayPlanPlatForm_KB.html" />
<Content Include="views\鐢熶骇绠＄悊\鍙戣揣璁″垝骞冲彴锛堜笁鍗囷級\Xs_SendGoodsPlanForm.html" />
<Content Include="views\鐢熶骇绠＄悊\鍙戣揣璁″垝骞冲彴锛堜笁鍗囷級\Xs_SendGoodsPlanImport.html" />
<Content Include="views\鐢熶骇绠＄悊\瀹濆伐鎺掍骇\Cg_PODemandPlanConfigBillReportForLack.html" />
@@ -681,6 +692,25 @@
<Content Include="views\鐢熶骇绠＄悊\娆犳枡杩愮畻\JIT_MaterialLevelShorAnalysisDetailReport.html" />
<Content Include="views\鐢熶骇绠＄悊\娆犳枡杩愮畻\JIT_MaterialLevelShorAnalysisReport.html" />
<Content Include="views\鐢熶骇绠＄悊\鏃ヨ鍒掓姤琛╘JIT_FuHeFenXiReport.html" />
+ <Content Include="views\鐢熶骇绠＄悊\娣诲悍涓夊懆鎺掍骇\Cg_PODemandPlanConfigBillReportForLack_TK.html" />
+ <Content Include="views\鐢熶骇绠＄悊\娣诲悍涓夊懆鎺掍骇\Gy_RoutingBillReportForLack_TK.html" />
+ <Content Include="views\鐢熶骇绠＄悊\娣诲悍涓夊懆鎺掍骇\JIT_CompleteDetailList_TK.html" />
+ <Content Include="views\鐢熶骇绠＄悊\娣诲悍涓夊懆鎺掍骇\JIT_DayPlanPlatForm_TK2.html" />
+ <Content Include="views\鐢熶骇绠＄悊\娣诲悍涓夊懆鎺掍骇\JIT_DayPlanPlatForm_TK.html" />
+ <Content Include="views\鐢熶骇绠＄悊\娣诲悍涓夊懆鎺掍骇\JIT_LiftMaterPlaBillnList_TK.html" />
+ <Content Include="views\鐢熶骇绠＄悊\娣诲悍涓夊懆鎺掍骇\JIT_LiftMaterPlanBillEdit.html" />
+ <Content Include="views\鐢熶骇绠＄悊\娣诲悍涓夊懆鎺掍骇\JIT_LockRequestBill.html" />
+ <Content Include="views\鐢熶骇绠＄悊\娣诲悍涓夊懆鎺掍骇\JIT_LockRequestBillList.html" />
+ <Content Include="views\鐢熶骇绠＄悊\娣诲悍涓夊懆鎺掍骇\JIT_MaterialLevelShorAnalysis_TK.html" />
+ <Content Include="views\鐢熶骇绠＄悊\娣诲悍涓夊懆鎺掍骇\JIT_MaterialLevelShorAnalysisDetailReport.html" />
+ <Content Include="views\鐢熶骇绠＄悊\娣诲悍涓夊懆鎺掍骇\JIT_MaterialLevelShorAnalysisReport_TK.html" />
+ <Content Include="views\鐢熶骇绠＄悊\娣诲悍涓夊懆鎺掍骇\JIT_MaterialLevelShorAnalysisReport_His_TK.html" />
+ <Content Include="views\鐢熶骇绠＄悊\娣诲悍涓夊懆鎺掍骇\JIT_NeedMaterPlanConfigBillReportForLack_TK.html" />
+ <Content Include="views\鐢熶骇绠＄悊\娣诲悍涓夊懆鎺掍骇\JIT_PickUpCalculate_TK.html" />
+ <Content Include="views\鐢熶骇绠＄悊\娣诲悍涓夊懆鎺掍骇\JIT_UnLockRequestBill.html" />
+ <Content Include="views\鐢熶骇绠＄悊\娣诲悍涓夊懆鎺掍骇\JIT_UnLockRequestBillList.html" />
+ <Content Include="views\鐢熶骇绠＄悊\娣诲悍涓夊懆鎺掍骇\ReportPODemandPlanBillList.html" />
+ <Content Include="views\鐢熶骇绠＄悊\娣诲悍涓夊懆鎺掍骇\ReportPODemandPlanBillList_S_TK.html" />
<Content Include="views\鐢熶骇绠＄悊\鐝寮�鐝崟\Sc_ShiftsBeginInfoBillList.html" />
<Content Include="views\鐢熶骇绠＄悊\鐝寮�鐝崟\Sc_ShiftsBeginInfoBill_Add_Edit.html" />
<Content Include="views\鐢熶骇绠＄悊\鎻愭枡璁″垝\JIT_PickUpCalculate.html" />
@@ -714,6 +744,7 @@
<Content Include="views\璁″垝绠＄悊\浜х嚎瀵瑰簲鍣ㄥ叿娓呭崟\Gy_SourceMouldBill.html" />
<Content Include="views\璁″垝绠＄悊\浜х嚎瀵瑰簲鍣ㄥ叿娓呭崟\Gy_SourceMouldList.html" />
<Content Include="views\璁″垝绠＄悊\宸ヨ壓璺嚎\Gy_BulkEditWorkQty.html" />
+ <Content Include="views\璁″垝绠＄悊\宸ヨ壓璺嚎\Gy_RoutingBillHSEQ.html" />
<Content Include="views\璁″垝绠＄悊\宸ヨ壓璺嚎\Gy_RoutingBillCheckQuery.html" />
<Content Include="views\璁″垝绠＄悊\宸ヨ壓璺嚎\Gy_RoutingBillCloseList.html" />
<Content Include="views\璁″垝绠＄悊\宸ヨ壓璺嚎\Gy_RoutingBillToInvalidatedList.html" />
@@ -850,6 +881,7 @@
<Content Include="views\璁惧绠＄悊\璁惧寮�鏈哄崟\Sb_EquipBeginBillList.html" />
<Content Include="views\璐ㄩ噺绠＄悊\宸℃璁板綍鍗昞MES_QC_PatrolProcCheckOtherBill_PDA.html" />
<Content Include="views\杞﹂棿绠＄悊\鍚姩鐐规鍗昞Sc_WorkDotCheckBillList_Day.html" />
+ <Content Include="views\杞﹂棿绠＄悊\濮斿宸ュ簭鎺ユ敹鍗昞Sc_ProcessExchangeIssueBillList_PDA.html" />
<Content Include="views\杞﹂棿绠＄悊\宸ュ簭鍑虹珯姹囨姤鍗昞Cj_StationOutBill_Sup.html" />
<Content Include="views\杞﹂棿绠＄悊\宸ュ簭娴佽浆\MES_CenterCheckBill.html" />
<Content Include="views\杞﹂棿绠＄悊\宸ュ簭娴佽浆\MES_CenterCheckBillList.html" />
@@ -866,6 +898,8 @@
<Content Include="views\杞﹂棿绠＄悊\鍚姩鐐规鍗昞Gy_WorkBeginDotCheckListBillList.html" />
<Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Mes_OrderProcFlowAllReport_ICMO.html" />
<Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Qc_PreventErrMouldCheckReport.html" />
+ <Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Sc_AllowedPrintProcExchangeBillList.html" />
+ <Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Sc_OrderDelistingList_Query.html" />
<Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Sc_OEEReport_RunLogs.html" />
<Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Sc_WorkBeginDotCheckReport.html" />
<Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Sc_MouldRequirementDay.html" />
@@ -925,6 +959,7 @@
<Content Include="views\閿�鍞鐞哱閿�鍞姤琛╘Xs_SeOrderOutStockSumReport_QX.html" />
<Content Include="views\閿�鍞鐞哱閿�鍞姤琛╘Xs_SeOrderOutStockSumReport.html" />
<Content Include="views\閿�鍞鐞哱閿�鍞牳閿�\XS_SellOutBillList_Sec.html" />
+ <Content Include="views\閿�鍞鐞哱閿�鍞鍗昞Xs_SeOrderBillList_YP.html" />
<Content Include="views\閿�鍞鐞哱閿�鍞鍗昞Xs_SeOrderBillQuery.html" />
<Content Include="views\椤圭洰绠＄悊\鍩虹寤烘ā\Add_Edit_PM_CustomerProInfoBill.html" />
<Content Include="views\椤圭洰绠＄悊\鍩虹寤烘ā\Add_Edit_Gy_TaskClass.html" />
@@ -2432,6 +2467,7 @@
<Content Include="views\棰嗘枡鍙戣揣\鐢熶骇琛ユ枡\Kf_MateReplenishOutBill_CheckList_New.html" />
<Content Include="views\棰嗘枡鍙戣揣\鐢熶骇棰嗘枡\Kf_ProductReceiveMaterialBillEdit.html" />
<Content Include="views\棰嗘枡鍙戣揣\鐢熶骇棰嗘枡\Kf_ProductReceiveMaterialBillList.html" />
+ <Content Include="views\棰嗘枡鍙戣揣\閿�鍞嚭搴揬Kf_SellOutBillList_YP.html" />
<Content Include="views\棰嗘枡鍙戣揣\閿�鍞嚭搴揬Kf_SellOutBillQuery.html" />
<Content Include="views\棰嗘枡鍙戣揣\閿�鍞嚭搴揬Kf_SellOutBill.html" />
<Content Include="views\棰嗘枡鍙戣揣\閿�鍞嚭搴揬Kf_SellOutBillList_LookDown.html" />
--
Gitblit v1.9.1