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

yangle

2022-08-16 e261e4ab0848bcdd36aafe63e6835eac723270f1

 WebTM/WebTM.csproj

@@ -215,6 +215,8 @@
    <Content Include="views\grf\花型条码.grf" />
    <Content Include="views\grf\工序流转.grf" />
    <Content Include="views\grf\cabinet-CG.grf" />
    <Content Include="views\grf\瑞与祺江苏打印模板.grf" />
    <Content Include="views\grf\cabinet-SB.grf" />
    <None Include="Web.Debug.config">
      <DependentUpon>Web.config</DependentUpon>
    </None>
@@ -624,6 +626,7 @@
    <Content Include="views\基础资料\公用基础资料\xmlLBM_EquipMaintainBill.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_EquipMaintainPlanBill.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_EquipTypeBill.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_Gy_HEquipResumeBillList.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_Gy_Material.aspx" />
    <Content Include="views\基础资料\公用基础资料\Gy_DepartmentList.html" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_HGy_BarCodeBill.aspx" />
@@ -784,6 +787,7 @@
    <Content Include="views\模治具管理\模治具管理\Gy_CheckToolsFileMainList.html" />
    <Content Include="views\模治具管理\模治具管理\Gy_MouldFileList.html" />
    <Content Include="views\模治具管理\模治具管理\Gy_MouldFile.html" />
    <Content Include="views\模治具管理\模治具管理\Gy_MouldFileResume.html" />
    <Content Include="views\模治具管理\模治具管理\Sb_Add_MouldRepairWorkBillList.html" />
    <Content Include="views\模治具管理\模治具管理\Sc_Add_MouldConkBookBillList.html" />
    <Content Include="views\模治具管理\模治具管理\Sc_Add_MouldDotCheckBillList.html" />
@@ -851,6 +855,7 @@
    <Content Include="views\生产管理\日计划基础资料\Gy_WorkWarehouseBill_Add.html" />
    <Content Include="views\生产管理\日计划基础资料\JIT_NeedMaterPlanConfigBillList.html" />
    <Content Include="views\生产管理\日计划基础资料\JIT_NeedMaterPlanConfigBill_Add.html" />
    <Content Include="views\生产管理\日计划报表\ReportMOMaterReadysBillList.html" />
    <Content Include="views\生产管理\日计划报表\ReportPODemandPlanBillList.html" />
    <Content Include="views\生产管理\日计划报表\ReportPODemandPlanBillList_S.html" />
    <Content Include="views\生产管理\日计划报表\ReportWorkDemandPlanBillList.html" />
@@ -883,6 +888,7 @@
    <Content Include="views\生产管理\生产装箱单\Sc_PackUnionBill_Fast.html" />
    <Content Include="views\生产管理\生产计划平台\JIT_DayPlanPlatForm.html" />
    <Content Include="views\生产管理\生产计划平台\JIT_DayPlanPlatFormImport.html" />
    <Content Include="views\生产管理\生产计划平台\Sc_ICMOSortBillList.html" />
    <Content Include="views\生产管理\生产退库单\Sc_ProductionReturnList.html" />
    <Content Include="views\生产管理\组托单编辑\Sc_GroupOrderBillEdit_Fast.html" />
    <Content Include="views\生产管理\组装单\Sc_GroupOrderBillList.html" />
@@ -933,6 +939,7 @@
    <Content Include="views\设备管理\Sb_EquipMaintainPlanBillEdit.html" />
    <Content Include="views\设备管理\Sb_EquipMaintainPlanBillList.html" />
    <Content Include="views\设备管理\Sc_Add_MouldDotCheckBillList.html" />
    <Content Include="views\设备管理\设备档案\Gy_EquipFileBillResume.html" />
    <Content Include="views\设备管理\设备档案\Gy_EquipFileMainEdit.html" />
    <Content Include="views\设备管理\设备档案\Gy_EquipFileMainList.html" />
    <Content Include="views\设备管理\设备维修派工单\Sb_EquipRepairSendWorkBillEdit.html" />
@@ -1138,6 +1145,13 @@
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_EquipTypeBill.aspx.designer.cs">
      <DependentUpon>xmlLBM_EquipTypeBill.aspx</DependentUpon>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_Gy_HEquipResumeBillList.aspx.cs">
      <DependentUpon>xmlLBM_Gy_HEquipResumeBillList.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_Gy_HEquipResumeBillList.aspx.designer.cs">
      <DependentUpon>xmlLBM_Gy_HEquipResumeBillList.aspx</DependentUpon>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_Gy_Material.aspx.cs">
      <DependentUpon>xmlLBM_Gy_Material.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>