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

yusijie

2024-05-07 1ba2d912e2e7faef6c47d91a9a4f779bf1a48d23

 WebTM/WebTM.csproj

@@ -41,6 +41,9 @@
  </PropertyGroup>
  <ItemGroup>
    <Reference Include="Microsoft.CSharp" />
    <Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
      <HintPath>..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
    </Reference>
    <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
      <HintPath>..\..\..\..\办公\K3Cloud\WebSite\bin\Newtonsoft.Json.dll</HintPath>
@@ -55,6 +58,24 @@
    <Reference Include="System.Core" />
    <Reference Include="System.Data.DataSetExtensions" />
    <Reference Include="System.Web.Extensions" />
    <Reference Include="System.Web.Helpers, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
      <HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll</HintPath>
    </Reference>
    <Reference Include="System.Web.Mvc, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
      <HintPath>..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll</HintPath>
    </Reference>
    <Reference Include="System.Web.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
      <HintPath>..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll</HintPath>
    </Reference>
    <Reference Include="System.Web.WebPages, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
      <HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll</HintPath>
    </Reference>
    <Reference Include="System.Web.WebPages.Deployment, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
      <HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll</HintPath>
    </Reference>
    <Reference Include="System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
      <HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
    </Reference>
    <Reference Include="System.Xml.Linq" />
    <Reference Include="System.Drawing" />
    <Reference Include="System.Web" />
@@ -75,6 +96,7 @@
    <Content Include="layuiadmin\ckou.js" />
    <Content Include="layuiadmin\echarts.min.js" />
    <Content Include="layuiadmin\grwebapp.js" />
    <Content Include="layuiadmin\PlateBinding.js" />
    <Content Include="layuiadmin\PageTitle.js" />
    <Content Include="layuiadmin\HideButton.js" />
    <Content Include="layuiadmin\layui\css\global.css" />
@@ -190,6 +212,7 @@
    <Content Include="views\index_QiaoYi.html" />
    <Content Include="views\index - 复制.html" />
    <Content Include="views\indexMenu.html" />
    <Content Include="views\PlateBinding.html" />
    <Content Include="views\IpadStepIndex.html" />
    <Content Include="views\PublicPage\DeptInformation_PDA.html" />
    <Content Include="views\PublicPage\MaterialInfo.html" />
@@ -246,6 +269,8 @@
    <Content Include="views\WMS扫码模块\生产入库\Kf_ProductInBillList_PDA.html" />
    <Content Include="views\WMS扫码模块\生产汇报\Sc_ICMOReportBill_PDA.html" />
    <Content Include="views\WMS扫码模块\生产汇报\Sc_ICMOReportBillList_PDA.html" />
    <Content Include="views\WMS扫码模块\生产补料\Kf_MateReplenishOutBillList_PDA.html" />
    <Content Include="views\WMS扫码模块\生产补料\Kf_MateReplenishOutBill_PDA.html" />
    <Content Include="views\WMS扫码模块\生产调拨\Kf_MoveStockStepInBill_PDA.html" />
    <Content Include="views\WMS扫码模块\生产调拨\Kf_MoveStockStepOutBill_PDA.html" />
    <Content Include="views\WMS扫码模块\生产调拨\Kf_MoveStockStepInBillList_PDA.html" />
@@ -254,7 +279,9 @@
    <Content Include="views\WMS扫码模块\生产调拨\Kf_MoveStockBill_PDA.html" />
    <Content Include="views\WMS扫码模块\生产领料\Kf_MateOutBackBillList_PDA.html" />
    <Content Include="views\WMS扫码模块\生产领料\Kf_MateOutBillList_PDA.html" />
    <Content Include="views\WMS扫码模块\生产领料\Kf_MateOutBackBill_PDA.html" />
    <Content Include="views\WMS扫码模块\生产领料\Kf_MateOutBill_PDA.html" />
    <Content Include="views\WMS扫码模块\采购入库\Kf_POStockInBackBill_PDA.html" />
    <Content Include="views\WMS扫码模块\采购入库\Kf_POStockInBill_PDA.html" />
    <Content Include="views\WMS扫码模块\采购入库\Kf_POStockInBackBillList_PDA.html" />
    <Content Include="views\WMS扫码模块\采购入库\Kf_POStockInBillList_PDA.html" />
