添康工资车间报表添加，异常工时申请单修改

wtt

2024-10-28 0f213e44e69b8c1e9f86080ea0628352a5b279f8

 WebTM/WebTM.csproj

@@ -93,6 +93,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\BillMainAutoLoad.js" />
    <Content Include="layuiadmin\ckou.js" />
    <Content Include="layuiadmin\echarts.min.js" />
    <Content Include="layuiadmin\grwebapp.js" />
@@ -268,6 +269,8 @@
    <Content Include="views\WMS扫码模块\其他出库\Kf_OtherOutBillList_PDA.html" />
    <Content Include="views\WMS扫码模块\出门确认单\Xs_OutDoorCheckBillList_PDA.html" />
    <Content Include="views\WMS扫码模块\出门确认单\Xs_OutDoorCheckBill_PDA.html" />
    <Content Include="views\WMS扫码模块\出门确认单_新\Xs_OutDoorBill_PDA.html" />
    <Content Include="views\WMS扫码模块\出门确认单_新\Xs_OutDoorBillList_PDA.html" />
    <Content Include="views\WMS扫码模块\委外入库\Kf_EntrustInBackBillList_PDA.html" />
    <Content Include="views\WMS扫码模块\委外入库\Kf_EntrustInBillList_PDA.html" />
    <Content Include="views\WMS扫码模块\委外入库\Kf_EntrustInBill_PDA.html" />
@@ -314,6 +317,7 @@
    <Content Include="views\WMS扫码模块\销售出库\Kf_SellOutBillList_PDA.html" />
    <Content Include="views\WMS扫码模块\销售出库\Kf_SellOutBillList_QiaoYi_PDA.html" />
    <Content Include="views\WMS扫码模块\销售出库\Kf_SellOutBill_QiaoYi_PDA.html" />
    <Content Include="views\人事管理\人员履历\HR_PersonnelResumeList.html" />
    <Content Include="views\人事管理\异常反馈单\OA_ErrMsgBackBillList_PDA.html" />
    <Content Include="views\人事管理\异常反馈单\OA_ErrMsgBackBill_PDA.html" />
    <Content Include="views\仓存管理\三点照合扫码记录单\WMS_CusBarCodeCheckBillList.html" />
@@ -335,6 +339,7 @@
    <Content Include="views\仓存管理\条码报表\Kf_ICInvBalList.html" />
    <Content Include="views\仓存管理\生产入库单\Kf_ProductInBillList.html" />
    <Content Include="views\公共页面\Kf_ChaoBaoEditDlg.html" />
    <Content Include="views\公共页面\Kf_SourceBillEditDlg_PDA.html" />
    <Content Include="views\品质管理\客诉处理\QC_CustomerAppealReport_BadClass.html" />
    <Content Include="views\品质管理\客诉处理\QC_CustomerAppealReport_Material.html" />
    <Content Include="views\品质管理\客诉处理\QC_CustomerAppealReport_Emp.html" />
@@ -347,16 +352,19 @@
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_CheckNoteItem.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_TechnologyParameterType.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_MaintainLev.html" />
    <Content Include="views\基础资料\公用基础资料\excel\Gy_Customer_Excel.html" />
    <Content Include="views\基础资料\公用基础资料\excel\Gy_Department_excel.html" />
    <Content Include="views\基础资料\公用基础资料\excel\Gy_CheckItem_Excel.html" />
    <Content Include="views\基础资料\公用基础资料\excel\Gy_InspectBasis_Excel.html" />
    <Content Include="views\基础资料\公用基础资料\excel\Gy_InspectInstruMent_Excel.html" />
    <Content Include="views\基础资料\公用基础资料\excel\Gy_QualityStd_Excel.html" />
    <Content Include="views\基础资料\公用基础资料\excel\Gy_InspectMethod_Excel.html" />
    <Content Include="views\基础资料\公用基础资料\excel\Gy_CheckItem_Excel.html" />
    <Content Include="views\基础资料\公用基础资料\excel\Gy_InspectValue_Excel.html" />
    <Content Include="views\基础资料\公用基础资料\excel\Gy_QCCheckClass_Excel.html" />
    <Content Include="views\基础资料\公用基础资料\excel\Gy_Warehouse_Excel.html" />
    <Content Include="views\基础资料\公用基础资料\excel\Gy_QualityStd_Excel.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_EquipType_Excel.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_CheckNoteItem_Excel.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_MaterType_Excel.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_Material_Excel.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_PreventErrMould_Excel.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_MouldType_Excel.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_TechnologyParameterType.html" />
    <Content Include="views\基础资料\公用基础资料\SumAdd_Gy_RestDay.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_RestDay.html" />
