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

yangle

2024-07-26 5203dd203b6272ab8a0854726bf09058566db64e

 WebTM/WebTM.csproj

@@ -252,6 +252,7 @@
    <Content Include="views\video\1.wav" />
    <Content Include="views\video\jingbao.wav" />
    <Content Include="views\video\success.wav" />
    <Content Include="views\WMS扫码模块\三点照合扫码记录单\WMS_CusBarCodeCheckBill_PDA.html" />
    <Content Include="views\WMS扫码模块\上料防错单\Sc_MaterToSourceBill_PDA.html" />
    <Content Include="views\WMS扫码模块\上料防错单\Sc_MaterToSourceBillList_PDA.html" />
    <Content Include="views\WMS扫码模块\其他入库\Kf_OtherInBackBillList_PDA.html" />
@@ -310,6 +311,7 @@
    <Content Include="views\WMS扫码模块\销售出库\Kf_SellOutBill_QiaoYi_PDA.html" />
    <Content Include="views\人事管理\异常反馈单\OA_ErrMsgBackBillList_PDA.html" />
    <Content Include="views\人事管理\异常反馈单\OA_ErrMsgBackBill_PDA.html" />
    <Content Include="views\仓存管理\三点照合扫码记录单\WMS_CusBarCodeCheckBillList.html" />
    <Content Include="views\仓存管理\仓库调拨\Add_Edit_Kf_MoveStockBill.html" />
    <Content Include="views\仓存管理\分步式调入单\Fb_StepFoldinBillEdit.html" />
    <Content Include="views\仓存管理\条码库存\KF_PonderationBillMain_Temp.html" />
@@ -349,6 +351,13 @@
    <Content Include="views\基础资料\公用基础资料\Gy_PreventErrMould.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_WorkCenter_Excel.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_UnitConvertRateList.html" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_HPayMentBill.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_HPOOrderBillByID.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_HPOStockInBillByID.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_HPOStockInBill.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_HPOInStockBillByID.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_HSeOutStockBillListByID.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_Kf_SellOutBillListByID.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_Sc_ICMOReportBillList2.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_Sc_ICMOReportBillList.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_Xs_SeOrderBill_StockInCodeNote.aspx" />
@@ -362,8 +371,13 @@
    <Content Include="views\基础资料\基础资料\Gy_Maintain_Excel.html" />
    <Content Include="views\基础资料\基础资料\Gy_DotCheck_Excel.html" />
    <Content Include="views\基础资料\生产基础资料\Gy_Process_Excel.html" />
    <Content Include="views\基础资料\隐藏列设置\Gy_GridView_Hide_New.html" />
    <Content Include="views\工资管理\技能考核\HR_EmployeeSkillExamBill.html" />
    <Content Include="views\工资管理\技能考核\HR_EmployeeSkillExamBillList.html" />
    <Content Include="views\模治具管理\器具报表\Sc_MouldDotCheckTaskReport.html" />
    <Content Include="views\模治具管理\器具报表\Sc_MouldMaintainTaskReport.html" />
    <Content Include="views\模治具管理\器具报表\Sc_MouldRepairCheckTaskReport.html" />
    <Content Include="views\模治具管理\器具报表\Sc_MouldRepairTaskReport.html" />
    <Content Include="views\应收管理\报表分析\Xs_SellOutMoneyRangeReport.html" />
    <Content Include="views\模治具管理\器具报表\Sc_MouldResumeCheckQuery.html" />
    <Content Include="views\模治具管理\器具点检规程单\Sc_MouldDotCheckRuleBillList_PDA.html" />
