From 77ca42723a958a1d835f5301dd279f4bcae47441 Mon Sep 17 00:00:00 2001
From: luanhui <luanhui@bwpsoft.com>
Date: Fri, 12 Jan 2018 15:07:20 +0800
Subject: [PATCH] .

---
 B3QingDaoWanFu/Rpc/GatheringRpc.cs            |  4 +-
 .../RpcHelper/RpcHelperUtil.cs                |  7 +++
 .../App_Data/PublishProfiles/WanFu.pubxml     | 17 ++++++
 .../WebFolder/log/20180112Gatheringlog.txt    | 52 ++++++++++++++++++
 B3WanFuSaleWebService/WebFolder/web.config    |  6 +--
 .../WebFolder/website.publishproj             | 53 +++++++++++++++++++
 6 files changed, 135 insertions(+), 4 deletions(-)
 create mode 100644 B3WanFuSaleWebService/WebFolder/App_Data/PublishProfiles/WanFu.pubxml
 create mode 100644 B3WanFuSaleWebService/WebFolder/log/20180112Gatheringlog.txt
 create mode 100644 B3WanFuSaleWebService/WebFolder/website.publishproj

diff --git a/B3QingDaoWanFu/Rpc/GatheringRpc.cs b/B3QingDaoWanFu/Rpc/GatheringRpc.cs
index 6bb2d9e..ac4188d 100644
--- a/B3QingDaoWanFu/Rpc/GatheringRpc.cs
+++ b/B3QingDaoWanFu/Rpc/GatheringRpc.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
+using BWP.B3Frameworks;
 using BWP.B3Frameworks.Utils;
 using BWP.B3QingDaoWanFu.Utils;
 using BWP.B3Sale.BL;