@@ -375,9 +383,11 @@
    <Content Include="views\基础资料\公用基础资料\xmlLBM_HPOInStockBillByID.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_HSeOutStockBillListByID.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_Kf_SellOutBillListByID.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_Sc_ICMOBillListTK.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_Sc_ICMOReportBillList2.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_Sc_ICMOReportBillList.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_QC_TakeSampleCheckBillMainList.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_Xs_OutDoorBillList.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_Xs_SeOrderBill_StockInCodeNote.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlSRM_Web_BarCodeBillList.aspx" />
    <Content Include="views\基础资料\基础资料\Gy_DotCheckItemMethodEdit.html" />
@@ -389,14 +399,27 @@
    <Content Include="views\基础资料\基础资料\Gy_Repair_Excel.html" />
    <Content Include="views\基础资料\基础资料\Gy_Maintain_Excel.html" />
    <Content Include="views\基础资料\基础资料\Gy_DotCheck_Excel.html" />
    <Content Include="views\基础资料\工资基础资料\Gy_WorkType_Excel.html" />
    <Content Include="views\基础资料\生产基础资料\Add_Edit_Gy_ProcMul.html" />
    <Content Include="views\基础资料\生产基础资料\Gy_DisposeWay_Excel.html" />
    <Content Include="views\基础资料\生产基础资料\Gy_ProcMul.html" />
    <Content Include="views\基础资料\生产基础资料\Gy_PostSkill_Excel.html" />
    <Content Include="views\基础资料\生产基础资料\Gy_Post_Excel.html" />
    <Content Include="views\基础资料\生产基础资料\Gy_Process_Excel.html" />
    <Content Include="views\基础资料\通用基础资料\Gy_CommonBaseData.html" />
    <Content Include="views\基础资料\隐藏列设置\Gy_GridView_Hide_New.html" />
    <Content Include="views\工资管理\定额申请\Pay_ProcPriceRequestBillCheckQuery.html" />
    <Content Include="views\工资管理\工资报表\Pay_PayWorkShopSumReport.html" />
    <Content Include="views\工资管理\工资报表\Pay_PaymentDayCheckReport.html" />
    <Content Include="views\工资管理\工资报表\Pay_PaymentMonthSumReport.html" />
    <Content Include="views\工资管理\工资报表\Pay_PaymentTimeSumReport.html" />
    <Content Include="views\工资管理\工资报表\Pay_PaymentPieceSumReport.html" />
    <Content Include="views\工资管理\工资运算\Pay_SalaryCalculate_New.html" />
    <Content Include="views\工资管理\技能考核\HR_EmployeeSkillExamBill.html" />
    <Content Include="views\工资管理\技能考核\HR_EmployeeSkillExamBillList.html" />
    <Content Include="views\应收管理\报表分析\Xs_OutDoorBillReport.html" />
    <Content Include="views\应收管理\报表分析\Xs_SeOrderBarCodeInAndOutStockDetailReport.html" />
    <Content Include="views\条码明细\Kf_MateOutBillList_CodeDetail.html" />
    <Content Include="views\模治具管理\器具报表\Sc_MoldMainoverdueWarnReport.html" />
    <Content Include="views\模治具管理\器具报表\Sc_MouldLifeUsePicReport.html" />
    <Content Include="views\模治具管理\器具报表\Sc_MouldDotCheckTaskReport.html" />
    <Content Include="views\模治具管理\器具报表\Sc_MouldMaintainTaskReport.html" />
@@ -451,6 +474,9 @@
    <Content Include="views\系统管理\多级审批\审批进度\Xt_CheckFlowProgressList.html" />
    <Content Include="views\系统管理\用户管理\Xt_UserRightQuery.html" />
    <Content Include="views\计划管理\Excel\Gy_Group_Excel.html" />
    <Content Include="views\计划管理\工艺路线\Gy_RoutingBillCheckQuery.html" />
    <Content Include="views\计划管理\工艺路线\Gy_RoutingBillCloseList.html" />
    <Content Include="views\计划管理\工艺路线\Gy_RoutingBillToInvalidatedList.html" />
    <Content Include="views\计划管理\工艺路线\Pay_ProcPriceTypeChangeReport.html" />
    <Content Include="views\设备管理\Sb_Add_EquipRepairSignBillList.html" />
    <Content Include="views\设备管理\Sb_EquipRepairSignBillList_PDA.html" />
@@ -537,6 +563,8 @@
    <Content Include="views\车间管理\产线\Sc_ProcessReportList_Last.html" />
    <Content Include="views\车间管理\产线\Sc_StationInBillList.html" />
    <Content Include="views\车间管理\产线\test.html" />
    <Content Include="views\车间管理\关键件绑定\Sc_KeyElementBindingList.html" />
    <Content Include="views\车间管理\关键件绑定\Sc_KeyElementBinding.html" />
    <Content Include="views\车间管理\单品过站\SingleItemTransitList.html" />
    <Content Include="views\车间管理\启动点检单\Sc_WorkBeginDotCheckBill.html" />
    <Content Include="views\车间管理\启动点检单\Sc_WorkBeginDotCheckBillList.html" />
