合并

ch

2022-06-28 93b9f26c4581fa9d39f064a453fc21a67d582152

 WebAPI/WebAPI.csproj

@@ -233,6 +233,7 @@
    <Content Include="Index.html" />
    <Content Include="Views\Scripts\bootstrap.js" />
    <Content Include="Views\Scripts\bootstrap.min.js" />
    <Content Include="Config\kdapi.config" />
    <None Include="Properties\Settings.settings">
      <Generator>SettingsSingleFileGenerator</Generator>
      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
@@ -297,15 +298,14 @@
    <Content Include="Web References\WebS\ClsGy_Warehouse_Model.datasource">
      <DependentUpon>Reference.map</DependentUpon>
    </Content>
    <Content Include="Web References\WebS\ClsKf_ICStockBill_Mould.datasource">
    <Content Include="Web References\WebS\ClsKf_ICStockBill_WMS.datasource">
      <DependentUpon>Reference.map</DependentUpon>
    </Content>
    <Content Include="Web References\WebS\ClsKf_ICStockBill_WMS.datasource">
    <Content Include="Web References\WebS\ClsKf_ICStockBill_Mould.datasource">
      <DependentUpon>Reference.map</DependentUpon>
    </Content>
    <None Include="Web References\WebS\Reference.map">
      <Generator>MSDiscoCodeGenerator</Generator>
      <LastGenOutput>Reference.cs</LastGenOutput>
    </None>
    <None Include="Web References\WebS\WebService1.disco" />
    <Content Include="Web.config">
@@ -350,6 +350,7 @@
    <Compile Include="Controllers\BaseSet\Gy_PropertyController.cs" />
    <Compile Include="Controllers\BaseSet\Gy_WarehouseController.cs" />
    <Compile Include="Controllers\BaseSet\Xt_DataDictionary_ViewController.cs" />
    <Compile Include="Controllers\BaseSet\Xt_grdAlignment_WMESController.cs" />
    <Compile Include="Controllers\BaseSet\Xt_ORGANIZATIONSController.cs" />
    <Compile Include="Controllers\BLL\Xt_AccountPeriodController.cs" />
    <Compile Include="Controllers\BLL\Xt_BillTypeController.cs" />
@@ -753,6 +754,12 @@
    <Compile Include="Service\ProcessDal.cs" />
    <Compile Include="Service\YqnDal.cs" />
    <Compile Include="Service\YqnQbService.cs" />
    <Compile Include="Utility\Util.cs" />
    <Compile Include="Web References\WebS\Reference.cs">
      <AutoGen>True</AutoGen>
      <DesignTime>True</DesignTime>
      <DependentUpon>Reference.map</DependentUpon>
    </Compile>
    <Compile Include="Code\Common.cs" />
    <Compile Include="Code\Test2.cs" />
    <Compile Include="Code\TestDAL.cs" />
@@ -778,11 +785,6 @@
    <Compile Include="Models\JsonResult.cs" />
    <Compile Include="Models\Pensen.cs" />
    <Compile Include="Properties\AssemblyInfo.cs" />
    <Compile Include="Web References\WebS\Reference.cs">
      <AutoGen>True</AutoGen>
      <DesignTime>True</DesignTime>
      <DependentUpon>Reference.map</DependentUpon>
    </Compile>
    <Compile Include="WebServer.cs" />
  </ItemGroup>
  <ItemGroup>
@@ -846,6 +848,7 @@
    <Folder Include="Views\Sc_WorkBillAutoSortBillMain\" />
    <Folder Include="Views\Sc_WorkBillSortBill\" />
    <Folder Include="Views\Sc_WorkDemandPlanBill\" />
    <Folder Include="Views\Xt_grdAlignment_WMES\" />
  </ItemGroup>
  <ItemGroup>
    <WCFMetadata Include="Service References\" />
@@ -858,6 +861,19 @@
      <Generator>ResXFileCodeGenerator</Generator>
      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
    </EmbeddedResource>
  </ItemGroup>
  <ItemGroup>
    <WebReferenceUrl Include="http://47.96.97.237/WEBS-WMS/WebService1.asmx">
      <UrlBehavior>Dynamic</UrlBehavior>
      <RelPath>Web References\WebS\</RelPath>
      <UpdateFromURL>http://47.96.97.237/WEBS-WMS/WebService1.asmx</UpdateFromURL>
      <ServiceLocationURL>
      </ServiceLocationURL>
      <CachedDynamicPropName>
      </CachedDynamicPropName>
      <CachedAppSettingsObjectName>Settings</CachedAppSettingsObjectName>
      <CachedSettingsPropName>WebAPI_WebS_WebService1</CachedSettingsPropName>
    </WebReferenceUrl>
  </ItemGroup>
  <ItemGroup>
    <ProjectReference Include="..\BLL\BLL.csproj">
@@ -888,19 +904,6 @@
      <Project>{0a4ef483-d8d3-49a5-8378-974ef7993365}</Project>
      <Name>SQLHelper</Name>
    </ProjectReference>
  </ItemGroup>
  <ItemGroup>
    <WebReferenceUrl Include="http://192.168.10.66/WEBS-WMS/WebService1.asmx">
      <UrlBehavior>Dynamic</UrlBehavior>
      <RelPath>Web References\WebS\</RelPath>
      <UpdateFromURL>http://192.168.10.66/WEBS-WMS/WebService1.asmx</UpdateFromURL>
      <ServiceLocationURL>
      </ServiceLocationURL>
      <CachedDynamicPropName>
      </CachedDynamicPropName>
      <CachedAppSettingsObjectName>Settings</CachedAppSettingsObjectName>
      <CachedSettingsPropName>WebAPI_WebS_WebService1</CachedSettingsPropName>
    </WebReferenceUrl>
  </ItemGroup>
  <PropertyGroup>
    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>