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

沈泽

2021-10-18 32cd846fd4576abaa0c85037dde51d00702e1532

 WebTM/WebTM.csproj

@@ -105,6 +105,7 @@
    <Content Include="views\grf\a.grf" />
    <Content Include="views\grf\b1.grf" />
    <Content Include="views\grf\b.grf" />
    <Content Include="views\indexMenu.html" />
    <Content Include="views\PublicPage\Gy_MaterType.html" />
    <Content Include="views\PublicPage\CheckItemInformation.html" />
    <Content Include="views\PublicPage\Gy_Maintain.html" />
@@ -123,6 +124,7 @@
    <Content Include="views\grf\器具分步式调出单.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>
@@ -532,6 +534,10 @@
    <Content Include="views\基础资料\公用基础资料\xmlLBM_EquipMaintainPlanBill.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_Gy_Material.aspx" />
    <Content Include="views\基础资料\公用基础资料\Gy_DepartmentList.html" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_MouldDotCheckBill.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_MouldDotCheckPlanBill.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_MouldMaintainBill.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_MouldMaintainPlanBill.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_MouldProdInStockBill.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_MouldRepairOutStockBill.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_MouldRepairInStockBill.aspx" />
@@ -587,6 +593,8 @@
    <Content Include="views\工资管理\工资结算单%28个人%29\Pay_SingleBalBill.html" />
    <Content Include="views\工资管理\工资结算单%28其他%29\Pay_OtherBalBill.html" />
    <Content Include="views\工资管理\工资结算单%28其他%29\Pay_OtherBalBillList.html" />
    <Content Include="views\工资管理\工资结算单%28集体%29\Pay_GroupBalBill.html" />
    <Content Include="views\工资管理\工资结算单%28集体%29\Pay_GroupBalBillList.html" />
    <Content Include="views\工资管理\考勤汇报单\Pay_WorkTimesBill.html" />
    <Content Include="views\工资管理\考勤汇报单\Pay_WorkTimesBillList.html" />
    <Content Include="views\模治具管理\模具处理出库单\Sc_MouldScrapOutBill_PDA.html" />
@@ -716,8 +724,10 @@
    <Content Include="views\质量管理\检验方案单\QC_CheckProjectList.html" />
    <Content Include="views\质量管理\首件检验单\QC_FirstPieceCheckBillList.html" />
    <Content Include="views\质量管理\首件检验单\QC_Add_Edit_FirstPieceCheckBill.html" />
    <Content Include="views\车间管理\委外工序发出单\Cj_StationEntrustInBill_Mul_PDA.html" />
    <Content Include="views\车间管理\委外工序发出单\Cj_StationEntrustInBill_PDA.html" />
    <Content Include="views\车间管理\委外工序发出单\Cj_StationEntrustInBill_Mul.html" />
    <Content Include="views\车间管理\委外工序接收单\Cj_StationEntrustOutBill_Mul_PDA.html" />
    <Content Include="views\车间管理\委外工序接收单\Cj_StationEntrustOutBill_Mul.html" />
    <Content Include="views\车间管理\委外工序接收单\Cj_StationEntrustOutBill_PDA.html" />
    <Content Include="views\车间管理\工序出站汇报单\Cj_StationOutBill.html" />
@@ -862,6 +872,34 @@
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_Gy_Department_Edit.aspx.designer.cs">
      <DependentUpon>xmlLBM_Gy_Department_Edit.aspx</DependentUpon>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_MouldDotCheckBill.aspx.cs">
      <DependentUpon>xmlLBM_MouldDotCheckBill.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_MouldDotCheckBill.aspx.designer.cs">
      <DependentUpon>xmlLBM_MouldDotCheckBill.aspx</DependentUpon>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_MouldDotCheckPlanBill.aspx.cs">
      <DependentUpon>xmlLBM_MouldDotCheckPlanBill.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_MouldDotCheckPlanBill.aspx.designer.cs">
      <DependentUpon>xmlLBM_MouldDotCheckPlanBill.aspx</DependentUpon>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_MouldMaintainBill.aspx.cs">
      <DependentUpon>xmlLBM_MouldMaintainBill.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_MouldMaintainBill.aspx.designer.cs">
      <DependentUpon>xmlLBM_MouldMaintainBill.aspx</DependentUpon>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_MouldMaintainPlanBill.aspx.cs">
      <DependentUpon>xmlLBM_MouldMaintainPlanBill.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_MouldMaintainPlanBill.aspx.designer.cs">
      <DependentUpon>xmlLBM_MouldMaintainPlanBill.aspx</DependentUpon>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_MouldProdInStockBill.aspx.cs">
      <DependentUpon>xmlLBM_MouldProdInStockBill.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
@@ -964,7 +1002,6 @@
  <ItemGroup>
    <Folder Include="views\仓存管理\调拨单核对\" />
    <Folder Include="views\仓存管理\调拨单稽核\" />
    <Folder Include="views\工资管理\工资结算单%28集体%29\" />
  </ItemGroup>
  <PropertyGroup>
    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>