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

yangle

2022-11-30 3b5b27c8efa2bfb66eec07a1efd7a1f47cc029e6

 WebTM/WebTM.csproj

@@ -111,13 +111,17 @@
    <Content Include="views\Baseset\基础资料\Gy_QCCheckProjectListView.html" />
    <Content Include="views\Baseset\基础资料\Gy_RoutingBillList.html" />
    <Content Include="views\Baseset\基础资料\Gy_RoutingGroup.html" />
    <Content Include="views\Baseset\基础资料\Gy_TechnologyParameterList.html" />
    <Content Include="views\Baseset\基础资料\Gy_TechParameterUnitList.html" />
    <Content Include="views\Baseset\基础资料\Gy_StockPlaceListNew.html" />
    <Content Include="views\Baseset\基础资料\Gy_UnitGroup.html" />
    <Content Include="views\Baseset\基础资料\Gy_WarehouseListNew.html" />
    <Content Include="views\Baseset\基础资料\Gy_WasterWHList.html" />
    <Content Include="views\Baseset\基础资料\Gy_WHList.html" />
    <Content Include="views\Baseset\基础资料\Gy_WWBadWHList.html" />
    <Content Include="views\Baseset\基础资料\Gy_WWWasterWHList.html" />
    <Content Include="views\Baseset\基础资料\Gy_WarehouseList_JIT.html" />
    <Content Include="views\Baseset\基础资料\OtherOutRequestBillList.html" />
    <Content Include="views\Baseset\基础资料\Sc_ICMOBillListView2.html" />
    <Content Include="views\Baseset\基础资料\Sc_ProcessExchangeBillListView.html" />
    <Content Include="views\Baseset\基础资料\Gy_QCCheckItemListView.html" />
@@ -183,12 +187,13 @@
    <Content Include="views\基础资料\公用基础资料\Gy_ConkType.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_PackType.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_PackType.html" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_Sc_ProcessExchangeBillList_SubList.aspx" />
    <Content Include="views\基础资料\基础资料\Gy_MateMouldList.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_TechnologyParameterUnitList.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_TechnologyParameterUnit_Add_Edit_.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_TechnologyParameter_Add_Edit_.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_TechParamByProcList.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_TechParamByProcList_Add_Edit_.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_TechParamByProc.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_WorkCenterDyCol.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_WorkPayType.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_WorkStationList.html" />
@@ -914,6 +919,7 @@
    <Content Include="views\生产管理\生产上料单\Sc_MaterToSourceBillList - 复制.html" />
    <Content Include="views\生产管理\生产上料单\Sc_MaterToSourceBillList.html" />
    <Content Include="views\生产管理\生产任务单\Sc_ICMOBillEdit.html" />
    <Content Include="views\生产管理\生产任务单\Sc_ICMOBillEdit_NoTable.html" />
    <Content Include="views\生产管理\生产任务单\Sc_ICMOBillImport.html" />
    <Content Include="views\生产管理\生产停工单\Sc_Add_MESStopWorkBillList - 复制.html" />
    <Content Include="views\生产管理\生产停工单\Sc_Add_MESStopWorkBillList.html" />
@@ -1029,6 +1035,7 @@
    <Content Include="views\质量管理\产品入库检验单\QC_LastPieceCheckBillList.html" />
    <Content Include="views\质量管理\出厂检验单\QC_OutCompCheckBillList.html" />
    <Content Include="views\质量管理\巡检记录单\QC_PatrolProcCheckBillList.html" />
    <Content Include="views\质量管理\来料检验单\Kf_SCStockInCheckBill_Fast.html" />
    <Content Include="views\质量管理\来料检验单\Kf_QCStockInCheckBill_Fast.html" />
    <Content Include="views\质量管理\来料检验单\QC_Add_Edit_POStockInCheckBillList.html" />
    <Content Include="views\质量管理\来料检验单\QC_Add_Edit_POStockInCheckBill.html" />
@@ -1089,6 +1096,8 @@
    <Content Include="views\领料发货\收料入库\Kf_ReciveBill_Check.html" />
    <Content Include="views\领料发货\收料入库\Kf_ReciveBill_Fast.html" />
    <Content Include="views\领料发货\生产补料\Kf_MateReplenishOutBill_Check_New.html" />
    <Content Include="views\领料发货\生产补料\Kf_MateReplenishOutBill_CheckList_New.html" />
    <Content Include="views\领料发货\销售出库\Kf_SellOutBill_CheckList_New.html" />
    <Content Include="views\领料发货\销售出库\Kf_SellOutBill_Check_New.html" />
    <Content Include="views\领料发货\领料出库\Kf_MateOutBackBillEdit.html" />
    <Content Include="views\领料发货\领料出库\Kf_MateOutBackBill_Fast.html" />
@@ -1470,6 +1479,13 @@
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_Sc_ProcessExchangeBillList.aspx.designer.cs">
      <DependentUpon>xmlLBM_Sc_ProcessExchangeBillList.aspx</DependentUpon>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_Sc_ProcessExchangeBillList_SubList.aspx.cs">
      <DependentUpon>xmlLBM_Sc_ProcessExchangeBillList_SubList.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_Sc_ProcessExchangeBillList_SubList.aspx.designer.cs">
      <DependentUpon>xmlLBM_Sc_ProcessExchangeBillList_SubList.aspx</DependentUpon>
    </Compile>
    <Compile Include="views\生产工序管理\工序汇报单\xmlLBM_ProcessReport.aspx.cs">
      <DependentUpon>xmlLBM_ProcessReport.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>