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

wtt

2026-02-03 7cb06e1b369e7d79b314a8a3573b215aa078c4c5

 WebTM/WebTM.csproj

@@ -478,6 +478,10 @@
    <Content Include="views\基础资料\公用基础资料\Gy_MaterialPackingRelation_Edit.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_ItemMoney.html" />
    <Content Include="views\基础资料\公用基础资料\Cg_ContractTransportBillList.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_CostItemFixRate.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_CostItemFixRate.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_CostItemAverageType.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_CostItemAverageType.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" />
@@ -645,6 +649,8 @@
    <Content Include="views\应收管理\报表分析\Xs_SellOutCompareToProductReport.html" />
    <Content Include="views\应收管理\报表分析\Xs_SeOrderBarCodeInAndOutStockDetailReport.html" />
    <Content Include="views\应收管理\报表分析\YS_CusShouldIncomeMaterEntryReport.html" />
    <Content Include="views\成本管理\费用单引入\CB_CostProjectImport.html" />
    <Content Include="views\成本管理\费用单引入\CB_ItemMoneyBillImport.html" />
    <Content Include="views\条码明细\Kf_MateOutBillList_CodeDetail.html" />
    <Content Include="views\案例代码\华远\HY_HistogramReport_ForPCSCheckNote.html" />
    <Content Include="views\案例代码\华远\HY_HistogramReport.html" />
@@ -960,6 +966,7 @@
    <Content Include="views\车间管理\关键件绑定\Sc_KeyElementBindingList.html" />
    <Content Include="views\车间管理\关键件绑定\Sc_KeyElementBinding.html" />
    <Content Include="views\车间管理\单品过站\SingleItemTransitList.html" />
    <Content Include="views\车间管理\单品过站_小卫\Cj_ProcessItemStationPlatform_ShippingExport.html" />
    <Content Include="views\车间管理\单品过站_小卫\Cj_SaveSNByICMO.html" />
    <Content Include="views\车间管理\单品过站_小卫\Cj_ProcessItemStationPlatform_generateSNCode.html" />
    <Content Include="views\车间管理\单品过站_小卫\Cj_ProcessItemStationPlatform_checkSN.html" />
@@ -993,6 +1000,7 @@
    <Content Include="views\车间管理\工序出站汇报单\Cj_StationOutBillSync.html" />
    <Content Include="views\车间管理\工序流转\MES_CenterCheckBill.html" />
    <Content Include="views\车间管理\工序流转\MES_CenterCheckBillList.html" />
    <Content Include="views\车间管理\工序流转卡\Sc_ProcessExchangeArrangement_PGPL.html" />
    <Content Include="views\车间管理\工序流转卡\Sc_ProcessExchangeArrangementHEmp.html" />
    <Content Include="views\车间管理\工序流转卡\Sc_ProcessExchangeBillLIst_QueryCheckRecord.html" />
    <Content Include="views\车间管理\工序流转卡\Sc_ProcessExchangeBill_DH.html" />
@@ -2711,13 +2719,16 @@
    <Content Include="views\验收入库\委外出库\Kf_EntrustOutBill_Fast.html" />
    <Content Include="views\验收入库\委外出库\Kf_EntrustOutBill_FastList.html" />
    <Content Include="Web.config" />
    <None Include="Properties\PublishProfiles\Web.pubxml" />
  </ItemGroup>
  <ItemGroup>
    <Compile Include="App_Data\LogService.cs" />
    <Compile Include="App_Data\MssqlReportData.cs" />
    <Compile Include="App_Data\ReportData.cs" />
    <Compile Include="Properties\AssemblyInfo.cs" />
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_Sc_ProcessExchangeBillList_HZ.aspx.cs">
      <DependentUpon>xmlLBM_Sc_ProcessExchangeBillList_HZ.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_Sc_ProcessExchangeBillList_stock.aspx.cs">
      <DependentUpon>xmlLBM_Sc_ProcessExchangeBillList_stock.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>