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

yusijie

2024-04-24 85d25ecc7b0c82879da899106f203be503e80210

 WarM/WarM.csproj

@@ -94,6 +94,7 @@
    <Reference Include="System.Data" />
    <Reference Include="System.Drawing" />
    <Reference Include="System.EnterpriseServices" />
    <Reference Include="System.Management" />
    <Reference Include="System.Web.Services" />
    <Reference Include="System.Windows.Forms" />
    <Reference Include="System.Xml" />
@@ -693,6 +694,12 @@
    <Compile Include="条码打印\Frm_Split.Designer.cs">
      <DependentUpon>Frm_Split.cs</DependentUpon>
    </Compile>
    <Compile Include="条码打印\Gy_BarCodeBill_automaticallyByPLC_New.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Include="条码打印\Gy_BarCodeBill_automaticallyByPLC_New.designer.cs">
      <DependentUpon>Gy_BarCodeBill_automaticallyByPLC_New.cs</DependentUpon>
    </Compile>
    <Compile Include="条码打印\Kf_AGVRequestBill_FastList.cs">
      <SubType>Form</SubType>
    </Compile>
@@ -1138,6 +1145,10 @@
    <EmbeddedResource Include="条码打印\Frm_Split.resx">
      <DependentUpon>Frm_Split.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="条码打印\Gy_BarCodeBill_automaticallyByPLC_New.resx">
      <DependentUpon>Gy_BarCodeBill_automaticallyByPLC_New.cs</DependentUpon>
      <SubType>Designer</SubType>
    </EmbeddedResource>
    <EmbeddedResource Include="条码打印\Kf_AGVRequestBill_FastList.resx">
      <DependentUpon>Kf_AGVRequestBill_FastList.cs</DependentUpon>
      <SubType>Designer</SubType>