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

wtt

2026-02-28 ce0b9bf623d1f76759fbed72f8bb487e1cf15bb7

 WebTM/WebTM.csproj

@@ -192,13 +192,25 @@
    <Content Include="views\Baseset\基础资料\Gy_EnvironmentTestItem.html" />
    <Content Include="views\Baseset\基础资料\Gy_ErrMsgBackType.html" />
    <Content Include="views\Baseset\基础资料\Gy_EnvironmentTestSchemeBillList.html" />
    <Content Include="views\WMS扫码模块\委外领料\Kf_EntrustOutBackBill_CheckList_PDA.html" />
    <Content Include="views\WMS扫码模块\委外领料\Kf_EntrustOutBackBill_Check_PDA.html" />
    <Content Include="views\WMS扫码模块\生产入库\Kf_ProductInBackBill_CheckList_PDA.html" />
    <Content Include="views\WMS扫码模块\生产入库\Kf_ProductInBackBill_Check_PDA.html" />
    <Content Include="views\WMS扫码模块\生产领料\Kf_MateOutBackBill_Check_PDA.html" />
    <Content Include="views\WMS扫码模块\生产领料\Kf_MateOutBackBill_CheckList_PDA.html" />
    <Content Include="views\WMS扫码模块\库存转移\KF_ICInventory_WorkShop_PDA.html" />
    <Content Include="views\WMS扫码模块\采购入库\Kf_POStockInBackBill_CheckList_PDA.html" />
    <Content Include="views\WMS扫码模块\采购入库\Kf_POStockInBackBill_Check_PDA.html" />
    <Content Include="views\WMS扫码模块\销售出库\Kf_SellOutBackBill_CheckList_PDA.html" />
    <Content Include="views\WMS扫码模块\销售出库\Kf_SellOutBackBill_Check_PDA.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_Car.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_CostCenter.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_CostItem.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_Driver.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_ItemMoney.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_CarList.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_CostCenter.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_CostItem.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_DriverList.html" />
    <Content Include="views\基础资料\公用基础资料\Cg_ContractTransportBillEdit.html" />
    <Content Include="views\包装出入库明细\Kf_PackStockDetailQuery.html" />
@@ -482,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_HGy_BarCodeBill_XBarcode.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_HGy_BarCodeBill_ZB.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_HGy_BarCodeBill_MiddleBox.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_Cj_StationOutBillList_HZ.aspx" />
@@ -608,6 +621,7 @@
    <Content Include="views\基础资料\基础资料\Gy_CarTypeEdit.html" />
    <Content Include="views\基础资料\工资基础资料\Gy_WorkType_Excel.html" />
    <Content Include="views\基础资料\成本基础资料\Add_Edit_Gy_CostAverageType.html" />
    <Content Include="views\基础资料\成本基础资料\CB_Wip_excelImport.html" />
    <Content Include="views\基础资料\成本基础资料\Gy_CostAverageTypeList.html" />
    <Content Include="views\基础资料\生产基础资料\Add_Edit_Gy_ProcMul.html" />
    <Content Include="views\基础资料\生产基础资料\Gy_BadReason_Excel.html" />
@@ -649,7 +663,12 @@
    <Content Include="views\应收管理\报表分析\Xs_SellOutCompareToProductReport.html" />
    <Content Include="views\应收管理\报表分析\Xs_SeOrderBarCodeInAndOutStockDetailReport.html" />
    <Content Include="views\应收管理\报表分析\YS_CusShouldIncomeMaterEntryReport.html" />
    <Content Include="views\成本管理\成本费用单\CB_ItemMoneyBillList.html" />
    <Content Include="views\成本管理\成本费用单\CB_ItemMoneyBillEdit.html" />
    <Content Include="views\成本管理\费用单引入\CB_CostProjectImport.html" />
    <Content Include="views\成本管理\费用单引入\CB_CostAccounting.html" />
    <Content Include="views\成本管理\费用单引入\CB_ItemMoneyBillImport.html" />
    <Content Include="views\成本管理\费用单引入\CB_ItemMoneyBill_Excel.html" />
    <Content Include="views\条码明细\Kf_MateOutBillList_CodeDetail.html" />
    <Content Include="views\案例代码\华远\HY_HistogramReport_ForPCSCheckNote.html" />
    <Content Include="views\案例代码\华远\HY_HistogramReport.html" />
@@ -867,7 +886,6 @@
    <Content Include="views\设备管理\设备报表\Sb_EquipRepairTaskReport.html" />
    <Content Include="views\设备管理\设备报表\Sb_EquipResumeCheckQuery.html" />
    <Content Include="views\设备管理\设备报表\Sb_EquipRepairReport.html" />
    <Content Include="views\设备管理\设备报表\编辑页面\Edit_Sb_EquipMentCollectionTechParam.html" />
    <Content Include="views\设备管理\设备档案\Gy_EquipFile_Excel.html" />
    <Content Include="views\设备管理\设备规程单\Sb_EquipPatrolCheckRuleEdit.html" />
    <Content Include="views\设备管理\设备规程单\Sb_EquipPatrolCheckRuleList.html" />
@@ -2725,6 +2743,24 @@
    <Compile Include="App_Data\MssqlReportData.cs" />
    <Compile Include="App_Data\ReportData.cs" />
    <Compile Include="Properties\AssemblyInfo.cs" />
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_HGy_BarCodeBill_MiddleBox.aspx.cs">
      <DependentUpon>xmlLBM_HGy_BarCodeBill_MiddleBox.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_HGy_BarCodeBill_MiddleBox.aspx.designer.cs">
      <DependentUpon>xmlLBM_HGy_BarCodeBill_MiddleBox.aspx</DependentUpon>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_HGy_BarCodeBill_XBarcode.aspx.cs">
      <DependentUpon>xmlLBM_HGy_BarCodeBill_XBarcode.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_HGy_BarCodeBill_ZB.aspx.cs">
      <DependentUpon>xmlLBM_HGy_BarCodeBill_ZB.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_HGy_BarCodeBill_ZB.aspx.designer.cs">
      <DependentUpon>xmlLBM_HGy_BarCodeBill_ZB.aspx</DependentUpon>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_Sc_ProcessExchangeBillList_HZ.aspx.cs">
      <DependentUpon>xmlLBM_Sc_ProcessExchangeBillList_HZ.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>