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

yusijie

2026-03-09 43542a9ba09b4103c82c46f088cb7566a69acf58

 WebTM/WebTM.csproj

@@ -494,6 +494,7 @@
    <Content Include="views\基础资料\公用基础资料\Gy_CostItemFixRate.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_CostItemAverageType.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_CostItemAverageType.html" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_Gy_WorkStationList.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_HGy_BarCodeBill_XBarcode.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_HGy_BarCodeBill_ZB.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_HGy_BarCodeBill_MiddleBox.aspx" />
@@ -665,6 +666,11 @@
    <Content Include="views\应收管理\报表分析\YS_CusShouldIncomeMaterEntryReport.html" />
    <Content Include="views\成本管理\成本费用单\CB_ItemMoneyBillList.html" />
    <Content Include="views\成本管理\成本费用单\CB_ItemMoneyBillEdit.html" />
    <Content Include="views\成本管理\成本费用报表\CB_ActualItemMoneyCost.html" />
    <Content Include="views\成本管理\成本费用调整单\CB_ChangeMoneyBillEdit.html" />
    <Content Include="views\成本管理\成本费用调整单\CB_ChangeMoneyBillList.html" />
    <Content Include="views\成本管理\期初在产品表\Gy_WIPBal_Excel.html" />
    <Content Include="views\成本管理\期初在产品表\Kf_WIPBal.html" />
    <Content Include="views\成本管理\费用单引入\CB_CostProjectImport.html" />
    <Content Include="views\成本管理\费用单引入\CB_CostAccounting.html" />
    <Content Include="views\成本管理\费用单引入\CB_ItemMoneyBillImport.html" />
@@ -673,6 +679,7 @@
    <Content Include="views\案例代码\华远\HY_HistogramReport_ForPCSCheckNote.html" />
    <Content Include="views\案例代码\华远\HY_HistogramReport.html" />
    <Content Include="views\案例代码\华远\HY_InterfaceTest.html" />
    <Content Include="views\模治具管理\器具报表\Sc_MoldMainoverdueWarnReport.html" />
    <Content Include="views\模治具管理\器具领用申请单\Sc_MouldOutRequestBillEdit.html" />
    <Content Include="views\模治具管理\器具领用申请单\Sc_MouldOutRequestBillList.html" />
    <Content Include="views\模治具管理\器具报表\Sc_MouldLifeUsePicReport.html" />
@@ -748,6 +755,7 @@
    <Content Include="views\生产管理\三升排产\JIT_DayPlanPlatFormImport_SS.html" />
    <Content Include="views\生产管理\制造周期报表\Sc_ProductionCycleBillList.html" />
    <Content Include="views\生产管理\宝工排产\JIT_DayPlanPlatForm_New.html" />
    <Content Include="views\生产管理\投料防错单\Sc_FeedingErrorProofingBillList.html" />
    <Content Include="views\生产管理\报工台工序\停工恢复单\Sc_MESStopRestoreWorkBill.html" />
    <Content Include="views\生产管理\凯贝日计划导入\JIT_DayPlanPlatForm_KB.html" />
    <Content Include="views\生产管理\发货计划平台（三升）\Xs_SendGoodsPlanForm.html" />
@@ -2611,6 +2619,7 @@
    <Content Include="views\领料发货\生产补料\Kf_MateReplenishOutBill_CheckList_New.html" />
    <Content Include="views\领料发货\生产领料\Kf_ProductReceiveMaterialBillEdit.html" />
    <Content Include="views\领料发货\生产领料\Kf_ProductReceiveMaterialBillList.html" />
    <Content Include="views\领料发货\销售出库\Kf_SellOutBillList_template.html" />
    <Content Include="views\领料发货\销售出库\Kf_SellOutBillList_YP.html" />
    <Content Include="views\领料发货\销售出库\Kf_SellOutBillQuery.html" />
    <Content Include="views\领料发货\销售出库\Kf_SellOutBill.html" />
@@ -2619,6 +2628,7 @@
    <Content Include="views\领料发货\销售出库\Kf_SellOutBill_Check_New.html" />
    <Content Include="views\领料发货\销售出库\Kf_SellOutBillList_BarCodeNote.html" />
    <Content Include="views\领料发货\销售出库\Kf_SellOutBill_QiaoYi.html" />
    <Content Include="views\领料发货\销售出库\Kf_SellOutBill_template.html" />
    <Content Include="views\领料发货\领料出库\Kf_MateOutBillEdit_MaoJian.html" />
    <Content Include="views\领料发货\领料出库\Kf_MateOutBillEdit_YangMao.html" />
    <Content Include="views\领料发货\领料出库\Kf_MateOutRequestBill.html" />
@@ -2743,6 +2753,13 @@
    <Compile Include="App_Data\MssqlReportData.cs" />
    <Compile Include="App_Data\ReportData.cs" />
    <Compile Include="Properties\AssemblyInfo.cs" />
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_Gy_WorkStationList.aspx.cs">
      <DependentUpon>xmlLBM_Gy_WorkStationList.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_Gy_WorkStationList.aspx.designer.cs">
      <DependentUpon>xmlLBM_Gy_WorkStationList.aspx</DependentUpon>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_HGy_BarCodeBill_MiddleBox.aspx.cs">
      <DependentUpon>xmlLBM_HGy_BarCodeBill_MiddleBox.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>