合并

ch

2022-06-28 93b9f26c4581fa9d39f064a453fc21a67d582152

 WarM/WarM.csproj

@@ -123,6 +123,12 @@
      <DesignTimeSharedInput>True</DesignTimeSharedInput>
      <DependentUpon>Settings.settings</DependentUpon>
    </Compile>
    <Compile Include="Sc_MESNowWorkBill_Fast.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Include="Sc_MESNowWorkBill_Fast.designer.cs">
      <DependentUpon>Sc_MESNowWorkBill_Fast.cs</DependentUpon>
    </Compile>
    <Compile Include="仓库管理\Gy_BarCodeBill_ChaiMa.cs">
      <SubType>Form</SubType>
    </Compile>
@@ -747,6 +753,10 @@
      <DependentUpon>Kf_BillDatePeriod.cs</DependentUpon>
      <SubType>Designer</SubType>
    </EmbeddedResource>
    <EmbeddedResource Include="Sc_MESNowWorkBill_Fast.resx">
      <DependentUpon>Sc_MESNowWorkBill_Fast.cs</DependentUpon>
      <SubType>Designer</SubType>
    </EmbeddedResource>
    <EmbeddedResource Include="仓库管理\Gy_BarCodeBill_ChaiMa.resx">
      <DependentUpon>Gy_BarCodeBill_ChaiMa.cs</DependentUpon>
    </EmbeddedResource>