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

yxj

2025-11-28 33d309cdce726a2c03d29e358fc745c959f43109

 WebTM/WebTM.csproj

@@ -464,6 +464,8 @@
    <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\基础资料\公用基础资料\xmlzuotuo_xiaowei.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_HGy_BarCodeBill_XinDa.aspx" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_CheckNoteItem.html" />
@@ -542,6 +544,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" />
@@ -789,6 +792,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" />
@@ -922,6 +926,7 @@
    <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_UnbindEdit.html" />
    <Content Include="views\车间管理\单品过站_小卫\Cj_ProcessItemStationPlatform_UnbindList.html" />
    <Content Include="views\车间管理\单品过站_小卫\Cj_ProcessItemStationPlatform_KeyElement.html" />
@@ -945,6 +950,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" />
@@ -1555,6 +1561,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>
@@ -2896,6 +2903,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>