From ca4362ddf30700cf8a05094d72de4dd39a2893e9 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期五, 10 三月 2023 17:37:09 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/simoer_jiekou
---
zymes/OperationService/zymes_RealessPurReceive.cs | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/zymes/OperationService/zymes_RealessPurReceive.cs b/zymes/OperationService/zymes_RealessPurReceive.cs
index aa1b65b..31fe98f 100644
--- a/zymes/OperationService/zymes_RealessPurReceive.cs
+++ b/zymes/OperationService/zymes_RealessPurReceive.cs
@@ -185,6 +185,9 @@
Entity entity = this.BusinessInfo.GetEntity("FEntity");//鑾峰彇鏄庣粏淇℃伅
foreach (var billObj in e.DataEntitys)
{
+ var forgName = Context.CurrentOrganizationInfo.Name;
+ if (!forgName.Contains("鏉窞鏂帿灏旂鎬ф潗鏂欐湁闄愬叕鍙�"))
+ continue;
//var sql = $"exec zymes_RealessPurReceive {billObj["Id"]} ";
var id = billObj["Id"].ToString();
string sql = string.Empty;
@@ -207,7 +210,7 @@
from T_PUR_RECEIVEENTRY a with(nolock)
inner join T_PUR_RECEIVEENTRY_S b with(nolock) on a.FENTRYID=b.FENTRYID
left join T_PUR_RECEIVEENTRY_F f with(nolock) on a.FENTRYID=f.FENTRYID
-left join T_PUR_RECEIVEFIN fin with(nolock) on a.FENTRYID=fin.FENTRYID
+left join T_PUR_RECEIVEFIN fin with(nolock) on a.FID=fin.FID
left join T_PUR_RECEIVEENTRY_TAX t with(nolock) on a.FENTRYID=t.FENTRYID
where a.FID={id}
@@ -251,7 +254,7 @@
};
//LogService.Write("鏀舵枡閫氱煡鍗曞悓姝ョず渚�" + JsonConvert.SerializeObject(jsonRoot));
//string clientUrl = Util.GetConfigKey(AppDomain.CurrentDomain.BaseDirectory + "/Config/kdapi.config", "ClientUrl");//K/3 Cloud 涓氬姟绔欑偣鍦板潃
- var client = new RestSharp.RestClient("http://61.130.182.102:18181/simoerAPI/");
+ var client = new RestSharp.RestClient(" http://10.11.18.195:8080/simoerapi/");
//鏂板
var requestPost = new RestRequest("Cg_POInStockBill/Cg_POInStockBillSaveApi", Method.POST);
requestPost.AddParameter("application/json", JsonConvert.SerializeObject(jsonRoot), ParameterType.RequestBody);
@@ -259,7 +262,7 @@
var contentPost = responsePost.Content;
if (!contentPost.Contains("鎴愬姛"))
{
- LogService.Write("鏀舵枡閫氱煡鍗曞悓姝ュ紓甯�,POST鏂瑰紡鑾峰彇缁撴灉," + billObj["Id"] + "," + contentPost);
+ LogService.Write("鏀舵枡閫氱煡鍗曞悓姝ュ紓甯�,POST鏂瑰紡鑾峰彇缁撴灉," + billObj["Id"] + "," + responsePost.ErrorMessage);
LogService.Write("鏀舵枡閫氱煡鍗曞悓姝ュ紓甯�,POST," + "Cg_POInStockBill/Cg_POInStockBillSaveApi");
LogService.Write("鏀舵枡閫氱煡鍗曞悓姝ュ紓甯�,JsonConvert.SerializeObject(jsonRoot)," + JsonConvert.SerializeObject(jsonRoot));
}
--
Gitblit v1.9.1