@@ -409,12 +423,18 @@
    <Content Include="views\系统管理\多级审批\审批进度\Xt_CheckFlowProgressList.html" />
    <Content Include="views\系统管理\用户管理\Xt_UserRightQuery.html" />
    <Content Include="views\计划管理\工艺路线\Pay_ProcPriceTypeChangeReport.html" />
    <Content Include="views\设备管理\Sb_Add_EquipRepairSignBillList.html" />
    <Content Include="views\设备管理\Sb_EquipRepairSignBillMain.html" />
    <Content Include="views\设备管理\设备停机单\Sb_EquipStopBillList_PDA.html" />
    <Content Include="views\设备管理\设备停机单\Sb_EquipStopBill_PDA.html" />
    <Content Include="views\设备管理\设备工艺参数订单点检表\SB_EquipICMOTechParamBillList.html" />
    <Content Include="views\设备管理\设备工艺参数订单点检表\SB_EquipICMOTechParamBillEdit.html" />
    <Content Include="views\设备管理\设备开机单\Sb_EquipBeginBillList_PDA.html" />
    <Content Include="views\设备管理\设备开机单\Sb_EquipBeginBill_PDA.html" />
    <Content Include="views\设备管理\设备报表\Sb_EquipDotCheckTaskReport.html" />
    <Content Include="views\设备管理\设备报表\Sb_EquipMaintainTaskReport.html" />
    <Content Include="views\设备管理\设备报表\Sb_EquipRepairCheckTaskReport.html" />
    <Content Include="views\设备管理\设备报表\Sb_EquipRepairTaskReport.html" />
    <Content Include="views\设备管理\设备报表\Sb_EquipResumeCheckQuery.html" />
    <Content Include="views\设备管理\设备规程单\Sb_EquipDotCheckRule_Excel.html" />
    <Content Include="views\质量管理\工作联系单\OA_WorkLinkSelfQuery.html" />
@@ -2156,6 +2176,48 @@
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_HGy_FixCard.aspx.designer.cs">
      <DependentUpon>xmlLBM_HGy_FixCard.aspx</DependentUpon>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_HPayMentBill.aspx.cs">
      <DependentUpon>xmlLBM_HPayMentBill.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_HPayMentBill.aspx.designer.cs">
      <DependentUpon>xmlLBM_HPayMentBill.aspx</DependentUpon>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_HPOOrderBillByID.aspx.cs">
      <DependentUpon>xmlLBM_HPOOrderBillByID.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_HPOOrderBillByID.aspx.designer.cs">
      <DependentUpon>xmlLBM_HPOOrderBillByID.aspx</DependentUpon>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_HPOStockInBillByID.aspx.cs">
      <DependentUpon>xmlLBM_HPOStockInBillByID.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_HPOStockInBillByID.aspx.designer.cs">
      <DependentUpon>xmlLBM_HPOStockInBillByID.aspx</DependentUpon>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_HPOStockInBill.aspx.cs">
      <DependentUpon>xmlLBM_HPOStockInBill.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_HPOStockInBill.aspx.designer.cs">
      <DependentUpon>xmlLBM_HPOStockInBill.aspx</DependentUpon>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_HPOInStockBillByID.aspx.cs">
      <DependentUpon>xmlLBM_HPOInStockBillByID.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_HPOInStockBillByID.aspx.designer.cs">
      <DependentUpon>xmlLBM_HPOInStockBillByID.aspx</DependentUpon>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_HSeOutStockBillListByID.aspx.cs">
      <DependentUpon>xmlLBM_HSeOutStockBillListByID.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_HSeOutStockBillListByID.aspx.designer.cs">
      <DependentUpon>xmlLBM_HSeOutStockBillListByID.aspx</DependentUpon>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_Kf_ICStockBackBillList.aspx.cs">
      <DependentUpon>xmlLBM_Kf_ICStockBackBillList.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
@@ -2163,6 +2225,13 @@
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_Kf_ICStockBackBillList.aspx.designer.cs">
      <DependentUpon>xmlLBM_Kf_ICStockBackBillList.aspx</DependentUpon>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_Kf_SellOutBillListByID.aspx.cs">
      <DependentUpon>xmlLBM_Kf_SellOutBillListByID.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_Kf_SellOutBillListByID.aspx.designer.cs">
      <DependentUpon>xmlLBM_Kf_SellOutBillListByID.aspx</DependentUpon>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_Kf_SellOutBillList_BarCodeNote_ByCusDefine.aspx.cs">
      <DependentUpon>xmlLBM_Kf_SellOutBillList_BarCodeNote_ByCusDefine.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>