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

yangle

2024-10-27 f6d6a3c0c65103cb4a58e4f929ed7a1c8da21b9a

 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" />
@@ -379,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" />
@@ -406,6 +412,7 @@
    <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_MouldLifeUsePicReport.html" />
@@ -463,6 +470,8 @@
    <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" />
@@ -550,6 +559,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" />
@@ -596,6 +607,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" />
@@ -2041,6 +2054,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" />
@@ -2353,6 +2367,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>
@@ -2380,6 +2401,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>
@@ -2734,9 +2762,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>