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

yusijie

20 小时以前 6a9fa2b8b34af2f93ebfb8934431c9037b11cd79

 WebTM/WebTM.csproj

@@ -192,6 +192,9 @@
    <Content Include="views\Baseset\基础资料\Gy_EnvironmentTestItem.html" />
    <Content Include="views\Baseset\基础资料\Gy_ErrMsgBackType.html" />
    <Content Include="views\Baseset\基础资料\Gy_EnvironmentTestSchemeBillList.html" />
    <Content Include="views\WMS扫码模块\生产领料\Kf_MateOutBackBill_Check_PDA.html" />
    <Content Include="views\WMS扫码模块\生产领料\Kf_MateOutBackBill_CheckList_PDA.html" />
     <Content Include="views\WMS扫码模块\库存转移\KF_ICInventory_WorkShop_PDA.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_Driver.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_ItemMoney.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_CarList.html" />
@@ -476,6 +479,8 @@
    <Content Include="views\基础资料\公用基础资料\Cg_ContractTransportBillList.html" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_HGy_BarCodeBill_ZB.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_HGy_BarCodeBill_MiddleBox.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_Cj_StationOutBillList_HZ.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_Sc_ProcessExchangeBillList_HZ.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_Sc_ProcessExchangeBillList_stock.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlzuotuo_xiaowei.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_HGy_BarCodeBill_XinDa.aspx" />
@@ -976,6 +981,8 @@
    <Content Include="views\设备管理\设备开机单\Sb_EquipBeginBillList.html" />
    <Content Include="views\质量管理\巡检记录单\MES_QC_PatrolProcCheckOtherBill_PDA.html" />
    <Content Include="views\车间管理\启动点检单\Sc_WorkDotCheckBillList_Day.html" />
    <Content Include="views\车间管理\员工签到记录单\Add_Edit_Sc_EmployeeSignInNoteBill.html" />
    <Content Include="views\车间管理\员工签到记录单\Sc_EmployeeSignInNoteBill.html" />
    <Content Include="views\车间管理\委外工序发出单\Cj_StationEntrustInBillSync.html" />
    <Content Include="views\车间管理\委外工序接收单\Cj_StationEntrustOutBillSync.html" />
    <Content Include="views\车间管理\委外工序接收单\Sc_ProcessExchangeIssueBillList_PDA.html" />
@@ -993,6 +1000,7 @@
    <Content Include="views\车间管理\报表分析\Cj_HeatTreatmentTemperatureCurveChart.html" />
    <Content Include="views\车间管理\报表分析\Cj_SPCOscillationCurve.html" />
    <Content Include="views\车间管理\报表分析\Cj_TemperatureCurveDryingMachine.html" />
    <Content Include="views\车间管理\报表分析\KF_ICInventory_WorkShop.html" />
    <Content Include="views\车间管理\报表分析\Kf_PressurizedWaterNoOutReport.html" />
    <Content Include="views\车间管理\启动点检单\Gy_WorkBeginDotCheckListBill.html" />
    <Content Include="views\车间管理\启动点检单\Gy_WorkBeginDotCheckListBillList.html" />
@@ -2707,20 +2715,6 @@
    <Compile Include="App_Data\MssqlReportData.cs" />
    <Compile Include="App_Data\ReportData.cs" />
    <Compile Include="Properties\AssemblyInfo.cs" />
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_HGy_BarCodeBill_ZB.aspx.cs">
      <DependentUpon>xmlLBM_HGy_BarCodeBill_ZB.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_HGy_BarCodeBill_ZB.aspx.designer.cs">
      <DependentUpon>xmlLBM_HGy_BarCodeBill_ZB.aspx</DependentUpon>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_HGy_BarCodeBill_MiddleBox.aspx.cs">
      <DependentUpon>xmlLBM_HGy_BarCodeBill_MiddleBox.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_HGy_BarCodeBill_MiddleBox.aspx.designer.cs">
      <DependentUpon>xmlLBM_HGy_BarCodeBill_MiddleBox.aspx</DependentUpon>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_Sc_ProcessExchangeBillList_stock.aspx.cs">
      <DependentUpon>xmlLBM_Sc_ProcessExchangeBillList_stock.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>