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" />
@@ -127,6 +149,7 @@
    <Content Include="views\Baseset\基础资料\Gy_ConveyCompList.html" />
    <Content Include="views\Baseset\基础资料\Gy_ConveyTypeList.html" />
    <Content Include="views\Baseset\基础资料\Gy_GroupList.html" />
    <Content Include="views\Baseset\基础资料\Gy_Source.html" />
    <Content Include="views\Baseset\基础资料\Gy_SupplierListNew.html" />
    <Content Include="views\Baseset\基础资料\Gy_EquipFileBillMainList.html" />
    <Content Include="views\Baseset\基础资料\Gy_GetProcNoList.html" />
@@ -189,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" />
@@ -245,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" />
@@ -253,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" />
@@ -282,6 +310,7 @@
    <Content Include="views\人事管理\离职申请\HR_EmpDimissionBillList.html" />
    <Content Include="views\人事管理\职员异动单\HR_EmpChangeBill.html" />
    <Content Include="views\人事管理\职员异动单\HR_EmpChangeBillList.html" />
    <Content Include="views\仓存管理\生产入库单\Kf_ProductInBillList.html" />
    <Content Include="views\公共页面\Kf_ChaoBaoEditDlg.html" />
    <Content Include="views\品质管理\客诉处理\QC_CustomerAppealReport_BadClass.html" />
    <Content Include="views\品质管理\客诉处理\QC_CustomerAppealReport_Material.html" />
@@ -292,6 +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" />
@@ -335,6 +373,8 @@
    <Content Include="views\基础资料\公用基础资料\xmlLBM_HGy_CardAddress.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_HGy_CardType.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_HGy_FixCard.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_Kf_ICStockBackBillList.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_Kf_SellOutBillList_BarCodeNote_ByCusDefine.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_Pay_WorkTimesBillList.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_Sc_MyTicke.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_Xs_SellOutChangeBillList.aspx" />
@@ -403,8 +443,9 @@
    <Content Include="views\工资管理\岗位技能清单\HR_PostSkillBillList.html" />
    <Content Include="views\工资管理\工资单\Pay_PayMentBill.html" />
    <Content Include="views\工资管理\工资单\Pay_PayMentBillList.html" />
    <Content Include="views\工资管理\工资结算单%28个人%29\Pay_SingleBalBillEdit.html" />
    <Content Include="views\工资管理\工资结算单%28个人%29\Pay_SingleBalBillEdit_old.html" />
    <Content Include="views\工资管理\工资结算单%28个人%29\Pay_SingleBalBillList.html" />
    <Content Include="views\工资管理\工资结算单%28个人%29\Pay_SingleBalBillEdit.html" />
    <Content Include="views\工资管理\工资结算单%28集体%29\Pay_GroupBalBillEdit.html" />
    <Content Include="views\工资管理\工资结算单%28集体%29\Pay_GroupBalBillList.html" />
    <Content Include="views\工资管理\工资计算\Pay_SalaryCalculate.html" />
@@ -440,6 +481,8 @@
    <Content Include="views\模治具管理\器具报表\Sc_MouldRepairWorkBillReport.html" />
    <Content Include="views\模治具管理\模治具管理\Gy_SplitBarCode.html" />
    <Content Include="views\模治具管理\模治具管理\Gy_MaterialMouldBillMainList.html" />
    <Content Include="views\生产工序管理\增加不良评审单\QC_NoPassProdConclusionBillMain.html" />
    <Content Include="views\生产工序管理\增加不良评审单\QC_NoPassProdConclusionBillMainList.html" />
    <Content Include="views\生产工序管理\增加不良评审单\QC_NoPassProdDisposeCheckBillMain.html" />
    <Content Include="views\生产工序管理\增加不良评审单\QC_NoPassProdDisposeBillMain.html" />
    <Content Include="views\生产工序管理\增加不良评审单\QC_NoPassProdDisposeCheckBillMainList.html" />
@@ -458,6 +501,8 @@
    <Content Include="views\生产管理\异常反馈单\OA_ErrMsgBackReceiveBillMain.html" />
    <Content Include="views\生产管理\异常反馈单\OA_ErrMsgBackReceiveBillMainList.html" />
    <Content Include="views\生产管理\异常反馈单\Sc_Reply_MESExecptFeedBackBill.html" />
    <Content Include="views\生产管理\报工台工序\不良采集\Sc_QualityReportStepBillList_New.html" />
    <Content Include="views\生产管理\报工台工序\不良采集\Sc_QualityReportStepBill_New.html" />
    <Content Include="views\生产管理\报工台工序\产量汇报\Sc_ICMOBillQualityStatus_TmpList.html" />
    <Content Include="views\生产管理\报工台工序\产量汇报\Sc_ICMOBillWorkQtyStatus_TmpList.html" />
    <Content Include="views\生产管理\日计划基础资料\Cg_PODemandPlanConfigBill_Excel.html" />
