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

yangle

2023-09-18 7c6dbc2da5bea1fa7b45a4c1fdaa26fc1be16be8

 WebTM/WebTM.csproj

@@ -72,6 +72,7 @@
    <Content Include="layuiadmin\ax\images\login-left.jpg" />
    <Content Include="layuiadmin\ax\images\yanzhengma.jpg" />
    <Content Include="layuiadmin\ax\main.css" />
    <Content Include="layuiadmin\ckou.js" />
    <Content Include="layuiadmin\echarts.min.js" />
    <Content Include="layuiadmin\grwebapp.js" />
    <Content Include="layuiadmin\HideButton.js" />
@@ -94,6 +95,7 @@
    <Content Include="layuiadmin\layui\layui1.js" />
    <Content Include="layuiadmin\layui\zgqlayui.js" />
    <Content Include="layuiadmin\lib\extend\echarts.min.js" />
    <Content Include="layuiadmin\lineBreakTransformer.js" />
    <Content Include="layuiadmin\modules\excel.js" />
    <Content Include="layuiadmin\modules\soulTable.js" />
    <Content Include="layuiadmin\modules\tableChild.js" />
@@ -107,6 +109,7 @@
    <Content Include="layuiadmin\myicon\我的设置.svg" />
    <Content Include="layuiadmin\myicon\系统设置.svg" />
    <Content Include="layuiadmin\myicon\车间管理.svg" />
    <Content Include="layuiadmin\serial-reader.js" />
    <Content Include="layuiadmin\soulTable.slim.js" />
    <Content Include="layuiadmin\treeTable.js" />
    <Content Include="layuiadmin\PubCustom.js" />
@@ -119,6 +122,7 @@
    <Content Include="views\Baseset\基础资料\Gy_ClassTimePrjList.html" />
    <Content Include="views\Baseset\基础资料\Gy_EquipFileBillMainList.html" />
    <Content Include="views\Baseset\基础资料\Gy_GetProcNoList.html" />
    <Content Include="views\Baseset\基础资料\Gy_InspectInstruMentList.html" />
    <Content Include="views\Baseset\基础资料\Gy_InspectValueList.html" />
    <Content Include="views\Baseset\基础资料\Gy_LineCenter.html" />
    <Content Include="views\Baseset\基础资料\Gy_MaterialList_LSQP.html" />
@@ -137,6 +141,7 @@
    <Content Include="views\Baseset\基础资料\Gy_TechParameterUnitList.html" />
    <Content Include="views\Baseset\基础资料\Gy_StockPlaceListNew.html" />
    <Content Include="views\Baseset\基础资料\Gy_UnitGroup.html" />
    <Content Include="views\Baseset\基础资料\Gy_CustomerListNew.html" />
    <Content Include="views\Baseset\基础资料\Gy_WarehouseListNew.html" />
    <Content Include="views\Baseset\基础资料\Gy_WasterWHList.html" />
    <Content Include="views\Baseset\基础资料\Gy_WHList.html" />
@@ -191,6 +196,7 @@
    <Content Include="views\PublicPage\HSourceReportHtml.html" />
    <Content Include="views\PublicPage\transfer.html" />
    <Content Include="views\ReportHtml.html" />
    <Content Include="views\set\user\Gy_USERSet_PDA.html" />
    <Content Include="views\test\testRenderAutomationList.html" />
    <Content Include="views\userfiles\images\pda.jpg" />
    <Content Include="views\userfiles\images\loginBackground-New.jpg" />
@@ -200,11 +206,14 @@
    <Content Include="views\video\1.wav" />
    <Content Include="views\video\jingbao.wav" />
    <Content Include="views\video\success.wav" />
    <Content Include="views\WMS扫码模块\其他入库\Kf_OtherInBill_PDA.html" />
    <Content Include="views\WMS扫码模块\生产管理\删托单\Sc_DeletePackUnionBill_PDA.html" />
    <Content Include="views\WMS扫码模块\生产管理\生产组托单\Sc_PackUnionBillList_PDA.html" />
    <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\人事管理\异常反馈单\OA_ErrMsgBackBillList_PDA.html" />
    <Content Include="views\人事管理\异常反馈单\OA_ErrMsgBackBill_PDA.html" />
    <Content Include="views\仓存管理\条码报表\Kf_MaterOutInReport.html" />
    <Content Include="views\仓存管理\条码报表\Kf_ICInventory_Mater.html" />
    <Content Include="views\仓存管理\条码报表\Kf_ICInventory_BarCode.html" />
