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

wtt

2025-12-08 5d5dbb3cb78f6cac06574ad27e22473e4442bb1c

 WebTM/WebTM.csproj

@@ -192,7 +192,11 @@
    <Content Include="views\Baseset\基础资料\Gy_EnvironmentTestItem.html" />
    <Content Include="views\Baseset\基础资料\Gy_ErrMsgBackType.html" />
    <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_DriverList.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_OperationBill_Report.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_MultipleCodes_Report.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_PlanImplementation_Report.html" />
    <Content Include="views\Baseset\基础资料\Gy_Shifts.html" />
    <Content Include="views\Baseset\基础资料\Gy_GroupList.html" />
@@ -463,6 +467,10 @@
    <Content Include="views\品质管理\客诉处理\Crm_CustomerAppealBill_KaiBei.html" />
    <Content Include="views\品质管理\客诉处理\Crm_CustomerAppealBill.html" />
    <Content Include="views\品质管理\客诉处理\Crm_CustomerAppealBillList.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_MaterialPackingRelationList.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_MaterialPackingRelation_Edit.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_ItemMoney.html" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_Sc_ProcessExchangeBillList_stock.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlzuotuo_xiaowei.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_HGy_BarCodeBill_XinDa.aspx" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_CheckNoteItem.html" />
@@ -541,6 +549,7 @@
    <Content Include="views\基础资料\公用基础资料\xmlLBM_Sc_ICMOReportBillList2.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_Sc_ICMOReportBillList.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_QC_TakeSampleCheckBillMainList.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_Sc_ProcessExchangeBillList_Small.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_Xs_OutDoorBillList.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_HPOStockInChangeBillList.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_HPOOrderChangeBillList.aspx" />
@@ -579,6 +588,8 @@
    <Content Include="views\基础资料\基础资料\Gy_Repair_Excel.html" />
    <Content Include="views\基础资料\基础资料\Gy_Maintain_Excel.html" />
    <Content Include="views\基础资料\基础资料\Gy_DotCheck_Excel.html" />
    <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_ProcMul.html" />
    <Content Include="views\基础资料\生产基础资料\Gy_BadReason_Excel.html" />
@@ -622,6 +633,8 @@
    <Content Include="views\案例代码\华远\HY_HistogramReport_ForPCSCheckNote.html" />
    <Content Include="views\案例代码\华远\HY_HistogramReport.html" />
    <Content Include="views\案例代码\华远\HY_InterfaceTest.html" />
    <Content Include="views\模治具管理\器具领用申请单\Sc_MouldOutRequestBillEdit.html" />
    <Content Include="views\模治具管理\器具领用申请单\Sc_MouldOutRequestBillList.html" />
    <Content Include="views\模治具管理\器具报表\Sc_MouldLifeUsePicReport.html" />
    <Content Include="views\模治具管理\器具报表\Sc_MouldDotCheckTaskReport.html" />
    <Content Include="views\模治具管理\器具报表\Sc_MouldMaintainTaskReport.html" />
@@ -631,6 +644,10 @@
    <Content Include="views\模治具管理\器具报表\Sc_MouldResumeCheckQuery.html" />
    <Content Include="views\模治具管理\器具点检规程单\Sc_MouldDotCheckRuleBillList_PDA.html" />
    <Content Include="views\模治具管理\器具点检规程单\Sc_MouldDotCheckRuleBill_Excel.html" />
    <Content Include="views\模治具管理\器具入库申请单\Sc_MouldInRequestBillEdit.html" />
    <Content Include="views\模治具管理\器具入库申请单\Sc_MouldInRequestBillList.html" />
    <Content Include="views\模治具管理\器具调拨申请单\Sc_MouldMoveStockRequestBillList.html" />
    <Content Include="views\模治具管理\器具调拨申请单\Sc_MouldMoveStockRequestBillEdit.html" />
    <Content Include="views\模治具管理\模具其他入库单\Sc_MouldOtherInBillList_PDA.html" />
    <Content Include="views\模治具管理\模具其他入库单\Sc_MouldOtherInBill_PDA_old.html" />
    <Content Include="views\模治具管理\模具其他出库单\Sc_MouldOtherOutBillList_PDA.html" />