@@ -523,18 +568,33 @@
    <Content Include="views\设备管理\固定资产卡片\Gy_FixCardChangeBillList.html" />
    <Content Include="views\设备管理\固定资产卡片\Gy_FixCardBillList.html" />
    <Content Include="views\设备管理\设备报表\Sb_EquipConkBookBillReport.html" />
    <Content Include="views\设备管理\设备报表\Sb_EquipMaintainWarningReport.html" />
    <Content Include="views\设备管理\设备报表\Sb_EquipmentLoadReport.html" />
    <Content Include="views\设备管理\设备报表\Sb_EquipRepairWorkBillReport.html" />
    <Content Include="views\设备管理\设备报表\Sb_EquipDotCheckBillReport.html" />
    <Content Include="views\设备管理\设备报表\Sb_EquipMaintainBillReport.html" />
    <Content Include="views\设备管理\设备报表\Sb_EquipDotCheckWarningReport.html" />
    <Content Include="views\设备管理\设备报表\SB_EquipRunningStatusReport.html" />
    <Content Include="views\设备管理\设备规程单\Sb_EquipDotCheckRuleList_PDA.html" />
    <Content Include="views\设备管理\设备规程单\Sb_EquipMaintainRuleList_PDA.html" />
    <Content Include="views\质量管理\基础建模\Add_Edit_Gy_ErrMsgBackType.html" />
    <Content Include="views\质量管理\基础建模\Add_Edit_Gy_ErrType.html" />
    <Content Include="views\质量管理\基础建模\Gy_ErrMsgBackType.html" />
    <Content Include="views\质量管理\基础建模\Gy_ErrType.html" />
    <Content Include="views\质量管理\安灯逐级呼叫规则\OA_AndengFlowRuleBillMain.html" />
    <Content Include="views\质量管理\安灯逐级呼叫规则\OA_AndengFlowRuleBillMainList.html" />
    <Content Include="views\质量管理\工序检验单\MES_ProcessCheckBillList_PDA.html" />
    <Content Include="views\质量管理\工序检验单\MES_ProcessCheckBill_PDA.html" />
    <Content Include="views\质量管理\工序检验单\QC_ProcessCheckBillList2.html" />
    <Content Include="views\质量管理\异常反馈\OA_ErrMsgBackCheckBillList_PDA.html" />
    <Content Include="views\质量管理\异常反馈\OA_ErrMsgBackHandleBillList_PDA.html" />
    <Content Include="views\质量管理\异常反馈\OA_ErrMsgBackCheckBill_PDA.html" />
    <Content Include="views\质量管理\异常反馈\OA_ErrMsgBackSignBillList_PDA.html" />
    <Content Include="views\质量管理\异常反馈\OA_ErrMsgBackReceiveBillList_PDA.html" />
    <Content Include="views\质量管理\异常反馈\OA_ErrMsgBackBillList_PDA.html" />
    <Content Include="views\质量管理\异常反馈\OA_ErrMsgBackHandleBill_PDA.html" />
    <Content Include="views\质量管理\异常反馈\OA_ErrMsgBackSignBill_PDA.html" />
    <Content Include="views\质量管理\异常反馈\OA_ErrMsgBackReceiveBill_PDA.html" />
    <Content Include="views\质量管理\异常反馈\OA_ErrMsgBackBill_PDA.html" />
    <Content Include="views\质量管理\质量报表\QC_FirstPassRateReport.html" />
    <Content Include="views\质量管理\质量报表\QC_FirstPassRateWeekReport.html" />
@@ -543,6 +603,7 @@
    <Content Include="views\质量管理\质量报表\QC_QualityTraceabilityReport.html" />
    <Content Include="views\质量管理\质量报表\QC_ProdBadReasonStatistics_Sum.html" />
    <Content Include="views\质量管理\首件检验单\MES_ColorRecordBillList_PDA.html" />
    <Content Include="views\质量管理\首件检验单\QC_FirstPieceCheckBillList2.html" />
    <Content Include="views\车间管理\单品过站\BadQueryReport.html" />
    <Content Include="views\质量管理\首件检验单\QC_Add_Edit_FirstPieceCheckBill - 复制.html" />
    <Content Include="views\车间管理\单品过站\Cj_CollectionOfSingleProductDefects.html" />
@@ -553,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" />
@@ -774,6 +837,7 @@
    <Content Include="views\grf\其他应收单.grf" />
    <Content Include="views\grf\销售调价单不含税.grf" />
    <Content Include="views\grf\销售调价单含税（仅限含税打印）.grf" />
    <Content Include="views\grf\销售退货单测试1.grf" />
    <None Include="Web.Debug.config">
      <DependentUpon>Web.config</DependentUpon>
    </None>
@@ -1693,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" />
@@ -1922,6 +1990,20 @@
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_HGy_FixCard.aspx.designer.cs">
      <DependentUpon>xmlLBM_HGy_FixCard.aspx</DependentUpon>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_Kf_ICStockBackBillList.aspx.cs">
      <DependentUpon>xmlLBM_Kf_ICStockBackBillList.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_Kf_ICStockBackBillList.aspx.designer.cs">
      <DependentUpon>xmlLBM_Kf_ICStockBackBillList.aspx</DependentUpon>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_Kf_SellOutBillList_BarCodeNote_ByCusDefine.aspx.cs">
      <DependentUpon>xmlLBM_Kf_SellOutBillList_BarCodeNote_ByCusDefine.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_Kf_SellOutBillList_BarCodeNote_ByCusDefine.aspx.designer.cs">
      <DependentUpon>xmlLBM_Kf_SellOutBillList_BarCodeNote_ByCusDefine.aspx</DependentUpon>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_Pay_WorkTimesBillList.aspx.cs">
      <DependentUpon>xmlLBM_Pay_WorkTimesBillList.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>