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

wtt

2026-02-03 7cb06e1b369e7d79b314a8a3573b215aa078c4c5

 WebTM/WebTM.csproj

@@ -195,6 +195,7 @@
    <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\基础资料\公用基础资料\Add_Edit_Gy_Car.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_Driver.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_ItemMoney.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_CarList.html" />
@@ -477,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" />
@@ -602,6 +607,8 @@
    <Content Include="views\基础资料\基础资料\Gy_CarTypeList.html" />
    <Content Include="views\基础资料\基础资料\Gy_CarTypeEdit.html" />
    <Content Include="views\基础资料\工资基础资料\Gy_WorkType_Excel.html" />
    <Content Include="views\基础资料\成本基础资料\Add_Edit_Gy_CostAverageType.html" />
    <Content Include="views\基础资料\成本基础资料\Gy_CostAverageTypeList.html" />
    <Content Include="views\基础资料\生产基础资料\Add_Edit_Gy_ProcMul.html" />
    <Content Include="views\基础资料\生产基础资料\Gy_BadReason_Excel.html" />
    <Content Include="views\基础资料\生产基础资料\Gy_ScrapReason_Excel.html" />
@@ -642,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" />
@@ -710,11 +719,7 @@
    <Content Include="views\模治具管理\模治具管理\Sc_MouldMaintainRuleBill_Excel.html" />
    <Content Include="views\模治具管理\模治具管理\Sc_MouldMaintainRuleBillList_PDA.html" />
    <Content Include="views\物流管理\运输定位\Add_Edit_WL_YayBill.html" />
    <Content Include="views\物流管理\运输定位\Pay_WayBillPaymentBillEdit.html" />
    <Content Include="views\物流管理\运输定位\Pay_WayBillPaymentBillList.html" />
    <Content Include="views\物流管理\运输定位\WL_YayBill.html" />
    <Content Include="views\物流管理\运输定位\YF_PayMentOtherBillMainList_Transport.html" />
    <Content Include="views\物流管理\运输定位\YF_PayMentOtherBillMain_Transport.html" />
    <Content Include="views\物流管理\运输定位\车辆轨迹表\Cg_CarTrajectoryBillList.html" />
    <Content Include="views\物流管理\运输定位\车辆轨迹表\Cg_CarTrajectoryBillEdit.html">
      <BrowseToURL>~/views/物流管理/运输定位/车辆轨迹表/Cg_CarTrajectoryBillEdit.html</BrowseToURL>
@@ -961,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" />
@@ -994,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" />
@@ -2712,7 +2719,6 @@
    <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" />