@@ -665,12 +682,17 @@
    <Content Include="views\模治具管理\模具采购入库单\Sc_MouldProdInBill_PDA_old.html" />
    <Content Include="views\模治具管理\模治具仓库管理\Sc_Add_MouldLifeChangeBillList_PDA.html" />
    <Content Include="views\模治具管理\模治具仓库管理\Sc_MouldLifeChangeBillList_PDA.html" />
    <Content Include="views\模治具管理\模治具仓库管理\Sc_MouldProdBackBillEdit.html" />
    <Content Include="views\模治具管理\模治具仓库管理\Sc_MouldProdMoveBillEdit.html" />
    <Content Include="views\模治具管理\模治具仓库管理\Sc_MouldProdOutBillEdit_old.html" />
    <Content Include="views\模治具管理\模治具点检保养\Sc_MouldDotCheckBill_PDA.html" />
    <Content Include="views\模治具管理\模治具点检保养\Sc_MouldDotCheckBill_PDA_OLD.html" />
    <Content Include="views\模治具管理\模治具点检保养\Sc_MouldMaintainBill_PDA.html" />
    <Content Include="views\模治具管理\模治具管理\Gy_BarCodeBillList_XinDa.html" />
    <Content Include="views\模治具管理\模治具管理\Gy_BarCodeBillList_JiaNan.html" />
    <Content Include="views\模治具管理\模治具管理\Gy_MouldFile_Excel.html" />
    <Content Include="views\模治具管理\模治具管理\Gy_QCVerificationBillMain.html" />
    <Content Include="views\模治具管理\模治具管理\Add_Edit_Gy_QCVerificationBill.html" />
    <Content Include="views\模治具管理\模治具管理\Sc_MouldMaintainRuleBill_Excel.html" />
    <Content Include="views\模治具管理\模治具管理\Sc_MouldMaintainRuleBillList_PDA.html" />
    <Content Include="views\生产管理\三升排产\JIT_DayPlanPlatForm_Sec.html" />
@@ -781,6 +803,7 @@
    <Content Include="views\计划管理\工艺路线\Gy_RoutingBillHSEQ.html" />
    <Content Include="views\计划管理\工艺路线\Gy_RoutingBillCheckQuery.html" />
    <Content Include="views\计划管理\工艺路线\Gy_RoutingBillCloseList.html" />
    <Content Include="views\计划管理\工艺路线\Gy_RoutingBillimport_WorkQty.html" />
    <Content Include="views\计划管理\工艺路线\Gy_RoutingBillToInvalidatedList.html" />
    <Content Include="views\计划管理\工艺路线\Gy_RoutingBillWorkQty.html" />
    <Content Include="views\计划管理\工艺路线\Pay_ProcPriceTypeChangeReport.html" />
@@ -839,6 +862,7 @@
    <Content Include="views\质量管理\环境检测单\QC_EnvironmentTestDotCheckBillList.html" />
    <Content Include="views\质量管理\环境检测单\QC_EnvironmentTestDotCheckBillEdit_PDA.html" />
    <Content Include="views\质量管理\质量报表\QC_FiveMenOneRingList_ICMO.html" />
    <Content Include="views\质量管理\质量报表\QC_MeasuringToolsyWarningReport.html" />
    <Content Include="views\质量管理\质量报表\QC_QualityDailyReprot_Sum.html" />
    <Content Include="views\质量管理\质量报表\QC_QualityDailyReprot.html" />
    <Content Include="views\质量管理\质量报表\QC_FiveMenOneRingList.html" />