@@ -215,11 +224,15 @@
    <Content Include="views\人事管理\离职申请\HR_EmpDimissionBillList.html" />
    <Content Include="views\人事管理\职员异动单\HR_EmpChangeBill.html" />
    <Content Include="views\人事管理\职员异动单\HR_EmpChangeBillList.html" />
    <Content Include="views\品质管理\客诉处理\Crm_CustomerAppealBill.html" />
    <Content Include="views\品质管理\客诉处理\Crm_CustomerAppealBillList.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_TemporaryArea.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_MaterType.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_MaterTypeEdit.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_TemporaryArea.html" />
    <Content Include="views\基础资料\公用基础资料\HBarPlanPrint_GXPG.html" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_Sc_ProcessExchangeArrangement.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_Kf_MateOutBillList.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_Kf_OtherOutBillList.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_Gy_WarehouseList.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_Gy_EmployeeList.aspx" />
@@ -228,6 +241,7 @@
    <Content Include="views\基础资料\公用基础资料\xmlLBM_Sc_ProcExchRecordBackBillList.aspx" />
    <Content Include="views\基础资料\工资基础资料\Gy_ProcCommPrice.html" />
    <Content Include="views\基础资料\工资基础资料\Gy_ProcCommPriceList.html" />
    <Content Include="views\基础资料\生产基础资料\Gy_Souce_Excel.html" />
    <Content Include="views\工资管理\加班申请\Pay_OverApplyBill.html" />
    <Content Include="views\工资管理\加班申请\Pay_OverApplyBillList.html" />
    <Content Include="views\工资管理\定额申请\Pay_ProcPriceRequestBill.html" />
@@ -251,22 +265,51 @@
    <Content Include="views\条码明细\Kf_BarCodeDetailQuery.html" />
    <Content Include="views\生产管理\日计划基础资料\Cg_PODemandPlanConfigBill_Excel.html" />
    <Content Include="views\生产管理\日计划报表\MaterialShorAnalysisReport.html" />
    <Content Include="views\生产管理\生产工位\Gy_SourceWorkStationSet.html" />
    <Content Include="views\生产管理\生产工位\Gy_SourceWorkStationSetList.html" />
    <Content Include="views\生产管理\生产计划平台\Sc_ShopCalendar.html" />
    <Content Include="views\系统管理\快捷方式自定义\Xt_UserFastMenu.html" />
    <Content Include="views\系统管理\快捷方式自定义\Xt_UserFastMenu_IconSet.html" />
    <Content Include="views\系统管理\按钮设置\Xt_ModuleButtonSet.html" />
    <Content Include="views\系统管理\菜单自定义\Xt_DefineMenuDisplay.html" />
    <Content Include="views\计划管理\产线质检平台\Sc_ICMOBillQualityStatus_Tmp.html" />
    <Content Include="views\计划管理\产线返修平台\Sc_SourceLineRepairBill.html" />
    <Content Include="views\计划管理\产线返修平台\Sc_SourceLineRepairBill_ChangeMater.html" />
    <Content Include="views\计划管理\工艺路线\Gy_RoutingBillListQuery.html" />
    <Content Include="views\计划管理\工艺路线\Gy_RoutingBillList_His.html" />
    <Content Include="views\计划管理\工艺路线\Gy_RoutingBillSubList.html" />
    <Content Include="views\车间管理\报表分析\Kf_BrushingOutReport.html" />
    <Content Include="views\车间管理\产线组装追溯\Cj_AssemblyTraceability.html" />
    <Content Include="views\车间管理\产线组装追溯\Cj_AssemblyTraceabilityList.html" />
    <Content Include="views\车间管理\工序出站汇报单\Cj_StationOutBillSubList.html" />
    <Content Include="views\车间管理\工序流转\MES_ColorRecordBill_PDA.html" />
    <Content Include="views\车间管理\工序流转\MES_SampleRecordBill_PDA.html" />
    <Content Include="views\车间管理\工序流转卡\MES_ColorRecordBillList.html" />
    <Content Include="views\车间管理\工序流转卡\MES_SampleRecordBillList.html" />
    <Content Include="views\车间管理\工序流转卡\Sc_ProcessExchangeArrangement.html" />
    <Content Include="views\车间管理\工序流转卡\Sc_ProcessExchangeBillQuery_Mobile.html" />
    <Content Include="views\车间管理\工序流转卡\Sc_ProcessExchangeBillSubList.html" />
    <Content Include="views\车间管理\工序流转卡\Sc_ProcessExchangeBill_Change.html" />
    <Content Include="views\车间管理\工序流转卡\Sc_ProcessExchangeBill_Copy_PL.html" />
    <Content Include="views\车间管理\工序流转卡\WW_EntrustWorkOrderBillEdit.html" />
    <Content Include="views\车间管理\工序流转卡\WW_EntrustWorkOrderBillList.html" />
    <Content Include="views\车间管理\工序进站接收单\Cj_StationInBillSubList.html" />
    <Content Include="views\车间管理\报表分析\Kf_ColorBlankLustringOutReport.html" />
    <Content Include="views\车间管理\报表分析\Kf_FinalizeOutReport.html" />
    <Content Include="views\车间管理\报表分析\Kf_FinalizeTheDesignOutReport.html" />
    <Content Include="views\车间管理\报表分析\Kf_LustringOutReport.html" />
    <Content Include="views\车间管理\报表分析\Kf_LustringReport.html" />
    <Content Include="views\车间管理\报表分析\Kf_ShrinkBrushOutReport.html" />
    <Content Include="views\车间管理\报表分析\Kf_ShrinkBrushReport.html" />
    <Content Include="views\车间管理\报表分析\Kf_DigitalSprayPaintingReport.html" />
    <Content Include="views\车间管理\报表分析\Kf_DryFinalizeOutReport.html" />
    <Content Include="views\车间管理\报表分析\Kf_HairtipReport.html" />
    <Content Include="views\车间管理\报表分析\Kf_PressurizedWaterOutReport.html" />
    <Content Include="views\车间管理\报表分析\Kf_ProdProcessEntryReport_DyeColor.html" />
    <Content Include="views\车间管理\报表分析\Kf_ProdProcessSumReport_DyeColor.html" />
    <Content Include="views\车间管理\报表分析\Kf_ProdProcessSumReport_DyeColor_third.html" />
    <Content Include="views\车间管理\报表分析\Kf_ShrinkBrushTeReport.html" />
    <Content Include="views\车间管理\报表分析\Kf_SizingFinalizeOutReport.html" />
    <Content Include="views\车间管理\报表分析\SC_DayRkReport.html" />
    <Content Include="views\车间管理\报表分析\Sc_ICOMProBarCodeReport.html" />
    <Content Include="views\车间管理\报表分析\sc_ICOMReport.html" />
