Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI

yusijie

2025-05-30 3671127058b958778d780e3b8cb4598255b94071

 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" />
@@ -169,6 +170,7 @@
    <Content Include="views\Baseset\基础资料\Gy_BadCountDevelopWHList.html" />
    <Content Include="views\Baseset\基础资料\Gy_BadWHList.html" />
    <Content Include="views\Baseset\基础资料\Gy_BankList.html" />
    <Content Include="views\Baseset\基础资料\Gy_CheckPatrolItemList.html" />
    <Content Include="views\Baseset\基础资料\Gy_ClassTimePrjList.html" />
    <Content Include="views\Baseset\基础资料\Gy_ConveyCompList.html" />
    <Content Include="views\Baseset\基础资料\Gy_ConveyTypeList.html" />
@@ -315,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" />
@@ -431,7 +438,12 @@
    <Content Include="views\基础资料\公用基础资料\excel\Gy_InspectValue_Excel.html" />
    <Content Include="views\基础资料\公用基础资料\excel\Gy_QCCheckClass_Excel.html" />
    <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_CusType_ExtendDoubleClickReturn.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_MaterialCorrection.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_MaterialCorrection2.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_SupType_ExtendDoubleClickReturn.html" />
    <Content Include="views\基础资料\公用基础资料\Sb_EqiupMaterWorkTime.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_PiPe.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_PiPeMaterial.html" />
@@ -475,6 +487,15 @@
    <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_PatrolCheckItemMethod_Excel.html" />
    <Content Include="views\基础资料\基础资料\Gy_PatrolCheckItemClass_Excel.html" />
    <Content Include="views\基础资料\基础资料\Gy_PatrolCheck_Excel.html" />
    <Content Include="views\基础资料\基础资料\Gy_PatrolCheckEdit.html" />
    <Content Include="views\基础资料\基础资料\Gy_PatrolCheckList.html" />
    <Content Include="views\基础资料\基础资料\Gy_PatrolCheckItemMethodEdit.html" />
    <Content Include="views\基础资料\基础资料\Gy_PatrolCheckItemMethodList.html" />
    <Content Include="views\基础资料\基础资料\Gy_PatrolCheckItemClassEdit.html" />
    <Content Include="views\基础资料\基础资料\Gy_PatrolCheckItemClassList.html" />
    <Content Include="views\基础资料\基础资料\Gy_DotCheckItemMethod_Excel.html" />
    <Content Include="views\基础资料\基础资料\Gy_DotCheckItemMethodEdit.html" />
    <Content Include="views\基础资料\基础资料\Gy_DotCheckItemClassEdit.html" />
@@ -630,6 +651,7 @@
    <Content Include="views\生产管理\生产计划平台\JIT_DayPlanPlatForm_TKNew.html" />
    <Content Include="views\生产管理\生产计划平台\JIT_DayPlanPlatForm_TK.html" />
    <Content Include="views\生产管理\生产计划平台\JIT_DayPlanPlatForm_BCP.html" />
    <Content Include="views\生产管理\生产计划平台\Sc_BulkEditWorkTimeNew.html" />
    <Content Include="views\生产管理\订单状态分布\Sc_EquipmentProcessList.html" />
    <Content Include="views\生产管理\订单状态分布\Sc_OEEStatusReport.html" />
    <Content Include="views\生产管理\生产计划平台\Sc_BulkEditWorkTime.html" />
@@ -655,11 +677,18 @@
    <Content Include="views\计划管理\工艺路线\Gy_MaterialTechParamBill_Excel.html" />
    <Content Include="views\计划管理\工艺路线大类\Gy_RoutingGroupEdit.html" />
    <Content Include="views\设备管理\Sb_Add_EquipRepairSignBillList.html" />
    <Content Include="views\设备管理\Sb_EquipPatrolCheckBillList_PDA.html" />
    <Content Include="views\设备管理\Sb_EquipPatrolCheckBill_PDA.html" />
    <Content Include="views\设备管理\Sb_EquipPatrolCheckPlanBillEdit.html" />
    <Content Include="views\设备管理\Sb_EquipPatrolCheckPlanBillList.html" />
    <Content Include="views\设备管理\Sb_EquipPatrolCheckBillEdit.html" />
    <Content Include="views\设备管理\Sb_EquipPatrolCheckBillList.html" />
    <Content Include="views\设备管理\Sb_EquipRepairSignBillList_PDA.html" />
    <Content Include="views\设备管理\Sb_EquipRepairSignBill_PDA.html" />
    <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" />
@@ -679,6 +708,8 @@
    <Content Include="views\设备管理\设备报表\Sb_EquipRepairReport.html" />
    <Content Include="views\设备管理\设备报表\编辑页面\Edit_Sb_EquipMentCollectionTechParam.html" />
    <Content Include="views\设备管理\设备档案\Gy_EquipFile_Excel.html" />
    <Content Include="views\设备管理\设备规程单\Sb_EquipPatrolCheckRuleEdit.html" />
    <Content Include="views\设备管理\设备规程单\Sb_EquipPatrolCheckRuleList.html" />
    <Content Include="views\设备管理\设备规程单\Sb_EquipMaintainRuleBill_Excel.html" />
    <Content Include="views\质量管理\基础建模\Gy_ErrMsgBackType_Excel.html" />
    <Content Include="views\质量管理\基础建模\Gy_ErrType_Excel.html" />
@@ -735,6 +766,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" />
@@ -773,6 +805,8 @@
    <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" />
    <Content Include="views\车间管理\工序流转卡\Sc_ProcessExchangeBill_BatchSplit.html" />
@@ -783,6 +817,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" />
@@ -3083,6 +3119,24 @@
    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
    <DebugSymbols>true</DebugSymbols>
    <OutputPath>bin\</OutputPath>
    <DefineConstants>DEBUG;TRACE</DefineConstants>
    <DebugType>full</DebugType>
    <PlatformTarget>x86</PlatformTarget>
    <LangVersion>7.3</LangVersion>
    <ErrorReport>prompt</ErrorReport>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
    <OutputPath>bin\</OutputPath>
    <DefineConstants>TRACE</DefineConstants>
    <Optimize>true</Optimize>
    <DebugType>pdbonly</DebugType>
    <PlatformTarget>x86</PlatformTarget>
    <LangVersion>7.3</LangVersion>
    <ErrorReport>prompt</ErrorReport>
  </PropertyGroup>
  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
  <Import Project="$(VSToolsPath)\WebApplications\Microsoft.WebApplication.targets" Condition="'$(VSToolsPath)' != ''" />
  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" Condition="false" />