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

zrg

2024-09-25 a9c30819a17aec10ad189886b3bb6debb4d05eb0

 WebTM/WebTM.csproj

@@ -347,11 +347,16 @@
    <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\基础资料\公用基础资料\Gy_EquipType_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\基础资料\公用基础资料\excel\Gy_Customer_Excel.html" />
    <Content Include="views\基础资料\公用基础资料\excel\Gy_Department_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\基础资料\公用基础资料\Gy_TechnologyParameterType.html" />
    <Content Include="views\基础资料\公用基础资料\SumAdd_Gy_RestDay.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_RestDay.html" />
@@ -363,6 +368,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" />
@@ -391,6 +397,7 @@
    <Content Include="views\工资管理\技能考核\HR_EmployeeSkillExamBillList.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" />
@@ -531,6 +538,7 @@
    <Content Include="views\车间管理\产线\Sc_ProcessReportList_Last.html" />
    <Content Include="views\车间管理\产线\Sc_StationInBillList.html" />
    <Content Include="views\车间管理\产线\test.html" />
    <Content Include="views\车间管理\关键件绑定\Sc_KeyElementBinding.html" />
    <Content Include="views\车间管理\单品过站\SingleItemTransitList.html" />
    <Content Include="views\车间管理\启动点检单\Sc_WorkBeginDotCheckBill.html" />
    <Content Include="views\车间管理\启动点检单\Sc_WorkBeginDotCheckBillList.html" />
@@ -1105,6 +1113,7 @@
    <Content Include="views\grf\送货单%28标签纸%29.grf" />
    <Content Include="views\grf\送货单.grf" />
    <Content Include="views\grf\取样卡.grf" />
    <Content Include="views\grf\仓位标签.grf" />
    <None Include="Web.Debug.config">
      <DependentUpon>Web.config</DependentUpon>
    </None>
@@ -2227,6 +2236,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>