@@ -416,6 +459,8 @@
    <Content Include="views\grf\出库码单.grf" />
    <Content Include="views\grf\流转卡.grf" />
    <Content Include="views\grf\cs10.grf" />
    <Content Include="views\grf\指引卡1.grf" />
    <Content Include="views\grf\生产领料单.grf" />
    <None Include="Web.Debug.config">
      <DependentUpon>Web.config</DependentUpon>
    </None>
@@ -1307,6 +1352,9 @@
    <Content Include="views\项目管理\工作任务\PM_WorkTaskBill.html" />
    <Content Include="views\项目管理\工程项目\PM_ProjectBill.html" />
    <Content Include="views\项目管理\工程项目\PM_ProjectBillList.html" />
    <Content Include="views\项目管理\报表分析\PM_WorkTaskReportMonthSumReport.html" />
    <Content Include="views\项目管理\报表分析\PM_ProjectWorkDaysSumReport.html" />
    <Content Include="views\项目管理\报表分析\PM_ProjectWorkDaysEntryReport.html" />
    <Content Include="views\项目管理\项目阶段\Add_Edit_Gy_ProjectStage.html" />
    <Content Include="views\项目管理\项目阶段\Gy_ProjectStage.html" />
    <Content Include="views\项目管理\项目阶段\PM_ProjectReportBillList.html" />
@@ -1471,6 +1519,20 @@
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_EquipTypeBill.aspx.designer.cs">
      <DependentUpon>xmlLBM_EquipTypeBill.aspx</DependentUpon>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_Sc_ProcessExchangeArrangement.aspx.cs">
      <DependentUpon>xmlLBM_Sc_ProcessExchangeArrangement.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_Sc_ProcessExchangeArrangement.aspx.designer.cs">
      <DependentUpon>xmlLBM_Sc_ProcessExchangeArrangement.aspx</DependentUpon>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_Kf_MateOutBillList.aspx.cs">
      <DependentUpon>xmlLBM_Kf_MateOutBillList.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_Kf_MateOutBillList.aspx.designer.cs">
      <DependentUpon>xmlLBM_Kf_MateOutBillList.aspx</DependentUpon>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_Kf_OtherOutBillList.aspx.cs">
      <DependentUpon>xmlLBM_Kf_OtherOutBillList.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>