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

yangle

2023-11-14 85ed7e239ce1a361ccfb4ccc860c87f58044d0f9

 WebTM/WebTM.csproj

@@ -248,6 +248,8 @@
    <Content Include="views\基础资料\公用基础资料\Gy_MaterTypeEdit.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_TemporaryArea.html" />
    <Content Include="views\基础资料\公用基础资料\HBarPlanPrint_GXPG.html" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_Kf_SellOutBillList.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_Sc_ICMOChangeBillList.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_Sc_ProcessExchangeArrangement.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_Kf_MateOutBillList.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_Kf_OtherOutBillList.aspx" />
@@ -256,6 +258,10 @@
    <Content Include="views\基础资料\公用基础资料\xmlLBM_Gy_SourceList.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_Sc_ProcExchSendWorkBillList.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_Sc_ProcExchRecordBackBillList.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_Xs_CusRatingChangeBillList.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_Xs_ExceptiveCheckRequestBillList.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_Xs_SeOrderBill.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_Xs_SeOrderChangeBillList.aspx" />
    <Content Include="views\基础资料\工资基础资料\Gy_ProcCommPrice.html" />
    <Content Include="views\基础资料\工资基础资料\Gy_ProcCommPriceList.html" />
    <Content Include="views\基础资料\生产基础资料\Add_Edit_Gy_BadType.html" />
@@ -511,6 +517,11 @@
    <Content Include="views\grf\指引卡1.grf" />
    <Content Include="views\grf\生产领料单.grf" />
    <Content Include="views\grf\工序在制报表.grf" />
    <Content Include="views\grf\特批申请单1.grf" />
    <Content Include="views\grf\销售订单1.grf" />
    <Content Include="views\grf\销售订单变更单1.grf" />
    <Content Include="views\grf\信用额度申请单1.grf" />
    <Content Include="views\grf\销售出库单1.grf" />
    <None Include="Web.Debug.config">
      <DependentUpon>Web.config</DependentUpon>
    </None>
@@ -1586,6 +1597,20 @@
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_EquipTypeBill.aspx.designer.cs">
      <DependentUpon>xmlLBM_EquipTypeBill.aspx</DependentUpon>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_Kf_SellOutBillList.aspx.cs">
      <DependentUpon>xmlLBM_Kf_SellOutBillList.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_Kf_SellOutBillList.aspx.designer.cs">
      <DependentUpon>xmlLBM_Kf_SellOutBillList.aspx</DependentUpon>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_Sc_ICMOChangeBillList.aspx.cs">
      <DependentUpon>xmlLBM_Sc_ICMOChangeBillList.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_Sc_ICMOChangeBillList.aspx.designer.cs">
      <DependentUpon>xmlLBM_Sc_ICMOChangeBillList.aspx</DependentUpon>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_Sc_ProcessExchangeArrangement.aspx.cs">
      <DependentUpon>xmlLBM_Sc_ProcessExchangeArrangement.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
@@ -1887,6 +1912,34 @@
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_Sc_ProcExchRecordBackBillList.aspx.designer.cs">
      <DependentUpon>xmlLBM_Sc_ProcExchRecordBackBillList.aspx</DependentUpon>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_Xs_CusRatingChangeBillList.aspx.cs">
      <DependentUpon>xmlLBM_Xs_CusRatingChangeBillList.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_Xs_CusRatingChangeBillList.aspx.designer.cs">
      <DependentUpon>xmlLBM_Xs_CusRatingChangeBillList.aspx</DependentUpon>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_Xs_ExceptiveCheckRequestBillList.aspx.cs">
      <DependentUpon>xmlLBM_Xs_ExceptiveCheckRequestBillList.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_Xs_ExceptiveCheckRequestBillList.aspx.designer.cs">
      <DependentUpon>xmlLBM_Xs_ExceptiveCheckRequestBillList.aspx</DependentUpon>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_Xs_SeOrderBill.aspx.cs">
      <DependentUpon>xmlLBM_Xs_SeOrderBill.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_Xs_SeOrderBill.aspx.designer.cs">
      <DependentUpon>xmlLBM_Xs_SeOrderBill.aspx</DependentUpon>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_Xs_SeOrderChangeBillList.aspx.cs">
      <DependentUpon>xmlLBM_Xs_SeOrderChangeBillList.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_Xs_SeOrderChangeBillList.aspx.designer.cs">
      <DependentUpon>xmlLBM_Xs_SeOrderChangeBillList.aspx</DependentUpon>
    </Compile>
    <Compile Include="views\生产工序管理\工序汇报单\xmlLBM_ProcessReport.aspx.cs">
      <DependentUpon>xmlLBM_ProcessReport.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>