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

yxj

2024-09-19 4b76b70011f3bb349a79b307fe621c40ea869555

 WebTM/WebTM.csproj

@@ -348,6 +348,13 @@
    <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_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\基础资料\公用基础资料\Gy_TechnologyParameterType.html" />
    <Content Include="views\基础资料\公用基础资料\SumAdd_Gy_RestDay.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_RestDay.html" />
@@ -359,6 +366,7 @@
    <Content Include="views\基础资料\公用基础资料\Gy_PreventErrMould.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_WorkCenter_Excel.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_UnitConvertRateList.html" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_Gy_StockPlaceList.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_HPayMentBill.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_HPOOrderBillByID.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_HPOStockInBillByID.aspx" />
@@ -422,6 +430,7 @@
    <Content Include="views\模治具管理\模治具点检保养\Sc_MouldDotCheckBill_PDA_OLD.html" />
    <Content Include="views\模治具管理\模治具点检保养\Sc_MouldMaintainBill_PDA.html" />
    <Content Include="views\模治具管理\模治具管理\Sc_MouldMaintainRuleBillList_PDA.html" />
    <Content Include="views\车间管理\关键件绑定\Sc_KeyElementBinding.html" />
    <Content Include="views\生产管理\异常反馈单\OA_ErrMsgBackSignBill_BrushCard.html" />
    <Content Include="views\生产管理\异常反馈单\Sc_MESExecptFeedBackBillResumeList.html" />
    <Content Include="views\生产管理\异常反馈单\Sc_MESExecptFeedBackBillType.html" />
@@ -440,6 +449,7 @@
    <Content Include="views\系统管理\多级审批\审批进度\Xt_CheckFlowProgressList.html" />
    <Content Include="views\系统管理\用户管理\Xt_UserRightQuery.html" />
    <Content Include="views\计划管理\Excel\Gy_Group_Excel.html" />
    <Content Include="views\计划管理\Excel\Gy_RoutingGroup_Excel.html" />
    <Content Include="views\计划管理\工艺路线\Pay_ProcPriceTypeChangeReport.html" />
    <Content Include="views\设备管理\Sb_Add_EquipRepairSignBillList.html" />
    <Content Include="views\设备管理\Sb_EquipRepairSignBillList_PDA.html" />
@@ -525,6 +535,7 @@
    <Content Include="views\车间管理\产线\test.html" />
    <Content Include="views\车间管理\单品过站\SingleItemTransitList.html" />
    <Content Include="views\车间管理\启动点检单\Sc_WorkBeginDotCheckBill.html" />
    <Content Include="views\车间管理\启动点检单\Sc_WorkDotCheckBillList_Day.html" />
    <Content Include="views\车间管理\启动点检单\Sc_WorkBeginDotCheckBillList.html" />
    <Content Include="views\设备管理\设备停机单\Sb_EquipStopBill.html" />
    <Content Include="views\设备管理\设备停机单\Sb_EquipStopBillList.html" />
@@ -2058,6 +2069,7 @@
    <Content Include="views\领料发货\委外补料\Kf_EntrustReplenishOutBill_Check_New.html" />
    <Content Include="views\领料发货\委外补料\Kf_EntrustReplenishOutBill_CheckList_New.html" />
    <Content Include="views\领料发货\收料入库\Kf_ReciveBill_Check.html" />
    <Content Include="views\领料发货\收料入库\Kf_ReciveBill_Fast_TK.html" />
    <Content Include="views\领料发货\收料入库\Kf_ReciveBill_Fast_AR.html" />
    <Content Include="views\领料发货\收料入库\Kf_ReciveBill_Fast.html" />
    <Content Include="views\领料发货\生产补料\Kf_MateReplenishOutBill_Check_New.html" />
@@ -2219,6 +2231,13 @@
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_EquipTypeBill.aspx.designer.cs">
      <DependentUpon>xmlLBM_EquipTypeBill.aspx</DependentUpon>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_Gy_StockPlaceList.aspx.cs">
      <DependentUpon>xmlLBM_Gy_StockPlaceList.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_Gy_StockPlaceList.aspx.designer.cs">
      <DependentUpon>xmlLBM_Gy_StockPlaceList.aspx</DependentUpon>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_HGy_CardChangeType.aspx.cs">
      <DependentUpon>xmlLBM_HGy_CardChangeType.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>