@@ -555,6 +583,7 @@
    <Content Include="views\车间管理\报表分析\Kf_PressurizedWaterNoOutReport.html" />
    <Content Include="views\车间管理\启动点检单\Gy_WorkBeginDotCheckListBill.html" />
    <Content Include="views\车间管理\启动点检单\Gy_WorkBeginDotCheckListBillList.html" />
    <Content Include="views\车间管理\报表分析\Mes_OrderProcFlowAllReport_ICMO.html" />
    <Content Include="views\车间管理\报表分析\Sc_MouldRequirementDay.html" />
    <Content Include="views\车间管理\报表分析\Sc_CompareOrderToSelloutReport.html" />
    <Content Include="views\车间管理\报表分析\Sc_HICMMaterStatisticsList.html" />
@@ -583,6 +612,8 @@
    <Content Include="views\采购管理\采购报表\Cg_POOrderBillProcessSumReport.html" />
    <Content Include="views\采购管理\采购订单\Cg_POOrderBillCheckQuery.html" />
    <Content Include="views\采购管理\采购订单\Cg_POOrderBillQuery.html" />
    <Content Include="views\销售管理\出门确认单_新\Xs_OutDoorBill.html" />
    <Content Include="views\销售管理\出门确认单_新\Xs_OutDoorBillList.html" />
    <Content Include="views\销售管理\发货通知单\Xs_SeOutStockBillQuery.html" />
    <Content Include="views\销售管理\应收单\Xs_ReceivableBillQuery.html" />
    <Content Include="views\销售管理\收款单\YS_ReceiveBillQuery.html" />
@@ -2027,6 +2058,7 @@
    <Content Include="views\项目管理\周计划\PM_WorkReportWeekBillMainList.html" />
    <Content Include="views\项目管理\周计划\PM_WorkTaskWeekBillList.html" />
    <Content Include="views\项目管理\周计划\PM_WorkTaskWeekBill.html" />
    <Content Include="views\项目管理\工作任务\PM_WorkTaskBill_AutoLoadBillMain.html" />
    <Content Include="views\项目管理\工程项目\PM_CustomerProInfoBillMainList.html" />
    <Content Include="views\项目管理\工作任务\PM_WorkTaskMoneyBOMBill.html" />
    <Content Include="views\项目管理\工作任务\PM_WorkTaskMoneyBOMBillList.html" />
@@ -2074,6 +2106,7 @@
    <Content Include="views\领料发货\收料入库\Kf_ReciveBill_Check.html" />
    <Content Include="views\领料发货\收料入库\Kf_ReciveBill_Fast_AR.html" />
    <Content Include="views\领料发货\收料入库\Kf_ReciveBill_Fast.html" />
    <Content Include="views\领料发货\收料入库\Kf_ReciveBill_Fast_TK.html" />
    <Content Include="views\领料发货\生产补料\Kf_MateReplenishOutBill_Check_New.html" />
    <Content Include="views\领料发货\生产补料\Kf_MateReplenishOutBill_CheckList_New.html" />
    <Content Include="views\领料发货\销售出库\Kf_SellOutBillQuery.html" />
@@ -2338,6 +2371,13 @@
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_Pay_WorkTimesBillList.aspx.designer.cs">
      <DependentUpon>xmlLBM_Pay_WorkTimesBillList.aspx</DependentUpon>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_Sc_ICMOBillListTK.aspx.cs">
      <DependentUpon>xmlLBM_Sc_ICMOBillListTK.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_Sc_ICMOBillListTK.aspx.designer.cs">
      <DependentUpon>xmlLBM_Sc_ICMOBillListTK.aspx</DependentUpon>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_Sc_ICMOReportBillList2.aspx.cs">
      <DependentUpon>xmlLBM_Sc_ICMOReportBillList2.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
@@ -2365,6 +2405,13 @@
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_QC_TakeSampleCheckBillMainList.aspx.designer.cs">
      <DependentUpon>xmlLBM_QC_TakeSampleCheckBillMainList.aspx</DependentUpon>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_Xs_OutDoorBillList.aspx.cs">
      <DependentUpon>xmlLBM_Xs_OutDoorBillList.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_Xs_OutDoorBillList.aspx.designer.cs">
      <DependentUpon>xmlLBM_Xs_OutDoorBillList.aspx</DependentUpon>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_Xs_SellOutChangeBillList.aspx.cs">
      <DependentUpon>xmlLBM_Xs_SellOutChangeBillList.aspx</DependentUpon>
@@ -2719,9 +2766,6 @@
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_Sc_ProcessExchangeBillList.aspx.cs">
      <DependentUpon>xmlLBM_Sc_ProcessExchangeBillList.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_Sc_ProcessExchangeBillList.aspx.designer.cs">
      <DependentUpon>xmlLBM_Sc_ProcessExchangeBillList.aspx</DependentUpon>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_Sc_ProcessExchangeBillList_SubList.aspx.cs">
      <DependentUpon>xmlLBM_Sc_ProcessExchangeBillList_SubList.aspx</DependentUpon>