@@ -23,7 +24,8 @@ namespace BWP.B3QingDaoWanFu.Rpc
       using (var context = new TransactionContext())
       {
         var bl = BIFactory.Create<IGatheringBL>(context);
-        bl.InitNewDmo(dmo);
+//        bl.InitNewDmo(dmo);
+        dmo.Domain_ID = DomainContext.Current.ID;
         var dom = new DQueryDom(new JoinAlias(typeof(Customer)));
         dom.Columns.Add(DQSelectColumn.Field("AccountCustomer_ID"));
         dom.Columns.Add(DQSelectColumn.Field("AccountCustomer_Name"));
diff --git a/B3WanFuSaleWebService/RpcHelper/RpcHelperUtil.cs b/B3WanFuSaleWebService/RpcHelper/RpcHelperUtil.cs
index dbfd14d..dea44ee 100644
--- a/B3WanFuSaleWebService/RpcHelper/RpcHelperUtil.cs
+++ b/B3WanFuSaleWebService/RpcHelper/RpcHelperUtil.cs
@@ -13,6 +13,13 @@ namespace RpcHelper {
     private static bool _isInit;
 
     public static string InsertGathering(string data) {
+
+      //测试用的
+//      using (var sr=new StreamReader("D:\\测试报文.txt"))
+//      {
+//        data=sr.ReadToEnd();
+//      }
+
       var logName = DateTime.Today.Date.ToString("yyyyMMdd") + "Gatheringlog.txt";
       var results = new Results();
       var path = System.Web.HttpContext.Current.Request.PhysicalApplicationPath;
diff --git a/B3WanFuSaleWebService/WebFolder/App_Data/PublishProfiles/WanFu.pubxml b/B3WanFuSaleWebService/WebFolder/App_Data/PublishProfiles/WanFu.pubxml
new file mode 100644
index 0000000..a7664f1
--- /dev/null
+++ b/B3WanFuSaleWebService/WebFolder/App_Data/PublishProfiles/WanFu.pubxml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+此文件由 Web 项目的发布/打包过程使用。可以通过编辑此 MSBuild 文件
+自定义此过程的行为。为了解与此相关的更多内容，请访问 https://go.microsoft.com/fwlink/?LinkID=208121。 
+-->
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <WebPublishMethod>FileSystem</WebPublishMethod>
+    <LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
+    <LastUsedPlatform>Any CPU</LastUsedPlatform>
+    <SiteUrlToLaunchAfterPublish />
+    <LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
+    <ExcludeApp_Data>False</ExcludeApp_Data>
+    <publishUrl>D:\WanFuService</publishUrl>
+    <DeleteExistingFiles>False</DeleteExistingFiles>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/B3WanFuSaleWebService/WebFolder/log/20180112Gatheringlog.txt b/B3WanFuSaleWebService/WebFolder/log/20180112Gatheringlog.txt
new file mode 100644
index 0000000..61a89f7
--- /dev/null
+++ b/B3WanFuSaleWebService/WebFolder/log/20180112Gatheringlog.txt
@@ -0,0 +1,52 @@
+2018/1/12 14:57:48                 收款单接口开始接收数据：------------------------------------
+<?xml version="1.0" encoding="gb2312"?>
+<bills>
+		<bill>
+				<header>
+						<RequestId>000300              </RequestId>
+						<CustomerCode>00012016015000000722          </CustomerCode>
+						<Time>2018-1-10 8:17  </Time>
+						<Money>10.00          </Money>
+				</header>
+		</bill>
+</bills>
+开始处理单据:000300              
+内部错误：没有配置会计单位
+返回报文：<?xml version="1.0" encoding="gb2312"?>
+<results>
+		<resultcode>1</resultcode>
+		<content />
+		<result>
+				<RequestId>000300              </RequestId>
+				<resultcode>1</resultcode>
+				<BWPID />
+				<content>调用错误，原因：没有配置会计单位</content>
+		</result>
+</results>
+2018/1/12 14:58:18                 收款单接口处理完毕 
+2018/1/12 15:01:02                 收款单接口开始接收数据：------------------------------------
+<?xml version="1.0" encoding="gb2312"?>
+<bills>
+		<bill>
+				<header>
+						<RequestId>000300              </RequestId>
+						<CustomerCode>00012016015000000722          </CustomerCode>
+						<Time>2018-1-10 8:17  </Time>
+						<Money>10.00          </Money>
+				</header>
+		</bill>
+</bills>
+开始处理单据:000300              
+成功创建收款单No.3
+返回报文：<?xml version="1.0" encoding="gb2312"?>
+<results>
+		<resultcode>0</resultcode>
+		<content />
+		<result>
+				<RequestId>000300              </RequestId>
+				<resultcode>0</resultcode>
+				<BWPID>3</BWPID>
+				<content>成功创建收款单No.3</content>
+		</result>
+</results>
+2018/1/12 15:01:25                 收款单接口处理完毕 
diff --git a/B3WanFuSaleWebService/WebFolder/web.config b/B3WanFuSaleWebService/WebFolder/web.config
index 8644379..b52812f 100644
--- a/B3WanFuSaleWebService/WebFolder/web.config
+++ b/B3WanFuSaleWebService/WebFolder/web.config
@@ -9,9 +9,9 @@
 -->
 <configuration>
   <appSettings>
-    <add key="url" value="http://localhost:2100/MainSystem/"/>
-    <add key="username" value="system"/>
-    <add key="pwd" value=""/>
+    <add key="url" value="http://localhost:2000/MainSystem/"/>
+    <add key="username" value="青花瓷"/>
+    <add key="pwd" value="321"/>
   </appSettings>
   <connectionStrings/>
   <system.web>
diff --git a/B3WanFuSaleWebService/WebFolder/website.publishproj b/B3WanFuSaleWebService/WebFolder/website.publishproj
new file mode 100644
index 0000000..dd552cd
--- /dev/null
+++ b/B3WanFuSaleWebService/WebFolder/website.publishproj
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+
+***********************************************************************************************
+website.publishproj
+
+警告: 请勿修改此文件，它将用于 Web 发布过程。
+
+版权所有 (C) Microsoft Corporation。保留所有权利。
+
+***********************************************************************************************
+-->
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>10.0.30319</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{059a3a51-fec5-45ee-a2a9-c817b995731f}</ProjectGuid>
+    <SourceWebPhysicalPath>$(MSBuildThisFileDirectory)</SourceWebPhysicalPath>
+    <SourceWebVirtualPath>/WebFolder</SourceWebVirtualPath>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <SourceWebProject>
+    </SourceWebProject>
+    <SourceWebMetabasePath>
+    </SourceWebMetabasePath>
+  </PropertyGroup>
+  <PropertyGroup>
+    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
+    <!-- for VS2010 we need to use 10.5 but for VS2012+ we should use VisualStudioVersion -->
+    <WebPublishTargetsVersion Condition=" '$(WebPublishTargetsVersion)' =='' and '$(VisualStudioVersion)' == 10.0 ">10.5</WebPublishTargetsVersion>
+    <WebPublishTargetsVersion Condition=" '$(WebPublishTargetsVersion)'=='' ">$(VisualStudioVersion)</WebPublishTargetsVersion>
+    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(WebPublishTargetsVersion)</VSToolsPath>
+    <_WebPublishTargetsPath Condition=" '$(_WebPublishTargetsPath)'=='' ">$(VSToolsPath)</_WebPublishTargetsPath>
+    <AssemblyFileVersion Condition="'$(AssemblyFileVersion)' == ''">1.0.0.0</AssemblyFileVersion>
+    <AssemblyVersion Condition="'$(AssemblyVersion)' == ''">1.0.0.0</AssemblyVersion>
+  </PropertyGroup>
+  <ItemGroup>
+    <AssemblyAttributes Include="AssemblyFileVersion">
+      <Value>$(AssemblyFileVersion)</Value>
+    </AssemblyAttributes>
+    <AssemblyAttributes Include="AssemblyVersion">
+      <Value>$(AssemblyVersion)</Value>
+    </AssemblyAttributes>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\RpcHelper\RpcHelper.csproj">
+      <Project>{FE9CD25F-773A-4533-98FD-45D7B08254F2}</Project>
+      <Name>RpcHelper</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(_WebPublishTargetsPath)\Web\Microsoft.WebSite.Publishing.targets" />
+</Project>
\ No newline at end of file