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 | 33 +++++++++++++++++++++++++++++++++
1 files changed, 33 insertions(+), 0 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 560315f..9250933 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -96,6 +96,7 @@
<Content Include="layuiadmin\ax\main.css" />
<Content Include="layuiadmin\BillMainAutoLoad.js" />
<Content Include="layuiadmin\ckou.js" />
+ <Content Include="layuiadmin\common.js" />
<Content Include="layuiadmin\echarts.min.js" />
<Content Include="layuiadmin\ext\excel.js" />
<Content Include="layuiadmin\ext\soulTable.css" />
@@ -316,11 +317,16 @@
<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_ICInventoryByWorkShop_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\搴撳瓨鏌ヨ\KF_ICInventoryByCLD_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\鎵爜楠岃瘉\Gy_BarCodeConfirmBill_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\鎵爜楠岃瘉\Gy_BarCodeConfirmBillList_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\鎵爜楠岃瘉\Gy_BarCodeConfirmBillList.html" />
<Content Include="views\WMS鎵爜妯″潡\鎵爜楠岃瘉\Gy_BarCodeConfirmBillList_BarCodeList.html" />
+ <Content Include="views\WMS鎵爜妯″潡\鎵捐揣涓婃灦鍗昞Kf_MaterialUpperBill_PDA.html" />
+ <Content Include="views\WMS鎵爜妯″潡\鎵捐揣涓婃灦鍗昞Kf_MaterialUpperBillList_PDA.html" />
+ <Content Include="views\WMS鎵爜妯″潡\鎵捐揣涓嬫灦鍗昞Kf_MaterialLowerBill_PDA.html" />
+ <Content Include="views\WMS鎵爜妯″潡\鎵捐揣涓嬫灦鍗昞Kf_MaterialLowerBillList_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\鏉＄爜鍑哄叆搴撴煡璇Gy_BarCodeBillInOut__PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\濮斿棰嗘枡\Kf_EntrustOutBill_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\鏉＄爜鏌ヨ\Gy_BarCodeBill_QiaoYi_PDA.html" />
@@ -464,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" />
@@ -606,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" />
@@ -622,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" />
@@ -679,6 +692,7 @@
<Content Include="views\璁惧绠＄悊\Sb_EquipRepairSignBillMain.html" />
<Content Include="views\璁惧绠＄悊\璁惧鍋滄満鍗昞Sb_EquipStopBillList_PDA.html" />
<Content Include="views\璁惧绠＄悊\璁惧鍋滄満鍗昞Sb_EquipStopBill_PDA.html" />
+ <Content Include="views\璁惧绠＄悊\璁惧宸ヨ壓鍙傛暟璁㈠崟鐐规琛╘SB_EquipICMOTechParamBillEdit_HistoryRecord.html" />
<Content Include="views\璁惧绠＄悊\璁惧宸ヨ壓鍙傛暟璁㈠崟鐐规琛╘SB_EquipICMOTechParamBillList_Detail.html" />
<Content Include="views\璁惧绠＄悊\璁惧宸ヨ壓鍙傛暟璁㈠崟鐐规琛╘Sb_EquipMentCollectionTechParam_ERRList.html" />
<Content Include="views\璁惧绠＄悊\璁惧宸ヨ壓鍙傛暟璁㈠崟鐐规琛╘SB_EquipICMOTechParamBillList.html" />
@@ -756,6 +770,7 @@
<Content Include="views\璐ㄩ噺绠＄悊\璐ㄩ噺鎶ヨ〃\QC_TechParamReport.html" />
<Content Include="views\璐ㄩ噺绠＄悊\璐ㄩ噺鎶ヨ〃\QC_BackWorkReport.html" />
<Content Include="views\璐ㄩ噺绠＄悊\璐ㄩ噺鎶ヨ〃\Sc_StationOutBil_HProc.html" />
+ <Content Include="views\璐ㄩ噺绠＄悊\璐ㄩ噺鎶ヨ〃\QC_EnvironmentTestDotCheckReport.html" />
<Content Include="views\璐ㄩ噺绠＄悊\璐ㄩ噺鏈堝害鐩爣鍗昞QC_MonthTarGetBill.html" />
<Content Include="views\璐ㄩ噺绠＄悊\璐ㄩ噺鏈堝害鐩爣鍗昞QC_MonthTarGetBillList.html" />
<Content Include="views\璐ㄩ噺绠＄悊\杞﹂棿鑷鍗昞QC_Add_Edit_WorkSelfCheckBill.html" />
@@ -794,6 +809,7 @@
<Content Include="views\杞﹂棿绠＄悊\宸ュ簭鍑虹珯姹囨姤鍗昞Cj_StationOutBill_Sup.html" />
<Content Include="views\杞﹂棿绠＄悊\宸ュ簭娴佽浆\MES_CenterCheckBill.html" />
<Content Include="views\杞﹂棿绠＄悊\宸ュ簭娴佽浆\MES_CenterCheckBillList.html" />
+ <Content Include="views\杞﹂棿绠＄悊\宸ュ簭娴佽浆鍗Sc_ProcessExchangeBillLIst_QueryCheckRecord.html" />
<Content Include="views\杞﹂棿绠＄悊\宸ュ簭娴佽浆鍗Sc_ProcessExchangeBill_Exchange.html" />
<Content Include="views\杞﹂棿绠＄悊\宸ュ簭娴佽浆鍗Sc_ProcessExchangeBillList_Source.html" />
<Content Include="views\杞﹂棿绠＄悊\宸ュ簭娴佽浆鍗Sc_ProcessExchangeArrangement_PG.html" />
@@ -805,6 +821,8 @@
<Content Include="views\杞﹂棿绠＄悊\鍚姩鐐规鍗昞Gy_WorkBeginDotCheckListBill.html" />
<Content Include="views\杞﹂棿绠＄悊\鍚姩鐐规鍗昞Gy_WorkBeginDotCheckListBillList.html" />
<Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Mes_OrderProcFlowAllReport_ICMO.html" />
+ <Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Qc_PreventErrMouldCheckReport.html" />
+ <Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Sc_WorkBeginDotCheckReport.html" />
<Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Sc_MouldRequirementDay.html" />
<Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Sc_CompareOrderToSelloutReport.html" />
<Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Sc_HICMMaterStatisticsList.html" />
@@ -1384,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>
@@ -2523,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