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

llj

2026-01-15 2cb9b601f823d9e512126de5cf2504cd6add8c7a

 WebTM/WebTM.csproj

@@ -194,8 +194,10 @@
    <Content Include="views\Baseset\基础资料\Gy_EnvironmentTestSchemeBillList.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_DriverList.html" />
    <Content Include="views\基础资料\公用基础资料\Cg_ContractTransportBillEdit.html" />
    <Content Include="views\包装出入库明细\Kf_PackStockDetailQuery.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_OperationBill_Report.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_MultipleCodes_Report.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_PlanImplementation_Report.html" />
@@ -473,7 +475,6 @@
    <Content Include="views\基础资料\公用基础资料\Gy_ItemMoney.html" />
    <Content Include="views\基础资料\公用基础资料\Cg_ContractTransportBillList.html" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_HGy_BarCodeBill_ZB.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_xiaoweizutuo.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_HGy_BarCodeBill_MiddleBox.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_Sc_ProcessExchangeBillList_stock.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlzuotuo_xiaowei.aspx" />
@@ -703,6 +704,8 @@
    <Content Include="views\模治具管理\模治具管理\Gy_BarCodeBillListLink.html" />
    <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\物流管理\运输定位\WL_YayBill.html" />
    <Content Include="views\物流管理\运输定位\车辆轨迹表\Cg_CarTrajectoryBillList.html" />
    <Content Include="views\物流管理\运输定位\车辆轨迹表\Cg_CarTrajectoryBillEdit.html">
      <BrowseToURL>~/views/物流管理/运输定位/车辆轨迹表/Cg_CarTrajectoryBillEdit.html</BrowseToURL>
@@ -973,6 +976,8 @@
    <Content Include="views\设备管理\设备开机单\Sb_EquipBeginBillList.html" />
    <Content Include="views\质量管理\巡检记录单\MES_QC_PatrolProcCheckOtherBill_PDA.html" />
    <Content Include="views\车间管理\启动点检单\Sc_WorkDotCheckBillList_Day.html" />
    <Content Include="views\车间管理\员工签到记录单\Add_Edit_Sc_EmployeeSignInNoteBill.html" />
    <Content Include="views\车间管理\员工签到记录单\Sc_EmployeeSignInNoteBill.html" />
    <Content Include="views\车间管理\委外工序发出单\Cj_StationEntrustInBillSync.html" />
    <Content Include="views\车间管理\委外工序接收单\Cj_StationEntrustOutBillSync.html" />
    <Content Include="views\车间管理\委外工序接收单\Sc_ProcessExchangeIssueBillList_PDA.html" />
@@ -2710,9 +2715,6 @@
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_HGy_BarCodeBill_ZB.aspx.designer.cs">
      <DependentUpon>xmlLBM_HGy_BarCodeBill_ZB.aspx</DependentUpon>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_xiaoweizutuo.aspx.designer.cs">
      <DependentUpon>xmlLBM_xiaoweizutuo.aspx</DependentUpon>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_HGy_BarCodeBill_MiddleBox.aspx.cs">
      <DependentUpon>xmlLBM_HGy_BarCodeBill_MiddleBox.aspx</DependentUpon>