@@ -294,8 +321,15 @@
    <Content Include="views\品质管理\客诉处理\Crm_CustomerAppealBill_KaiBei.html" />
    <Content Include="views\品质管理\客诉处理\Crm_CustomerAppealBill.html" />
    <Content Include="views\品质管理\客诉处理\Crm_CustomerAppealBillList.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_ColorClassList.html" />
    <Content Include="views\基础资料\基础资料\Gy_DotCheckItemMethodEdit.html" />
    <Content Include="views\基础资料\基础资料\Gy_DotCheckItemClassEdit.html" />
    <Content Include="views\基础资料\基础资料\Gy_DotCheckItemMethodList.html" />
    <Content Include="views\基础资料\基础资料\Gy_DotCheckItemClassList.html" />
    <Content Include="views\生产管理\异常反馈单\OA_ErrMsgBackSignBill_BrushCard.html" />
    <Content Include="views\项目管理\基础建模\Add_Edit_Gy_TaskClass.html" />
    <Content Include="views\项目管理\基础建模\Add_Edit_Gy_ProjectClass.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_ColorClass.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_InspectBasis.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_PoStockStyle.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_CusType.html" />
@@ -313,8 +347,6 @@
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_InspectMethod.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_InspectValue.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_TemporaryArea.html" />
    <Content Include="views\项目管理\基础建模\Gy_TaskClass.html" />
    <Content Include="views\项目管理\基础建模\Gy_ProjectClass.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_InspectBasis.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_AreaSet.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_CusType.html" />
@@ -582,11 +614,13 @@
    <Content Include="views\车间管理\单品过站\Cj_ProcessItemStationPlatform.html" />
    <Content Include="views\车间管理\单品过站\RetrospectiveQueryReport.html" />
    <Content Include="views\车间管理\单品过站\Sc_SourceLineRepairBillList.html" />
    <Content Include="views\车间管理\工序出站汇报单\Cj_StationOutBill_CodingReport.html" />
    <Content Include="views\车间管理\工序流转\MES_ProcessExchangeBillList_PDA_QiaoYi.html" />
    <Content Include="views\车间管理\工序流转\MES_Sc_ICMOBillList_PDA_QiaoYi.html" />
    <Content Include="views\车间管理\工序流转\MES_Sc_ProcessExchangeBillMain_Note_PDA.html" />
    <Content Include="views\车间管理\工序流转\MES_StationInBillList_PDA_QiaoYi.html" />
    <Content Include="views\车间管理\工序流转\MES_StationOutBillList_PDA_QiaoYi.html" />
    <Content Include="views\车间管理\工序出站汇报单\Cj_StationOutBill_CurrentWork.html" />
    <Content Include="views\车间管理\工序流转卡\Gy_ProcessBatchReport.html" />
    <Content Include="views\车间管理\工序流转卡\Sc_ProcessExchangeBillList_LookDown.html" />
    <Content Include="views\生产管理\生产计划平台\Sc_WorkBillMonthPlan.html" />
@@ -1723,6 +1757,10 @@
    <Content Include="views\项目管理\周计划\PM_WorkReportWeekBillMainList.html" />
    <Content Include="views\项目管理\周计划\PM_WorkTaskWeekBillList.html" />
    <Content Include="views\项目管理\周计划\PM_WorkTaskWeekBill.html" />
    <Content Include="views\项目管理\基础建模\Gy_ProjectClass.html" />
    <Content Include="views\项目管理\基础建模\Gy_TaskClass.html" />
    <Content Include="views\项目管理\工作任务\PM_WorkTaskMoneyBillList.html" />
    <Content Include="views\项目管理\工作任务\PM_WorkTaskMoneyBill.html" />
    <Content Include="views\项目管理\工作任务\PM_WorkTaskReportBillList.html" />
    <Content Include="views\项目管理\工作任务\PM_WorkTaskReportBill.html" />
    <Content Include="views\项目管理\工作任务\PM_WorkTaskBillList.html" />