@@ -914,11 +938,16 @@
    <Content Include="views\车间管理\单品过站_小卫\Cj_ProcessItemStationPlatform_generateSNCode.html" />
    <Content Include="views\车间管理\单品过站_小卫\Cj_ProcessItemStationPlatform_checkSN.html" />
    <Content Include="views\车间管理\单品过站_小卫\Cj_ProcessItemStationPlatform_generateCaseCode.html" />
    <Content Include="views\车间管理\单品过站_小卫\Cj_ProcessItemStationPlatform_checkPackage.html" />
    <Content Include="views\车间管理\单品过站_小卫\Cj_ProcessItemStationPlatform_checkPackage_Sec.html" />
    <Content Include="views\车间管理\单品过站_小卫\Cj_ProcessItemStationPlatform_KeyElement_Sec.html" />
    <Content Include="views\车间管理\单品过站_小卫\Cj_ProcessItemStationPlatform_UnbindEdit.html" />
    <Content Include="views\车间管理\单品过站_小卫\Cj_ProcessItemStationPlatform_UnbindList.html" />
    <Content Include="views\车间管理\单品过站_小卫\Cj_ProcessItemStationPlatform_KeyElement.html" />
    <Content Include="views\车间管理\单品过站_小卫\Cj_ProcessItemStationPlatform_batchKeyElement.html" />
    <Content Include="views\车间管理\单品过站_小卫\Cj_ProcessItemStationPlatform_batch.html" />
    <Content Include="views\车间管理\单品过站_小卫\Cj_BlueToothBarCodePrint.html" />
    <Content Include="views\车间管理\单品过站_小卫\Cj_SachetBarCodePrint.html" />
    <Content Include="views\车间管理\启动点检单\Gy_WorkBeginDotCheckListBill_Excel.html" />
    <Content Include="views\车间管理\启动点检单\Sc_WorkBeginDotCheckBill.html" />
    <Content Include="views\车间管理\启动点检单\Sc_WorkBeginDotCheckBillList.html" />
@@ -937,6 +966,7 @@
    <Content Include="views\车间管理\工序流转\MES_CenterCheckBillList.html" />
    <Content Include="views\车间管理\工序流转卡\Sc_ProcessExchangeArrangementHEmp.html" />
    <Content Include="views\车间管理\工序流转卡\Sc_ProcessExchangeBillLIst_QueryCheckRecord.html" />
    <Content Include="views\车间管理\工序流转卡\Sc_ProcessExchangeBill_DH.html" />
    <Content Include="views\车间管理\工序流转卡\Sc_ProcessExchangeBill_Exchange.html" />
    <Content Include="views\车间管理\工序流转卡\Sc_ProcessExchangeBillList_Source.html" />
    <Content Include="views\车间管理\工序流转卡\Sc_ProcessExchangeArrangement_PG.html" />
@@ -1547,6 +1577,7 @@
    <Content Include="views\grf\托条码_迦南1.grf" />
    <Content Include="views\grf\箱条码_迦南1.grf" />
    <Content Include="views\grf\物料条码_兴达.grf" />
    <Content Include="views\grf\工序流转卡小标签.grf" />
    <None Include="Web.Debug.config">
      <DependentUpon>Web.config</DependentUpon>
    </None>
@@ -2657,6 +2688,10 @@
    <Compile Include="App_Data\MssqlReportData.cs" />
    <Compile Include="App_Data\ReportData.cs" />
    <Compile Include="Properties\AssemblyInfo.cs" />
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_Sc_ProcessExchangeBillList_stock.aspx.cs">
      <DependentUpon>xmlLBM_Sc_ProcessExchangeBillList_stock.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlzuotuo_xiaowei.aspx.cs">
      <DependentUpon>xmlzuotuo_xiaowei.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
@@ -2888,6 +2923,10 @@
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_QC_TakeSampleCheckBillMainList.aspx.designer.cs">
      <DependentUpon>xmlLBM_QC_TakeSampleCheckBillMainList.aspx</DependentUpon>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_Sc_ProcessExchangeBillList_Small.aspx.cs">
      <DependentUpon>xmlLBM_Sc_ProcessExchangeBillList_Small.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_Xs_OutDoorBillList.aspx.cs">
      <DependentUpon>xmlLBM_Xs_OutDoorBillList.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>