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

yusijie

2025-06-10 b67d9d05337e6b866a98707cfe6567420a2fc14d

 WebTM/WebTM.csproj

@@ -470,6 +470,8 @@
    <Content Include="views\基础资料\公用基础资料\Gy_WorkCenter_Excel.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_UnitConvertRateList.html" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_Gy_StockPlaceList.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_Sc_CustTagBarCodeList_Select.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_Sc_CustTagBarCodeList.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_HPayMentBill.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_HPOOrderBillByID.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_HPOStockInBillByID.aspx" />
@@ -612,6 +614,10 @@
    <Content Include="views\生产管理\宝工排产\JIT_LockRequestBill.html" />
    <Content Include="views\生产管理\宝工排产\JIT_DayPlanPlatForm.html" />
    <Content Include="views\生产管理\宝工排产\JIT_LockRequestBillList.html" />
    <Content Include="views\生产管理\客户标签\Sc_CustomerTagInfoExcel.html" />
    <Content Include="views\生产管理\客户标签\Sc_CustomerTagInfoEdit.html" />
    <Content Include="views\生产管理\客户标签\Sc_CustomerTagBarCodeList.html" />
    <Content Include="views\生产管理\客户标签\Sc_CustomerTagInfoList.html" />
    <Content Include="views\生产管理\异常反馈单\OA_ErrMsgBackSignBill_BrushCard.html" />
    <Content Include="views\生产管理\异常反馈单\Sc_MESExecptFeedBackBillResumeList.html" />
    <Content Include="views\生产管理\异常反馈单\Sc_MESExecptFeedBackBillType.html" />
@@ -628,6 +634,7 @@
    <Content Include="views\生产管理\报工平台功能页\Gy_ButtonList.html" />
    <Content Include="views\生产管理\报工平台功能页\LineBind_Button.html" />
    <Content Include="views\生产管理\日计划基础资料\JIT_NeedMaterPlanConfigBill_Excel.html" />
    <Content Include="views\生产管理\日计划报表\JIT_DayPlanPlatFormHistoryNoteReport.html" />
    <Content Include="views\生产管理\日计划报表\JIT_FuHeFenXiReportDetail.html" />
    <Content Include="views\生产管理\欠料运算\JIT_MaterialLevelShorAnalysis.html" />
    <Content Include="views\生产管理\欠料运算\JIT_MaterialLevelShorAnalysisDetailReport.html" />
@@ -1395,6 +1402,7 @@
    <Content Include="views\grf\取样卡.grf" />
    <Content Include="views\grf\15白标打印.grf" />
    <Content Include="views\grf\追溯码.grf" />
    <Content Include="views\grf\法律标签.grf" />
    <None Include="Web.Debug.config">
      <DependentUpon>Web.config</DependentUpon>
    </None>
@@ -2534,6 +2542,20 @@
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_Gy_StockPlaceList.aspx.designer.cs">
      <DependentUpon>xmlLBM_Gy_StockPlaceList.aspx</DependentUpon>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_Sc_CustTagBarCodeList_Select.aspx.cs">
      <DependentUpon>xmlLBM_Sc_CustTagBarCodeList_Select.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_Sc_CustTagBarCodeList_Select.aspx.designer.cs">
      <DependentUpon>xmlLBM_Sc_CustTagBarCodeList_Select.aspx</DependentUpon>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_Sc_CustTagBarCodeList.aspx.cs">
      <DependentUpon>xmlLBM_Sc_CustTagBarCodeList.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_Sc_CustTagBarCodeList.aspx.designer.cs">
      <DependentUpon>xmlLBM_Sc_CustTagBarCodeList.aspx</DependentUpon>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_HGy_CardChangeType.aspx.cs">
      <DependentUpon>xmlLBM_HGy_CardChangeType.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>