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

zzr99

2021-12-07 3950c8ebb4334f8ab80baf4440cc085f40ced0e9

 WebTM/WebTM.csproj

@@ -107,6 +107,7 @@
    <Content Include="views\grf\b1.grf" />
    <Content Include="views\grf\b.grf" />
    <Content Include="views\indexMenu.html" />
    <Content Include="views\IpadStepIndex.html" />
    <Content Include="views\PublicPage\MouldDotCheckRuleInterList.html" />
    <Content Include="views\PublicPage\MouldMaintainRuleInterList.html" />
    <Content Include="views\PublicPage\OrderBackInfomation.html" />
@@ -119,14 +120,20 @@
    <Content Include="views\PublicPage\PeopleInformation.html" />
    <Content Include="views\PublicPage\PowerInformation.html" />
    <Content Include="views\PublicPage\PurchOrder.html" />
    <Content Include="views\PublicPage\transfer.html" />
    <Content Include="views\ReportHtml.html" />
    <Content Include="views\test\testRenderAutomationList.html" />
    <Content Include="views\仓存管理\仓库调拨\Kf_MoveStockStepOutBill_Fast.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_ClassTimePrjSub.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_OrderBackInfo.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_OrderBackInfo.html.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_OrderLev.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_WorkPayType.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_WorkType.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_ClassTimePrjSub.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Pay_PeriodInfoSet.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_WorkPayType.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_WorkType.html" />
    <Content Include="views\基础资料\公用基础资料\Pay_PeriodInfoSet.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_OrderBackInfo.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_OrderLev.html" />
@@ -726,6 +733,20 @@
    <Content Include="views\生产管理\产量汇报单\Sc_Add_ProductReportBillList.html" />
    <Content Include="views\生产管理\产量汇报单\Sc_ProductReportBillList.html" />
    <Content Include="views\生产管理\产量汇报单\Sc_ProductReportBillList_Web.html" />
    <Content Include="views\生产管理\异常反馈单\EXecptFeedMessage.html" />
    <Content Include="views\生产管理\异常反馈单\Sc_Add_MESExecptFeedBackBillList.html" />
    <Content Include="views\生产管理\异常反馈单\Sc_MESExecptFeedBackBillList.html" />
    <Content Include="views\生产管理\报工台工序\产量汇报\Sc_Add_ProductReportStepBillList.html" />
    <Content Include="views\生产管理\报工台工序\产量汇报\Sc_ProductReportStepBillList.html" />
    <Content Include="views\生产管理\报工台工序\产量汇报\Sc_ProductReportStepBillList_Web.html" />
    <Content Include="views\生产管理\报工台工序\停工\Sc_Add_MESStopStepWorkBillList.html" />
    <Content Include="views\生产管理\报工台工序\停工\Sc_MESStopStepWorkBillList.html" />
    <Content Include="views\生产管理\报工台工序\完工\Sc_Add_MESEndStepWorkBillList.html" />
    <Content Include="views\生产管理\报工台工序\完工\Sc_MESEndStepWorkBillList.html" />
    <Content Include="views\生产管理\报工台工序\开工\Sc_Add_MESBeginStepWorkBillList.html" />
    <Content Include="views\生产管理\报工台工序\开工\Sc_MESBeginStepWorkBillList.html" />
    <Content Include="views\生产管理\报工台工序\生产汇报\Sc_ICMOReportBillList.html" />
    <Content Include="views\生产管理\报工平台功能页\LineBindStep.html" />
    <Content Include="views\生产管理\报工平台功能页\LineBind.html" />
    <Content Include="views\生产管理\生产上料单\Sc_MaterToSourceBillList - 复制.html" />
    <Content Include="views\生产管理\生产上料单\Sc_MaterToSourceBillList.html" />
@@ -1090,6 +1111,7 @@
  <ItemGroup>
    <Folder Include="views\仓存管理\调拨单核对\" />
    <Folder Include="views\仓存管理\调拨单稽核\" />
    <Folder Include="views\生产管理\报工台工序\返工\" />
  </ItemGroup>
  <PropertyGroup>
    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>