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_RealessCustomer.cs | 31 +
zymes/OperationService/zymes_RealessPurReceive.cs | 9
zymes/OperationService/zymes_RealessSettleStyle.cs | 7
zymes/OperationService/zymes_RealessPrdMoReport.cs | 11
zymes/OperationService/zymes_RealessWork.cs | 115 +++++++
zymes/zymes_Project.csproj | 3
zymes/OperationService/zymes_RealessStock.cs | 65 ++-
zymes/OperationService/zymes_RealessCurrency.cs | 8
zymes/OperationService/zymes_RealessMaterial.cs | 142 ++++----
zymes/OperationService/zymes_RealessStaff.cs | 116 +++++++
zymes/OperationService/zymes_RealessRecCondition.cs | 7
zymes/test/Program.cs | 5
zymes/OperationService/zymes_RealessPrdPpbom.cs | 17
zymes/OperationService/zymes_RealessRateType.cs | 9
zymes/OperationService/zymes_RealessSupplier.cs | 7
zymes/OperationService/zymes_RealessMatePriceSup.cs | 7
zymes/OperationService/zymes_RealessUnit.cs | 10
zymes/OperationService/zymes_RealessSalSeOutStock.cs | 155 ++++++++++
zymes/OperationService/zymes_RealessTaxMIX.cs | 7
zymes/OperationService/zymes_RealessDepartment.cs | 7
zymes/OperationService/zymes_RealessStockStatus.cs | 7
zymes/OperationService/zymes_RealessPrdMo.cs | 67 +++
zymes/OperationService/zymes_RealessPurPoorder.cs | 7
zymes/OperationService/zymes_RealessTaxRate.cs | 7
zymes/OperationService/zymes_RealessBillType.cs | 4
zymes/OperationService/zymes_RealessBom.cs | 7
zymes/OperationService/zymes_RealessPaymentCondition.cs | 7
zymes/OperationService/zymes_RealessOperator.cs | 43 +
28 files changed, 723 insertions(+), 164 deletions(-)
diff --git a/zymes/OperationService/zymes_RealessBillType.cs b/zymes/OperationService/zymes_RealessBillType.cs
index 5faf199..1b87903 100644
--- a/zymes/OperationService/zymes_RealessBillType.cs
+++ b/zymes/OperationService/zymes_RealessBillType.cs
@@ -76,14 +76,14 @@
//LogService.Write("鍗曟嵁绫诲瀷鍚屾绀轰緥JsonConvert.SerializeObject(_jsonRoot)锛�" + JsonConvert.SerializeObject(_jsonRoot));
//LogService.Write("鍗曟嵁绫诲瀷鍚屾绀轰緥锛�" + _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("Xt_BillType/SaveXt_BillTypeListApi", Method.POST);
requestPost.AddParameter("application/json", JsonConvert.SerializeObject(_jsonRoot), ParameterType.RequestBody);
IRestResponse responsePost = client.Execute(requestPost);
var contentPost = responsePost.Content;
if (!contentPost.Contains("鎴愬姛"))
{
- LogService.Write("鍗曟嵁绫诲瀷鍚屾寮傚父,POST鏂瑰紡鑾峰彇缁撴灉," + billObj["Id"] + "," + contentPost);
+ LogService.Write("鍗曟嵁绫诲瀷鍚屾寮傚父,POST鏂瑰紡鑾峰彇缁撴灉," + billObj["Id"] + "," + responsePost.ErrorMessage);
LogService.Write("鍗曟嵁绫诲瀷鍚屾寮傚父,POST," + "Xt_BillType/SaveXt_BillTypeListApi");
LogService.Write("鍗曟嵁绫诲瀷鍚屾寮傚父,JsonConvert.SerializeObject(_jsonRoot)," + JsonConvert.SerializeObject(_jsonRoot));
}
diff --git a/zymes/OperationService/zymes_RealessBom.cs b/zymes/OperationService/zymes_RealessBom.cs
index fa80fb9..e3b28a1 100644
--- a/zymes/OperationService/zymes_RealessBom.cs
+++ b/zymes/OperationService/zymes_RealessBom.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_RealessBom {billObj["Id"]} ";
var id = billObj["Id"].ToString();
string sql = string.Empty;
@@ -238,7 +241,7 @@
};
//LogService.Write("鐢熶骇BOM鍚屾绀轰緥" + 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("Gy_ICBomBill/Gy_ICBomBillaveApi", Method.POST);
requestPost.AddParameter("application/json", JsonConvert.SerializeObject(jsonRoot), ParameterType.RequestBody);
@@ -246,7 +249,7 @@
var contentPost = responsePost.Content;
if (!contentPost.Contains("鎴愬姛"))
{
- LogService.Write("鐢熶骇BOM鍚屾寮傚父,POST鏂瑰紡鑾峰彇缁撴灉," + billObj["Id"] + "," + contentPost);
+ LogService.Write("鐢熶骇BOM鍚屾寮傚父,POST鏂瑰紡鑾峰彇缁撴灉," + billObj["Id"] + "," + responsePost.ErrorMessage);
LogService.Write("鐢熶骇BOM鍚屾寮傚父,POST," + "Gy_ICBomBill/Gy_ICBomBillaveApi");
LogService.Write("鐢熶骇BOM鍚屾寮傚父,JsonConvert.SerializeObject(jsonRoot)," + JsonConvert.SerializeObject(jsonRoot));
}
diff --git a/zymes/OperationService/zymes_RealessCurrency.cs b/zymes/OperationService/zymes_RealessCurrency.cs
index 18a93be..582d94a 100644
--- a/zymes/OperationService/zymes_RealessCurrency.cs
+++ b/zymes/OperationService/zymes_RealessCurrency.cs
@@ -45,6 +45,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_RealessCurrency {billObj["Id"]} ";
var id = billObj["Id"].ToString();
string sql = string.Empty;
@@ -56,7 +59,6 @@
inner join T_BD_CURRENCY_L l with(nolock) on a.FCURRENCYID=l.FCURRENCYID and FLOCALEID=2052
Where a.FCURRENCYID={id}
";
-
DataTable dt = DBServiceHelper.ExecuteDataSet(Context, sql).Tables[0];
if (dt.Rows.Count == 0)
{
@@ -76,14 +78,14 @@
//LogService.Write("甯佸埆鍚屾绀轰緥.SerializeObject(_jsonRoot)锛�" + JsonConvert.SerializeObject(_jsonRoot));
//LogService.Write("甯佸埆鍚屾绀轰緥锛�" + _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("Gy_Currency/SaveGy_CurrencyListApi", Method.POST);
requestPost.AddParameter("application/json", JsonConvert.SerializeObject(_jsonRoot), ParameterType.RequestBody);
IRestResponse responsePost = client.Execute(requestPost);
var contentPost = responsePost.Content;
if (!contentPost.Contains("鎴愬姛"))
{
- LogService.Write("甯佸埆鍚屾寮傚父,POST鏂瑰紡鑾峰彇缁撴灉," + billObj["Id"] + "," + contentPost);
+ LogService.Write("甯佸埆鍚屾寮傚父,POST鏂瑰紡鑾峰彇缁撴灉," + billObj["Id"] + "," + responsePost.ErrorMessage);
LogService.Write("甯佸埆鍚屾寮傚父,POST," + "Gy_Currency/SaveGy_CurrencyListApi");
LogService.Write("甯佸埆鍚屾寮傚父,JsonConvert.SerializeObject(_jsonRoot)," + JsonConvert.SerializeObject(_jsonRoot));
}
diff --git a/zymes/OperationService/zymes_RealessCustomer.cs b/zymes/OperationService/zymes_RealessCustomer.cs
index 8837c61..6f27e73 100644
--- a/zymes/OperationService/zymes_RealessCustomer.cs
+++ b/zymes/OperationService/zymes_RealessCustomer.cs
@@ -45,6 +45,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_RealessCustomer {billObj["Id"]} ";
var id = billObj["Id"].ToString();
string sql = string.Empty;
@@ -62,16 +65,27 @@
from T_BD_CUSTLOCATION a with(nolock)
--inner join T_BD_CUSTLOCATION_L l with(nolock) on a.FID=l.FID and FLOCALEID=2052
Where a.FCUSTID= {id}
+
+select a.FCONTACTID as HItemID, a.FCUSTID as HCUSTID, a.FNUMBER as HNumber, l.FNAME as HName, a.FNUMBER as HShortNumber, 0 as HParentID,
+1 as HLevel, 'true' as HEndFlag, case when a.FFORBIDSTATUS='A' then 'false' else 'true' end as HStopflag,
+'CLD-ERP瀵煎叆' as HRemark, '' as HHelpCode, '鏈娴�' as HUseFlag, a.FCREATEDATE as HMakeTime, a.FCREATORID as HMakeEmp,
+'' as HCheckEmp, getdate() as HCheckTime, a.FMODIFIERID as HModifyEmp, a.FMODIFYDATE as HModifyTime, '' as HStopEmp,
+getdate() as HStopTime, 0 as HUSEORGID, 0 as HCREATEORGID
+from T_BD_COMMONCONTACT a with(nolock)
+inner join T_BD_COMMONCONTACT_L l with(nolock) on a.FCONTACTID = l.FCONTACTID and l.FLOCALEID = 2052
+where a.FCUSTID = {id}
";
DataSet ds = DBServiceHelper.ExecuteDataSet(Context, sql);
DataTable maindt = ds.Tables[0];//瀹㈡埛淇℃伅
DataTable subdt = ds.Tables[1];//瀹㈡埛_浜よ揣鍦扮偣
+ DataTable subcontact = ds.Tables[2];//瀹㈡埛_鏀惰揣鏂硅仈绯讳汉
+
if (maindt.Rows.Count == 0)
{
LogService.Write("瀹㈡埛鍚屾寮傚父锛�" + sql);
continue;
}
- JArray array = new JArray();//鏄庣粏琛�
+ JArray array = new JArray();//鏄庣粏琛╛浜よ揣鍦扮偣
foreach (DataRow dr in subdt.Rows)
{
JObject fentrymodel = new JObject();
@@ -81,6 +95,16 @@
}
array.Add(fentrymodel);
}
+ JArray arrcontact = new JArray();//鏄庣粏琛╛鏀惰揣鏂硅仈绯讳汉
+ foreach (DataRow dr in subcontact.Rows)
+ {
+ JObject fentrycontact = new JObject();
+ foreach (DataColumn column in subcontact.Columns)
+ {
+ fentrycontact.Add(column.ColumnName, dr[column.ColumnName].ToString());
+ }
+ arrcontact.Add(fentrycontact);
+ }
JObject model = new JObject();//涓昏〃
DataRow maindr = maindt.Rows[0];
foreach (DataColumn column in maindt.Columns)
@@ -88,20 +112,21 @@
model.Add(column.ColumnName, maindr[column.ColumnName].ToString());
}
model.Add("HCustLocationEntry", array);
+ model.Add("HCustContactEntry", arrcontact);
JObject jsonRoot = new JObject()
{
["model"] = model
};
//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("Gy_Customer/SaveGy_CustomerListApi", Method.POST);
requestPost.AddParameter("application/json", JsonConvert.SerializeObject(jsonRoot), ParameterType.RequestBody);
IRestResponse responsePost = client.Execute(requestPost);
var contentPost = responsePost.Content;
if (!contentPost.Contains("鎴愬姛"))
{
- LogService.Write("瀹㈡埛鍚屾寮傚父,POST鏂瑰紡鑾峰彇缁撴灉," + billObj["Id"] + "," + contentPost);
+ LogService.Write("瀹㈡埛鍚屾寮傚父,POST鏂瑰紡鑾峰彇缁撴灉," + billObj["Id"] + "," + responsePost.ErrorMessage);
LogService.Write("瀹㈡埛鍚屾寮傚父,POST," + "Gy_Customer/SaveGy_CustomerListApi");
LogService.Write("瀹㈡埛鍚屾寮傚父,JsonConvert.SerializeObject(_jsonRoot)," + JsonConvert.SerializeObject(jsonRoot));
}
diff --git a/zymes/OperationService/zymes_RealessDepartment.cs b/zymes/OperationService/zymes_RealessDepartment.cs
index 3d03daf..d8e406b 100644
--- a/zymes/OperationService/zymes_RealessDepartment.cs
+++ b/zymes/OperationService/zymes_RealessDepartment.cs
@@ -45,6 +45,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_RealessDept {billObj["Id"]} ";
var id = billObj["Id"].ToString();
string sql = string.Empty;
@@ -74,14 +77,14 @@
};
//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("Gy_Department/SaveGy_DepartmentListApi", Method.POST);
requestPost.AddParameter("application/json", JsonConvert.SerializeObject(_jsonRoot), ParameterType.RequestBody);
IRestResponse responsePost = client.Execute(requestPost);
var contentPost = responsePost.Content;
if (!contentPost.Contains("鎴愬姛"))
{
- LogService.Write("閮ㄩ棬鍚屾寮傚父,POST鏂瑰紡鑾峰彇缁撴灉," + billObj["Id"] + "," + contentPost);
+ LogService.Write("閮ㄩ棬鍚屾寮傚父,POST鏂瑰紡鑾峰彇缁撴灉," + billObj["Id"] + "," + responsePost.ErrorMessage);
LogService.Write("閮ㄩ棬鍚屾寮傚父,POST," + "Gy_Department/SaveGy_DepartmentListApi");
LogService.Write("閮ㄩ棬鍚屾寮傚父,JsonConvert.SerializeObject(_jsonRoot)," + JsonConvert.SerializeObject(_jsonRoot));
}
diff --git a/zymes/OperationService/zymes_RealessMatePriceSup.cs b/zymes/OperationService/zymes_RealessMatePriceSup.cs
index 8fb8ee1..d695694 100644
--- a/zymes/OperationService/zymes_RealessMatePriceSup.cs
+++ b/zymes/OperationService/zymes_RealessMatePriceSup.cs
@@ -45,6 +45,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_RealessMatePriceSup {billObj["Id"]} ";
var id = billObj["Id"].ToString();
string sql = string.Empty;
@@ -77,14 +80,14 @@
//LogService.Write("閲囪喘浠锋牸鍚屾绀轰緥JsonConvert.SerializeObject(_jsonRoot)锛�" + JsonConvert.SerializeObject(_jsonRoot));
//LogService.Write("閲囪喘浠锋牸鍚屾绀轰緥锛�" + _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("Gy_MatePriceSup/SaveGy_MatePriceSupListApi", Method.POST);
requestPost.AddParameter("application/json", JsonConvert.SerializeObject(_jsonRoot), ParameterType.RequestBody);
IRestResponse responsePost = client.Execute(requestPost);
var contentPost = responsePost.Content;
if (!contentPost.Contains("鎴愬姛"))
{
- LogService.Write("閲囪喘浠锋牸鍚屾寮傚父,POST鏂瑰紡鑾峰彇缁撴灉," + billObj["Id"] + "," + contentPost);
+ LogService.Write("閲囪喘浠锋牸鍚屾寮傚父,POST鏂瑰紡鑾峰彇缁撴灉," + billObj["Id"] + "," + responsePost.ErrorMessage);
LogService.Write("閲囪喘浠锋牸鍚屾寮傚父,POST," + "Gy_MatePriceSup/SaveGy_MatePriceSupListApi");
LogService.Write("閲囪喘浠锋牸鍚屾寮傚父,JsonConvert.SerializeObject(_jsonRoot)," + JsonConvert.SerializeObject(_jsonRoot));
}
diff --git a/zymes/OperationService/zymes_RealessMaterial.cs b/zymes/OperationService/zymes_RealessMaterial.cs
index c1acde1..5cfc850 100644
--- a/zymes/OperationService/zymes_RealessMaterial.cs
+++ b/zymes/OperationService/zymes_RealessMaterial.cs
@@ -183,12 +183,20 @@
{
base.AfterExecuteOperationTransaction(e);
Entity entity = this.BusinessInfo.GetEntity("FEntity");//鑾峰彇鏄庣粏淇℃伅
- foreach (var billObj in e.DataEntitys)
+ try
{
- //var sql = $"exec zymes_RealessMaterial {billObj["Id"]} ";
- var id = billObj["Id"].ToString();
- string sql = string.Empty;
- sql = $@"
+ foreach (var billObj in e.DataEntitys)
+ {
+ var forgName = Context.CurrentOrganizationInfo.Name;
+ var forgID = Context.CurrentOrganizationInfo.ID;
+ LogService.Write($"缁勭粐:{forgName},{forgID}");
+ if (!forgName.Contains("鏉窞鏂帿灏旂鎬ф潗鏂欐湁闄愬叕鍙�"))
+ continue;
+ //LogService.Write("鐗╂枡鍚屾鎻掍欢鎵ц寮�濮嬶細" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:fff:ffffff"));
+ //var sql = $"exec zymes_RealessMaterial {billObj["Id"]} ";
+ var id = billObj["Id"].ToString();
+ string sql = string.Empty;
+ sql = $@"
/*dialect*/
select a.FMATERIALID as HItemID ,a.FMATERIALID as HERPItemID,a.FNUMBER as HNumber,l.FNAME as HName,isnull(l.FSPECIFICATION,'') as HModel,a.FNUMBER as HShortNumber,0 as HParentID
,1 HLevel,'false' as HEndFlag,case when a.FFORBIDSTATUS='A' then 'false' else 'true' end as HStopflag,'CLD-ERP瀵煎叆' as HRemark,b.FErpClsID as HMaterClsID,isnull(s.FSTOREUNITID,0) as HUnitID,0 as HUnitGroupID
@@ -208,73 +216,67 @@
Where l.FLOCALEID=2052
and a.FMATERIALID = {id}
";
- DataTable dt = DBServiceHelper.ExecuteDataSet(Context, sql).Tables[0];
- if (dt.Rows.Count == 0)
- {
- LogService.Write("鐗╂枡鍚屾寮傚父锛�" + sql);
- continue;
- }
- DataRow dr = dt.Rows[0];
- JObject model = new JObject();
- foreach (DataColumn column in dt.Columns)
- {
- model.Add(column.ColumnName, dr[column.ColumnName].ToString());
- }
- //model.Add("HItemID", dr["HItemID"].ToString());
- //model.Add("HERPItemID", dr["HERPItemID"].ToString());
- //model.Add("HCREATEORGID", dr["HCREATEORGID"].ToString());
- //model.Add("HUSEORGID", dr["HUSEORGID"].ToString());
- //model.Add("HNumber", dr["HNumber"].ToString());
- //model.Add("HName", dr["HName"].ToString());
- //model.Add("HModel", dr["HModel"].ToString());
- //model.Add("HUnitID", dr["HUnitID"].ToString());
- //model.Add("HUnitGroupID", dr["HUnitGroupID"].ToString());
- //model.Add("HMaterClsID", dr["HMaterClsID"].ToString());
- //model.Add("HMaterTypeID", dr["HMaterTypeID"].ToString());
- //model.Add("HWhID", dr["HWhID"].ToString());
- //model.Add("HSPID", dr["HSPID"].ToString());
- //model.Add("HMinPickQty", dr["HMinPickQty"].ToString());
- string _model = JsonConvert.SerializeObject(model);
- JObject jsonRoot = new JObject()
- {
- ["model"] = model + ";Admin;100038"
+ DataTable dt = DBServiceHelper.ExecuteDataSet(Context, sql).Tables[0];
+ if (dt.Rows.Count == 0)
+ {
+ LogService.Write("鐗╂枡鍚屾寮傚父锛�" + sql);
+ continue;
+ }
+ DataRow dr = dt.Rows[0];
+ JObject model = new JObject();
+ foreach (DataColumn column in dt.Columns)
+ {
+ model.Add(column.ColumnName, dr[column.ColumnName].ToString());
+ }
+ string _model = JsonConvert.SerializeObject(model);
+ JObject _jsonRoot = new JObject()
+ {
+ ["model"] = model
+ };
+ //LogService.Write("鐗╂枡鍚屾鎻掍欢,JSON鎷兼帴瀹屾垚锛�" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:fff:ffffff"));
+ //var client = new RestSharp.RestClient("http://47.96.97.237/api/");
+ //string clientUrl = Util.GetConfigKey(AppDomain.CurrentDomain.BaseDirectory + "/Config/kdapi.config", "ClientUrl");//K/3 Cloud 涓氬姟绔欑偣鍦板潃
+ var client = new RestSharp.RestClient(" http://10.11.18.195:8080/simoerapi/");
+ //var client = new RestSharp.RestClient(" http://10.11.18.195:8080/simoerapi/");
+ //鍒犻櫎
+ //var requestGet = new RestRequest("Gy_Material/Delete", Method.GET);
+ //requestGet.AddParameter("HItemID", dr["HERPItemID"].ToString());
+ //requestGet.AddParameter("user", "10000");
+ //IRestResponse response = client.Execute(requestGet);
+ //var contentGet = response.Content;
+ //Console.WriteLine("GET鏂瑰紡鑾峰彇缁撴灉锛�" + contentGet);
+ //鏂板
+ //LogService.Write("鐗╂枡鍚屾绀轰緥锛�"+ JsonConvert.SerializeObject(_jsonRoot));
+ var requestPost = new RestRequest("Gy_Material/SaveGy_MaterialListApi", Method.POST);
+ requestPost.AddParameter("application/json", JsonConvert.SerializeObject(_jsonRoot), ParameterType.RequestBody);
+ IRestResponse responsePost = client.Execute(requestPost);
+ //LogService.Write("鐗╂枡鍚屾鎻掍欢,post瀹屾垚锛�" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:fff:ffffff"));
+ var contentPost = responsePost.Content;
+ if (!contentPost.Contains("鎴愬姛"))
+ {
+ LogService.Write("鐗╂枡鍚屾寮傚父,POST鏂瑰紡鑾峰彇缁撴灉," + billObj["Id"] + "," + responsePost.ErrorMessage);
+ //LogService.Write("鐗╂枡鍚屾寮傚父,ContentType," + responsePost.ContentType);
+ //LogService.Write("鐗╂枡鍚屾寮傚父,ContentEncoding," + responsePost.ContentEncoding);
+ //LogService.Write("鐗╂枡鍚屾寮傚父,Content," + responsePost.Content);
+ //LogService.Write("鐗╂枡鍚屾寮傚父,StatusDescription," + responsePost.StatusDescription);
+ //LogService.Write("鐗╂枡鍚屾寮傚父,Server," + responsePost.Server);
+ //LogService.Write("鐗╂枡鍚屾寮傚父,ErrorMessage," + responsePost.ErrorMessage);
+ LogService.Write("鐗╂枡鍚屾寮傚父,POST," + "Gy_Material/SaveGy_MaterialListApi");
+ LogService.Write("鐗╂枡鍚屾寮傚父,JsonConvert.SerializeObject(_jsonRoot)," + JsonConvert.SerializeObject(_jsonRoot));
+ }
+ //Console.WriteLine("POST鏂瑰紡鑾峰彇缁撴灉锛�" + responsePost.ErrorMessage);
+ //Console.Read();
};
- JObject _jsonRoot = new JObject()
- {
- ["model"] = model
- };
-
- //string jsonRoot = JsonConvert.SerializeObject(jsonRoot);
- //var client = new RestSharp.RestClient("http://47.96.97.237/api/");
- //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 requestGet = new RestRequest("Gy_Material/Delete", Method.GET);
- //requestGet.AddParameter("HItemID", dr["HERPItemID"].ToString());
- //requestGet.AddParameter("user", "10000");
- //IRestResponse response = client.Execute(requestGet);
- //var contentGet = response.Content;
- //Console.WriteLine("GET鏂瑰紡鑾峰彇缁撴灉锛�" + contentGet);
- //鏂板
- //LogService.Write("鐗╂枡鍚屾绀轰緥锛�"+ JsonConvert.SerializeObject(_jsonRoot));
- var requestPost = new RestRequest("Gy_Material/SaveGy_MaterialListApi", Method.POST);
- //var json = newjson.ToString() + ";Admin;100038";
- requestPost.AddParameter("application/json", JsonConvert.SerializeObject(_jsonRoot), ParameterType.RequestBody);
- IRestResponse responsePost = client.Execute(requestPost);
- var contentPost = responsePost.Content;
- if (!contentPost.Contains("鎴愬姛")) {
- LogService.Write("鐗╂枡鍚屾寮傚父,POST鏂瑰紡鑾峰彇缁撴灉," + billObj["Id"] + "," + contentPost);
- LogService.Write("鐗╂枡鍚屾寮傚父,POST," + "Gy_Material/SaveGy_MaterialListApi");
- LogService.Write("鐗╂枡鍚屾寮傚父,JsonConvert.SerializeObject(_jsonRoot)," + JsonConvert.SerializeObject(_jsonRoot));
- }
- //Console.WriteLine("POST鏂瑰紡鑾峰彇缁撴灉锛�" + contentPost);
- //Console.Read();
- };
-
- foreach (var item in dictionary)
- {
- ResultMessage.dataError(this.OperationResult.OperateResult, item.Key, item.Value);
}
+ catch (Exception ex)
+ {
+ LogService.Write("鐗╂枡鍚屾鎻掍欢锛屾姏鍑哄紓甯革細" + ex.Message.ToString());
+ }
+ //LogService.Write("鐗╂枡鍚屾鎻掍欢,浠ｇ爜鎵ц瀹屾垚锛�" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:fff:ffffff"));
+ //foreach (var item in dictionary)
+ //{
+ // ResultMessage.dataError(this.OperationResult.OperateResult, item.Key, item.Value);
+ //}
}
public static class ResultMessage
{/// <summary>
diff --git a/zymes/OperationService/zymes_RealessOperator.cs b/zymes/OperationService/zymes_RealessOperator.cs
index 0995ad1..284f245 100644
--- a/zymes/OperationService/zymes_RealessOperator.cs
+++ b/zymes/OperationService/zymes_RealessOperator.cs
@@ -18,7 +18,7 @@
namespace zymes_Project.OperationService
{
- [Description("[涓氬姟鍛�-瀹℃牳]鏈嶅姟鎻掍欢]")]
+ [Description("[涓氬姟鍛�-淇濆瓨]鏈嶅姟鎻掍欢]")]
[HotUpdate]
public class zymes_RealessOperator : AbstractOperationServicePlugIn
{
@@ -45,16 +45,20 @@
Entity entity = this.BusinessInfo.GetEntity("FEntity");//鑾峰彇鏄庣粏淇℃伅
foreach (var billObj in e.DataEntitys)
{
- //var sql = $"exec zymes_RealessUnit {billObj["Id"]} ";
+ var forgName = Context.CurrentOrganizationInfo.Name;
+ if (!forgName.Contains("鏉窞鏂帿灏旂鎬ф潗鏂欐湁闄愬叕鍙�"))
+ continue;
+ //var sql = $"exec zymes_RealessOperator {billObj["Id"]} ";
var id = billObj["Id"].ToString();
string sql =string.Empty;
sql = $@"
/*dialect*/
-select a.FOPERATORID as HItemID,'' as HNumber,'' as HName,'' as HHelpCode,'' as HShortNumber,0 as HParentID
+select a.FENTRYID as HItemID,st.FNUMBER as HNumber,l.FNAME as HName,'' as HHelpCode,st.FNUMBER as HShortNumber,0 as HParentID
,1 as HLevel,'true' as HEndFlag,'false' as HStopflag,'CLD-ERP瀵煎叆' as HRemark,'' as HUseFlag,0 as HUSEORGID
-,0 as HOperatorId,'' as HOperatorType,0 as HSEQ,0 as HStaffId,0 as HIsUse
-from T_BD_OPERATOR a with(nolock)
-inner join T_BD_OPERATOR_L l with(nolock) on a.FOPERATORID=l.FOPERATORID and FLOCALEID=2052
+,a.FOPERATORID as HOperatorId,a.FOPERATORTYPE as HOperatorType,a.FSEQ as HSEQ,a.FSTAFFID as HStaffId,a.FISUSE as HIsUse
+from T_BD_OPERATORENTRY a with(nolock)
+inner join T_BD_OPERATORENTRY_L l with(nolock) on a.FENTRYID=l.FENTRYID and FLOCALEID=2052
+left join T_BD_STAFF st on a.FSTAFFID = st.FSTAFFID
Where a.FOPERATORID={id}
";
DataTable dt = DBServiceHelper.ExecuteDataSet(Context, sql).Tables[0];
@@ -63,27 +67,38 @@
LogService.Write("涓氬姟鍛樺悓姝ュ紓甯革細" + sql);
continue;
}
- DataRow dr = dt.Rows[0];
- JObject model = new JObject();
- foreach (DataColumn column in dt.Columns)
+ //DataRow dr = dt.Rows[0];
+ JArray array = new JArray();
+ foreach(DataRow dr in dt.Rows)
{
- model.Add(column.ColumnName, dr[column.ColumnName].ToString());
+ JObject fentrymodel = new JObject();
+ foreach (DataColumn column in dt.Columns)
+ {
+ fentrymodel.Add(column.ColumnName, dr[column.ColumnName].ToString());
+ }
+ array.Add(fentrymodel);
}
+ JObject model = new JObject();
+ model.Add("HOperatorInfoEntry", array);
+ //foreach (DataColumn column in dt.Columns)
+ //{
+ // model.Add(column.ColumnName, dr[column.ColumnName].ToString());
+ //}
JObject _jsonRoot = new JObject()
{
["model"] = model
};
- LogService.Write("涓氬姟鍛樺悓姝ョず渚嬶細" + JsonConvert.SerializeObject(_jsonRoot));
- LogService.Write("涓氬姟鍛樺悓姝ョず渚嬶細" + _jsonRoot);
+ //LogService.Write("涓氬姟鍛樺悓姝ョず渚嬶細" + JsonConvert.SerializeObject(_jsonRoot));
+ //LogService.Write("涓氬姟鍛樺悓姝ョず渚嬶細" + _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("Gy_Operator/SaveGy_OperatorListApi", Method.POST);
requestPost.AddParameter("application/json", JsonConvert.SerializeObject(_jsonRoot), ParameterType.RequestBody);
IRestResponse responsePost = client.Execute(requestPost);
var contentPost = responsePost.Content;
if (!contentPost.Contains("鎴愬姛"))
{
- LogService.Write("涓氬姟鍛樺悓姝ュ紓甯�,POST鏂瑰紡鑾峰彇缁撴灉," + billObj["Id"] + "," + contentPost);
+ LogService.Write("涓氬姟鍛樺悓姝ュ紓甯�,POST鏂瑰紡鑾峰彇缁撴灉," + billObj["Id"] + "," + responsePost.ErrorMessage);
LogService.Write("涓氬姟鍛樺悓姝ュ紓甯�,POST," + "Gy_Operator/SaveGy_OperatorListApi");
LogService.Write("涓氬姟鍛樺悓姝ュ紓甯�,JsonConvert.SerializeObject(_jsonRoot)," + JsonConvert.SerializeObject(_jsonRoot));
}
diff --git a/zymes/OperationService/zymes_RealessPaymentCondition.cs b/zymes/OperationService/zymes_RealessPaymentCondition.cs
index 9c11a94..2b3f283 100644
--- a/zymes/OperationService/zymes_RealessPaymentCondition.cs
+++ b/zymes/OperationService/zymes_RealessPaymentCondition.cs
@@ -45,6 +45,9 @@
Entity entity = this.BusinessInfo.GetEntity("FEntity");//鑾峰彇鏄庣粏淇℃伅
foreach (var billObj in e.DataEntitys)
{
+ var forgName = Context.CurrentOrganizationInfo.Name;
+ //if (!forgName.Contains("鏉窞鏂帿灏旂鎬ф潗鏂欐湁闄愬叕鍙�"))
+ // continue;
var id = billObj["Id"].ToString();
string sql = string.Empty;
sql = $@"
@@ -75,14 +78,14 @@
//LogService.Write("浠樻鏉′欢鍚屾绀轰緥JsonConvert.SerializeObject(_jsonRoot)锛�" + JsonConvert.SerializeObject(_jsonRoot));
//LogService.Write("浠樻鏉′欢鍚屾绀轰緥锛�" + _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("Gy_PaymentCondition/SaveGy_PaymentConditionListApi", Method.POST);
requestPost.AddParameter("application/json", JsonConvert.SerializeObject(_jsonRoot), ParameterType.RequestBody);
IRestResponse responsePost = client.Execute(requestPost);
var contentPost = responsePost.Content;
if (!contentPost.Contains("鎴愬姛"))
{
- LogService.Write("浠樻鏉′欢鍚屾寮傚父,POST鏂瑰紡鑾峰彇缁撴灉," + billObj["Id"] + "," + contentPost);
+ LogService.Write("浠樻鏉′欢鍚屾寮傚父,POST鏂瑰紡鑾峰彇缁撴灉," + billObj["Id"] + "," + responsePost.ErrorMessage);
LogService.Write("浠樻鏉′欢鍚屾寮傚父,POST," + "Gy_PaymentCondition/SaveGy_PaymentConditionListApi");
LogService.Write("浠樻鏉′欢鍚屾寮傚父,JsonConvert.SerializeObject(_jsonRoot)," + JsonConvert.SerializeObject(_jsonRoot));
}
diff --git a/zymes/OperationService/zymes_RealessPrdMo.cs b/zymes/OperationService/zymes_RealessPrdMo.cs
index 77e3b1e..797f394 100644
--- a/zymes/OperationService/zymes_RealessPrdMo.cs
+++ b/zymes/OperationService/zymes_RealessPrdMo.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_RealessPRDMO {billObj["Id"]} ";
var id = billObj["Id"].ToString();
string sql = string.Empty;
@@ -215,14 +218,44 @@
,case when a.FISREWORK=1 then '杩斿伐' else '鏅��' end HBillSubType
from T_PRD_MO a with(nolock)
Where a.FID={id}
+select a.FID AS HInterID,a.FEntryID HEntryID,isnull(a.FMATERIALID,0) HMaterID,a.FUnitID HUnitID,a.FNEEDQTY HQty,a.FNEEDQTY HQtyMust,isnull(C.FStockID,0) HWHID,'CLOUD瀵煎叆' HRemark
+,isnull(a.FMOID,0) HSourceInterID,isnull(a.FMOENTRYID,0) HSourceEntryID,isnull(a.FMOBILLNO,'') HSourceBillNo,'3710' HSourceBillType,isnull(a.FMOID,0) HICMOInterID,isnull(a.FMOENTRYID,0) HICMOEntryID,isnull(a.FMOBILLNO,'') HICMOBillNo
+,isnull(c.FCHILDSUPPLYORGID,0) HCHILDSUPPLYORGID,isnull(c.FSUPPLYORG,0) HSUPPLYORGID,isnull(c.FENTRUSTPICKORGID,0) HENTRUSTPICKORGID,isnull(c.FSRCTRANSORGID,0) HSRCTRANSORGID,isnull(c.FGROUPBYOWNERID,0) HGROUPBYOWNERID,isnull(c.FOWNERID,0) HOWNERID,isnull(c.FOWNERTYPEID,'') HOWNERTYPEID
+,(q.FSELPICKEDQTY - q.FSELPRCDRETURNQTY) HRelationQty,q.FSELTRANSLATEQTY HMoveStockQty,isnull(a.FAUXPROPID,0) HAuxPropID,isnull(c.FLOT_TEXT,'') HBatchNO,isnull(a.FMTONo,'') HMTONo,a.FBASENUMERATOR/a.FBASEDENOMINATOR HQtyScrap,isnull(a.FID,0) HERPInterID,a.FEntryID HERPEntryID
+,q.FWIPQTY HBackRelationQty,a.FNumerator HNumerator,a.FDenominator HDenominator
+,isnull(a.FBASEUNITID,0) HBASEUNITID,isnull(a.FProcessID,0) HProcessID,isnull(a.FMOENTRYSEQ,0) HICMOENTRYSEQ,isnull(a.FPROJECTNO,'') HPROJECTNO,isnull(a.FOPERID,0) HOPERID,isnull(a.FSEQ,0) HSEQ,isnull(c.FSTOCKSTATUSID,0) HSTOCKSTATUSID
+,isnull(c.FLOT,0) HLOT,c.FOPTQUEUE HOPTQUEUE,isnull(c.FRESERVETYPE,0) HRESERVETYPE,q.FSelPickedQty HSelPickedQty,q.FSELPRCDRETURNQTY HSELPRCDRETURNQTY,isnull(tp.FNAME,0) as HProcName
+from T_PRD_PPBOMEntry a with(nolock)
+left join T_PRD_PPBOMENTRY_LK l with(nolock) on a.FENTRYID=l.FENTRYID
+inner join T_PRD_PPBOMENTRY_C c with(nolock) on A.FENTRYID=c.FENTRYID
+inner join T_PRD_PPBOMENTRY_Q q with(nolock) on A.FENTRYID=q.FENTRYID
+left join T_ENG_PROCESS_L tp with(nolock) on A.FProcessID=tp.FID
+left join T_ENG_PROCESS_L tl on tp.FID =tl.fid and tl.FLOCALEID=2052
+Where a.FMOID={id}
+select a.FID HInterID,YEAR(a.FCREATEDate) AS HYear,MONTH(a.FCREATEDate) AS HPeriod,'3720' HBillType,'3720' HBillSubType,a.FCREATEDate HDate
+,isnull(a.FbillNo,'') HBillNo,case when isnull(a.FAPPROVERID,0)=0 then 1 else 2 end HBillStatus,isnull(a.FMOID,0) HICMOInterID,isnull(a.FMOENTRYID,0) HICMOEntryID
+,a.FMATERIALID HMaterID,a.FUNITID HUnitID,a.FQTY HQty,isnull(a.FWORKSHOPID,0) HDeptID,isnull(a.FCREATORID,0) HMaker,getdate() HMakeDate,isnull(a.FAPPROVERID,0) HChecker,a.FAPPROVEDATE HCheckDate
+,isnull(a.FSALEORDERNO,'') HSeOrderBillNo,isnull(a.FSALEORDERID,0) HSeOrderInterID,isnull(a.FSALEORDERENTRYID,0) HSeOrderEntryID
+,isnull(a.FPRDORGID,0) HPRDORGID,isnull(a.FENTRUSTORGID,0) HENTRUSTORGID,isnull(a.FPARENTOWNERID,0) HPARENTOWNERID,isnull(a.FPARENTOWNERTYPEID,'') HPARENTOWNERTYPEID,isnull(a.FREQSRC,'') HREQSRC
+,a.FID HERPInterID,'PPBOM' HERPBillType,isnull(a.FSALEORDERENTRYSEQ,0) HSeOrderEntrySEQ,isnull(a.FMOEntrySEQ,0) HICMOEntrySEQ
+from T_PRD_PPBOM a with(nolock)
+Where a.FMOID={id}
";
DataSet ds = DBServiceHelper.ExecuteDataSet(Context, sql);
- DataTable maindt = ds.Tables[1];
DataTable subdt = ds.Tables[0];
+ DataTable maindt = ds.Tables[1];
+ DataTable ppbomsubdt = ds.Tables[2];
+ DataTable ppbommaindt = ds.Tables[3];
if (maindt.Rows.Count == 0 || subdt.Rows.Count == 0)
{
LogService.Write("鐢熶骇璁㈠崟鍚屾寮傚父锛�" + sql);
continue;
+ }
+ JObject model = new JObject();//涓昏〃
+ DataRow maindr = maindt.Rows[0];
+ foreach (DataColumn column in maindt.Columns)
+ {
+ model.Add(column.ColumnName, maindr[column.ColumnName].ToString());
}
JArray array = new JArray();//鏄庣粏琛�
foreach (DataRow dr in subdt.Rows)
@@ -234,19 +267,35 @@
}
array.Add(fentrymodel);
}
- JObject model = new JObject();//涓昏〃
- DataRow maindr = maindt.Rows[0];
- foreach (DataColumn column in maindt.Columns)
- {
- model.Add(column.ColumnName, maindr[column.ColumnName].ToString());
- }
model.Add("HENTRY", array);
+ array = new JArray();//ppbom鏄庣粏琛�
+ foreach (DataRow dr in ppbommaindt.Rows)
+ {
+ JObject fentrymodel = new JObject();
+ foreach (DataColumn column in ppbommaindt.Columns)
+ {
+ fentrymodel.Add(column.ColumnName, dr[column.ColumnName].ToString());
+ }
+ array.Add(fentrymodel);
+ }
+ model.Add("HPPBOMMAINENTRY", array);
+ array = new JArray();//ppbom鏄庣粏琛�
+ foreach (DataRow dr in ppbomsubdt.Rows)
+ {
+ JObject fentrymodel = new JObject();
+ foreach (DataColumn column in ppbomsubdt.Columns)
+ {
+ fentrymodel.Add(column.ColumnName, dr[column.ColumnName].ToString());
+ }
+ array.Add(fentrymodel);
+ }
+ model.Add("HPPBOMSUBENTRY", array);
JObject jsonRoot = new JObject()
{
["model"] = model
};
//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("Sc_ICMOBill/ICMOBillSaveApi", Method.POST);
requestPost.AddParameter("application/json", JsonConvert.SerializeObject(jsonRoot), ParameterType.RequestBody);
@@ -254,7 +303,7 @@
var contentPost = responsePost.Content;
if (!contentPost.Contains("鎴愬姛"))
{
- LogService.Write("鐢熶骇璁㈠崟鍚屾寮傚父,POST鏂瑰紡鑾峰彇缁撴灉," + billObj["Id"] + "," + contentPost);
+ LogService.Write("鐢熶骇璁㈠崟鍚屾寮傚父,POST鏂瑰紡鑾峰彇缁撴灉," + billObj["Id"] + "," + responsePost.ErrorMessage);
LogService.Write("鐢熶骇璁㈠崟鍚屾寮傚父,POST," + "Sc_ICMOBill/ICMOBillSaveApi");
LogService.Write("鐢熶骇璁㈠崟鍚屾寮傚父,JsonConvert.SerializeObject(jsonRoot)," + JsonConvert.SerializeObject(jsonRoot));
}
diff --git a/zymes/OperationService/zymes_RealessPrdMoReport.cs b/zymes/OperationService/zymes_RealessPrdMoReport.cs
index ba6a7ec..182fd6f 100644
--- a/zymes/OperationService/zymes_RealessPrdMoReport.cs
+++ b/zymes/OperationService/zymes_RealessPrdMoReport.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_RealessPrdMoReport {billObj["Id"]} ";
var id = billObj["Id"].ToString();
string sql = string.Empty;
@@ -198,7 +201,7 @@
,a.FSRCINTERID as HSourceInterID,a.FSRCENTRYID as HSourceEntryID,a.FSRCBILLNO as HSourceBillNo,a.FSRCBILLTYPE as HSourceBillType,0 HRelationQty,0 as HRelationMoney
,0 HSeOrderInterID,0 HSeOrderEntryID,'' HSeOrderBillNo
,a.FMOID HICMOInterID,a.FMOBILLNO HICMOBillNo, '' HBarCode
-,0 HOWNERTYPEID,0 HISENTRUST,0 HSTOCKINORGID,0 HOWNERID,0 HCHECKPRODUCT,'' HQAIP,0 HCOSTRATE,0 HISBACKFLUSH
+,FOWNERTYPEID HOWNERTYPEID,0 HISENTRUST,FSTOCKINORGID HSTOCKINORGID,FOWNERID HOWNERID,FCHECKPRODUCT HCHECKPRODUCT,'' HQAIP,FCOSTRATE HCOSTRATE,FISBACKFLUSH HISBACKFLUSH
,'' HREQSRC,'' HREQBILLNO,0 HREQBILLID,0 HREQENTRYSEQ,0 HREQENTRYID,a.FMOENTRYID HMOMAINENTRYID,0 HSTOCKINQUASELQTY
,a.FPRODUCTTYPE HPRODUCTTYPE,a.FPROJECTNO HPROJECTNO,a.FMOENTRYSEQ HICMOENTRYSEQ,a.FSEQ as HSEQ,null HPRODUCEDATE,null HEXPIRYDATE,a.FBASEUNITID HBASEUNITID,isnull(a.FWORKSHOPID,0) HDEPTID
,a.FSHIFTGROUPID HGroupID,'' HDESCRIPTION,'' HSourceNumber,0 HQPQty,a.FMOENTRYID HICMOEntryID
@@ -247,9 +250,9 @@
{
["model"] = model
};
- //LogService.Write("鐢熶骇姹囨姤鍗曞悓姝ョず渚�" + JsonConvert.SerializeObject(jsonRoot));
+ 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("Sc_ICMOReportBill/Sc_ICMOReportBillSaveApi", Method.POST);
requestPost.AddParameter("application/json", JsonConvert.SerializeObject(jsonRoot), ParameterType.RequestBody);
@@ -257,7 +260,7 @@
var contentPost = responsePost.Content;
if (!contentPost.Contains("鎴愬姛"))
{
- LogService.Write("鐢熶骇姹囨姤鍗曞悓姝ュ紓甯�,POST鏂瑰紡鑾峰彇缁撴灉," + billObj["Id"] + "," + contentPost);
+ LogService.Write("鐢熶骇姹囨姤鍗曞悓姝ュ紓甯�,POST鏂瑰紡鑾峰彇缁撴灉," + billObj["Id"] + "," + responsePost.ErrorMessage);
LogService.Write("鐢熶骇姹囨姤鍗曞悓姝ュ紓甯�,POST," + "Sc_ICMOReportBill/Sc_ICMOReportBillSaveApi");
LogService.Write("鐢熶骇姹囨姤鍗曞悓姝ュ紓甯�,JsonConvert.SerializeObject(jsonRoot)," + JsonConvert.SerializeObject(jsonRoot));
}
diff --git a/zymes/OperationService/zymes_RealessPrdPpbom.cs b/zymes/OperationService/zymes_RealessPrdPpbom.cs
index de3ac97..d2e3441 100644
--- a/zymes/OperationService/zymes_RealessPrdPpbom.cs
+++ b/zymes/OperationService/zymes_RealessPrdPpbom.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_RealessPRDPPBOM {billObj["Id"]} ";
var id = billObj["Id"].ToString();
string sql = string.Empty;
@@ -193,23 +196,25 @@
select a.FID AS HInterID,a.FEntryID HEntryID,isnull(a.FMATERIALID,0) HMaterID,a.FUnitID HUnitID,a.FNEEDQTY HQty,a.FNEEDQTY HQtyMust,isnull(C.FStockID,0) HWHID,'CLOUD瀵煎叆' HRemark
,isnull(a.FMOID,0) HSourceInterID,isnull(a.FMOENTRYID,0) HSourceEntryID,isnull(a.FMOBILLNO,'') HSourceBillNo,'3710' HSourceBillType,isnull(a.FMOID,0) HICMOInterID,isnull(a.FMOENTRYID,0) HICMOEntryID,isnull(a.FMOBILLNO,'') HICMOBillNo
,isnull(c.FCHILDSUPPLYORGID,0) HCHILDSUPPLYORGID,isnull(c.FSUPPLYORG,0) HSUPPLYORGID,isnull(c.FENTRUSTPICKORGID,0) HENTRUSTPICKORGID,isnull(c.FSRCTRANSORGID,0) HSRCTRANSORGID,isnull(c.FGROUPBYOWNERID,0) HGROUPBYOWNERID,isnull(c.FOWNERID,0) HOWNERID,isnull(c.FOWNERTYPEID,'') HOWNERTYPEID
-,q.FSELPICKEDQTY-q.FSELPRCDRETURNQTY HRelationQty,q.FSELTRANSLATEQTY HMoveStockQty,isnull(a.FAUXPROPID,0) HAuxPropID,isnull(c.FLOT_TEXT,'') HBatchNO,isnull(a.FMTONo,'') HMTONo,a.FBASENUMERATOR/a.FBASEDENOMINATOR HQtyScrap,isnull(a.FID,0) HERPInterID,a.FEntryID HERPEntryID
+,(q.FSELPICKEDQTY - q.FSELPRCDRETURNQTY) HRelationQty,q.FSELTRANSLATEQTY HMoveStockQty,isnull(a.FAUXPROPID,0) HAuxPropID,isnull(c.FLOT_TEXT,'') HBatchNO,isnull(a.FMTONo,'') HMTONo,a.FBASENUMERATOR/a.FBASEDENOMINATOR HQtyScrap,isnull(a.FID,0) HERPInterID,a.FEntryID HERPEntryID
,q.FWIPQTY HBackRelationQty,a.FNumerator HNumerator,a.FDenominator HDenominator
,isnull(a.FBASEUNITID,0) HBASEUNITID,isnull(a.FProcessID,0) HProcessID,isnull(a.FMOENTRYSEQ,0) HICMOENTRYSEQ,isnull(a.FPROJECTNO,'') HPROJECTNO,isnull(a.FOPERID,0) HOPERID,isnull(a.FSEQ,0) HSEQ,isnull(c.FSTOCKSTATUSID,0) HSTOCKSTATUSID
-,isnull(c.FLOT,0) HLOT,c.FOPTQUEUE HOPTQUEUE,isnull(c.FRESERVETYPE,0) HRESERVETYPE,q.FSelPickedQty HSelPickedQty,q.FSELPRCDRETURNQTY HSELPRCDRETURNQTY
+,isnull(c.FLOT,0) HLOT,c.FOPTQUEUE HOPTQUEUE,isnull(c.FRESERVETYPE,0) HRESERVETYPE,q.FSelPickedQty HSelPickedQty,q.FSELPRCDRETURNQTY HSELPRCDRETURNQTY,isnull(tp.FNAME,0) as HProcName
from T_PRD_PPBOMEntry a with(nolock)
left join T_PRD_PPBOMENTRY_LK l with(nolock) on a.FENTRYID=l.FENTRYID
inner join T_PRD_PPBOMENTRY_C c with(nolock) on A.FENTRYID=c.FENTRYID
inner join T_PRD_PPBOMENTRY_Q q with(nolock) on A.FENTRYID=q.FENTRYID
+left join T_ENG_PROCESS_L tp with(nolock) on A.FProcessID=tp.FID
+left join T_ENG_PROCESS_L tl on tp.FID =tl.fid and tl.FLOCALEID=2052
Where a.FID={id}
-select a.FID HInterID,year(a.FCREATEDate) HYear,month(a.FCREATEDate) HPeriod,'3720' HBillType,'3720' HBillSubType,a.FCREATEDate HDate
+select a.FID HInterID,YEAR(a.FCREATEDate) AS HYear,MONTH(a.FCREATEDate) AS HPeriod,'3720' HBillType,'3720' HBillSubType,a.FCREATEDate HDate
,isnull(a.FbillNo,'') HBillNo,case when isnull(a.FAPPROVERID,0)=0 then 1 else 2 end HBillStatus,isnull(a.FMOID,0) HICMOInterID,isnull(a.FMOENTRYID,0) HICMOEntryID
,a.FMATERIALID HMaterID,a.FUNITID HUnitID,a.FQTY HQty,isnull(a.FWORKSHOPID,0) HDeptID,isnull(a.FCREATORID,0) HMaker,getdate() HMakeDate,isnull(a.FAPPROVERID,0) HChecker,a.FAPPROVEDATE HCheckDate
,isnull(a.FSALEORDERNO,'') HSeOrderBillNo,isnull(a.FSALEORDERID,0) HSeOrderInterID,isnull(a.FSALEORDERENTRYID,0) HSeOrderEntryID
,isnull(a.FPRDORGID,0) HPRDORGID,isnull(a.FENTRUSTORGID,0) HENTRUSTORGID,isnull(a.FPARENTOWNERID,0) HPARENTOWNERID,isnull(a.FPARENTOWNERTYPEID,'') HPARENTOWNERTYPEID,isnull(a.FREQSRC,'') HREQSRC
,a.FID HERPInterID,'PPBOM' HERPBillType,isnull(a.FSALEORDERENTRYSEQ,0) HSeOrderEntrySEQ,isnull(a.FMOEntrySEQ,0) HICMOEntrySEQ
-from .T_PRD_PPBOM a with(nolock)
+from T_PRD_PPBOM a with(nolock)
Where a.FID={id}
";
DataSet ds = DBServiceHelper.ExecuteDataSet(Context, sql);
@@ -243,7 +248,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("Sc_PPBomBill/Sc_PPBomBillSaveApi", Method.POST);
requestPost.AddParameter("application/json", JsonConvert.SerializeObject(jsonRoot), ParameterType.RequestBody);
@@ -251,7 +256,7 @@
var contentPost = responsePost.Content;
if (!contentPost.Contains("鎴愬姛"))
{
- LogService.Write("鐢熶骇鐢ㄦ枡娓呭崟鍚屾寮傚父,POST鏂瑰紡鑾峰彇缁撴灉," + billObj["Id"] + "," + contentPost);
+ LogService.Write("鐢熶骇鐢ㄦ枡娓呭崟鍚屾寮傚父,POST鏂瑰紡鑾峰彇缁撴灉," + billObj["Id"] + "," + responsePost.ErrorMessage);
LogService.Write("鐢熶骇鐢ㄦ枡娓呭崟鍚屾寮傚父,POST," + "Sc_PPBomBill/Sc_PPBomBillSaveApi");
LogService.Write("鐢熶骇鐢ㄦ枡娓呭崟鍚屾寮傚父,JsonConvert.SerializeObject(jsonRoot)," + JsonConvert.SerializeObject(jsonRoot));
}
diff --git a/zymes/OperationService/zymes_RealessPurPoorder.cs b/zymes/OperationService/zymes_RealessPurPoorder.cs
index 18ed1bc..4d192bd 100644
--- a/zymes/OperationService/zymes_RealessPurPoorder.cs
+++ b/zymes/OperationService/zymes_RealessPurPoorder.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_RealessPurPoorder {billObj["Id"]} ";
var id = billObj["Id"].ToString();
string sql = string.Empty;
@@ -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_POOrderBill/Cg_POOrderBillSaveApi", 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_POOrderBill/Cg_POOrderBillSaveApi");
LogService.Write("閲囪喘璁㈠崟鍚屾寮傚父,JsonConvert.SerializeObject(jsonRoot)," + JsonConvert.SerializeObject(jsonRoot));
}
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));
}
diff --git a/zymes/OperationService/zymes_RealessRateType.cs b/zymes/OperationService/zymes_RealessRateType.cs
index cf11d02..c8112e7 100644
--- a/zymes/OperationService/zymes_RealessRateType.cs
+++ b/zymes/OperationService/zymes_RealessRateType.cs
@@ -18,7 +18,7 @@
namespace zymes_Project.OperationService
{
- [Description("[姹囩巼绫诲瀷-瀹℃牳]鏈嶅姟鎻掍欢]")]
+ [Description("[姹囩巼绫诲瀷-淇濆瓨]鏈嶅姟鎻掍欢]")]
[HotUpdate]
public class zymes_RealessRateType : AbstractOperationServicePlugIn
{
@@ -45,6 +45,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_RealessRateType {billObj["Id"]} ";
var id = billObj["Id"].ToString();
string sql = string.Empty;
@@ -77,14 +80,14 @@
//LogService.Write("姹囩巼绫诲瀷鍚屾绀轰緥.SerializeObject(_jsonRoot)锛�" + JsonConvert.SerializeObject(_jsonRoot));
//LogService.Write("姹囩巼绫诲瀷鍚屾绀轰緥锛�" + _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("Gy_RateType/SaveGy_RateTypeListApi", Method.POST);
requestPost.AddParameter("application/json", JsonConvert.SerializeObject(_jsonRoot), ParameterType.RequestBody);
IRestResponse responsePost = client.Execute(requestPost);
var contentPost = responsePost.Content;
if (!contentPost.Contains("鎴愬姛"))
{
- LogService.Write("姹囩巼绫诲瀷鍚屾寮傚父,POST鏂瑰紡鑾峰彇缁撴灉," + billObj["Id"] + "," + contentPost);
+ LogService.Write("姹囩巼绫诲瀷鍚屾寮傚父,POST鏂瑰紡鑾峰彇缁撴灉," + billObj["Id"] + "," + responsePost.ErrorMessage);
LogService.Write("姹囩巼绫诲瀷鍚屾寮傚父,POST," +"Gy_RateType/SaveGy_RateTypeListApi");
LogService.Write("姹囩巼绫诲瀷鍚屾寮傚父,JsonConvert.SerializeObject(_jsonRoot)," + JsonConvert.SerializeObject(_jsonRoot));
}
diff --git a/zymes/OperationService/zymes_RealessRecCondition.cs b/zymes/OperationService/zymes_RealessRecCondition.cs
index d66841f..a5de11d 100644
--- a/zymes/OperationService/zymes_RealessRecCondition.cs
+++ b/zymes/OperationService/zymes_RealessRecCondition.cs
@@ -45,6 +45,9 @@
Entity entity = this.BusinessInfo.GetEntity("FEntity");//鑾峰彇鏄庣粏淇℃伅
foreach (var billObj in e.DataEntitys)
{
+ var forgName = Context.CurrentOrganizationInfo.Name;
+ if (!forgName.Contains("鏉窞鏂帿灏旂鎬ф潗鏂欐湁闄愬叕鍙�"))
+ continue;
var id = billObj["Id"].ToString();
string sql = string.Empty;
sql = $@"
@@ -75,14 +78,14 @@
//LogService.Write("鏀舵鏉′欢鍚屾绀轰緥JsonConvert.SerializeObject(_jsonRoot)锛�" + JsonConvert.SerializeObject(_jsonRoot));
//LogService.Write("鏀舵鏉′欢鍚屾绀轰緥锛�" + _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("Gy_RecCondition/SaveGy_RecConditionListApi", Method.POST);
requestPost.AddParameter("application/json", JsonConvert.SerializeObject(_jsonRoot), ParameterType.RequestBody);
IRestResponse responsePost = client.Execute(requestPost);
var contentPost = responsePost.Content;
if (!contentPost.Contains("鎴愬姛"))
{
- LogService.Write("鏀舵鏉′欢鍚屾寮傚父,POST鏂瑰紡鑾峰彇缁撴灉," + billObj["Id"] + "," + contentPost);
+ LogService.Write("鏀舵鏉′欢鍚屾寮傚父,POST鏂瑰紡鑾峰彇缁撴灉," + billObj["Id"] + "," + responsePost.ErrorMessage);
LogService.Write("鏀舵鏉′欢鍚屾寮傚父,POST," + "Gy_RecCondition/SaveGy_RecConditionListApi");
LogService.Write("鏀舵鏉′欢鍚屾寮傚父,JsonConvert.SerializeObject(_jsonRoot)," + JsonConvert.SerializeObject(_jsonRoot));
}
diff --git a/zymes/OperationService/zymes_RealessSalSeOutStock.cs b/zymes/OperationService/zymes_RealessSalSeOutStock.cs
new file mode 100644
index 0000000..b0efe2e
--- /dev/null
+++ b/zymes/OperationService/zymes_RealessSalSeOutStock.cs
@@ -0,0 +1,155 @@
+锘縰sing System;
+using System.Collections.Generic;
+using Kingdee.BOS.Util;
+using Kingdee.BOS.Core.Metadata.EntityElement;
+using Kingdee.BOS.Core.DynamicForm.PlugIn;
+using Kingdee.BOS.Core.DynamicForm.PlugIn.Args;
+using Kingdee.BOS.Orm.DataEntity;
+using System.ComponentModel;
+using Kingdee.BOS.ServiceHelper;
+using System.Data;
+using Newtonsoft.Json.Linq;
+using ZD.Cloud.WebApi;
+using Newtonsoft.Json;
+using Kingdee.BOS.Core.DynamicForm;
+using System.Linq;
+using RestSharp;
+using zymes_Project.Utility;
+
+namespace zymes_Project.OperationService
+{
+ [Description("[鍙戣揣閫氱煡鍗�-瀹℃牳]鏈嶅姟鎻掍欢]")]
+ [HotUpdate]
+ public class zymes_RealessSalSeOutStock : AbstractOperationServicePlugIn
+ {
+ Dictionary<string, string> dictionary = new Dictionary<string, string>();
+ public override void OnPrepareOperationServiceOption(OnPrepareOperationServiceEventArgs e)
+ {
+ base.OnPrepareOperationServiceOption(e);
+
+ //涓轰簡鍦˙eginOperationTransaction閲屾鏌ユ暟鎹姏鍑哄紓甯告椂
+ //鍙洖婊氬綋鍓嶅崟鎹殑浜嬪姟,杩欓噷璁剧疆涓轰笉鏀寔鎵归噺浜嬪姟,杩欐牱BOS浼�
+ //寰幆涓烘瘡涓�寮犲崟鎹垱寤轰簨鍔¤皟鐢ㄦ搷浣�
+ e.SupportTransaction = true;
+ e.SurportBatchTransaction = false;
+ }
+ public override void OnPreparePropertys(PreparePropertysEventArgs e)
+ {
+ base.OnPreparePropertys(e);
+ e.FieldKeys.Add("FEntity");
+ e.FieldKeys.Add("FEntity_FEntryID");
+ }
+
+ public override void AfterExecuteOperationTransaction(AfterExecuteOperationTransaction e)
+ {
+ base.AfterExecuteOperationTransaction(e);
+ Entity entity = this.BusinessInfo.GetEntity("FEntity");//鑾峰彇鏄庣粏淇℃伅
+ foreach (var billObj in e.DataEntitys)
+ {
+ var forgName = Context.CurrentOrganizationInfo.Name;
+ if (!forgName.Contains("鏉窞鏂帿灏旂鎬ф潗鏂欐湁闄愬叕鍙�"))
+ continue;
+ var id = billObj["Id"].ToString();
+ string sql = string.Empty;
+ sql = $@"
+/*dialect*/
+select a.FID HInterID, a.FENTRYID HEntryID, a.FMATERIALID HMaterID, a.FUNITID HUnitID,
+a.FQTY HQty, isnull(f.FPRICE,0) HPrice, isnull(f.FAMOUNT,0) HMoney, 0 HWHID, 0 HSPID,
+a.FNOTE HRemark, 0 HSourceInterID, 0 HSourceEntryID, '' HSourceBillNo, '' HSourceBillType,
+0 HSeOrderInterID, 0 HSeOrderEntryID, '' HSeOrderBillNo, e.FOWNERID HOWNERID, e.FOWNERTYPEID HOWNERTYPEID,
+fin.FSETTLEORGID HSETTLEORGID, a.FSUMOUTQTY HMoveStockQty, a.FJOINOUTQTY HRelationQty, a.FAUXPROPID HAuxPropID,
+'' HBatchNO, a.FMTONO HMTONo, a.FID HERPInterID, a.FEntryID HERPEntryID, a.FCUSTMATID HCUSTMATID,
+a.FBASEUNITID HBASEUNITID, a.FBFLOWID HBFLOWID, a.FOUTCONTROL HOUTCONTROL, 0 HSTOCKUNITID,
+e.FROWID HROWTYPE, e.FROWID HROWID, e.FPARENTROWID HPARENTROWID, isnull(e.FPARENTMATID,0) HPARENTMATID,
+isnull(f.FTAXCOMBINATION,0) HTAXCOMBINATION, isnull(f.FPRICECOEFFICIENT,0) HPRICECOEFFICIENT, isnull(f.FSYSPRICE,0) HSYSPRICE,
+isnull(f.FLIMITDOWNPRICE,0) HLIMITDOWNPRICE, isnull(f.FPRICEUNITID,0) HPRICEUNITID, isnull(f.FTAXPRICE,0) HTAXPRICE,
+isnull(f.FTAXRATE,0) HTAXRATE, isnull(f.FTAXNETPRICE,0) HTAXNETPRICE, isnull(f.FDISCOUNTRATE,0) HDISCOUNTRATE,
+isnull(f.FISFREE,0) HISFREE, isnull(fin.FLOCALCURRID,0) HLOCALCURRID, isnull(fin.FSETTLECURRID,0) HSETTLECURRID,
+isnull(fin.FEXCHANGETYPEID,0) HEXCHANGETYPEID, isnull(fin.FSETTLETYPEID,0) HSETTLETYPEID, isnull(fin.FRECEIPTCONDITIONID,0) HRECEIPTCONDITIONID,
+isnull(fin.FEXCHANGERATE,0) HEXCHANGERATE, isnull(fin.FISINCLUDEDTAX,0) HISINCLUDEDTAX, isnull(fin.FISPRICEEXCLUDETAX,0) HISPRICEEXCLUDETAX,
+isnull(tax.FTAXRATEID,0) HTAXRATEID, 0 HTaxRate_TAX, isnull(tax.FCOSTPERCENT,0) HCOSTPERCENT, isnull(tax.FVAT,0) HVAT,
+isnull(tax.FSELLERWITHHOLDING,0) HSELLERWITHHOLDING, isnull(tax.FBUYERWITHHOLDING,0) HBUYERWITHHOLDING
+from T_SAL_DELIVERYNOTICEENTRY a with(nolock)
+left join T_SAL_DELIVERYNOTICEENTRY_F f with(nolock) on a.FENTRYID = f.FENTRYID
+left join T_SAL_DELIVERYNOTICEENTRY_E e with(nolock) on a.FENTRYID = e.FENTRYID
+left join T_SAL_DELIVERYNOTICEFIN fin with(nolock) on a.FENTRYID = fin.FENTRYID
+left join T_SAL_DELIVERYNOTICEENTRYTAX tax with(nolock) on a.FENTRYID = tax.FENTRYID
+Where a.FID={id}
+select FID as HInterID, YEAR(FDATE) as HYear, MONTH(FDATE) as HPeriod, '1402' HBillType, '1402' HBillSubType,
+FDATE as HDate, FBILLNO as HBillNo, case when FAPPROVERID=0 then 1 else 2 end HBillStatus, FCUSTOMERID as HCusID,
+0 HManagerID, FSALEDEPTID as HDeptID, 'CLOUD瀵煎叆' as HRemark, FRECEIVEADDRESS as HAddress, 0 HSSID, 0 HCurID,
+0 HWHID, 0 HExRate, 0 HEmpID, 'CLOUD瀵煎叆' as HExplanation, FBILLNO as HInnerBillNo, FSALEORGID as HSALEORGID,
+FDELIVERYORGID as HDELIVERYORGID, FOWNERID as HOWNERID, FOWNERTYPEID as HOWNERTYPEID, FID as HERPInterID,
+FBILLTYPEID as HERPBillType, FCREATORID as HMaker, FCREATEDATE as HMakeDate, FAPPROVERID as HChecker,
+FAPPROVEDATE as HCheckDate, FCLOSERID as HCloseMan, FCLOSEDATE as HCloseDate, FSTOCKERGROUPID as HSTOCKERGROUPID,
+FSALEGROUPID as HSALEGROUPID, FSALEDEPTID as HSALEDEPTID, FBUSINESSTYPE as HBUSINESSTYPE, FCARRIERID as HCARRIERID,
+FRECEIVERID as HRECEIVERID, FSETTLEID as HSETTLEID, FPAYERID as HPAYERID,FHEADLOCID as HHEADLOCID, FRECCONTACTID as HRECCONTACTID,
+FRECEIPTCONDITIONID as HRECEIPTCONDITIONID, FCORRESPONDORGID as HCORRESPONDORGID, FCARRIAGENO as HCARRIAGENO
+from T_SAL_DELIVERYNOTICE with(nolock)
+Where FID={id}
+";
+ DataSet ds = DBServiceHelper.ExecuteDataSet(Context, sql);
+ DataTable maindt = ds.Tables[1];
+ DataTable subdt = ds.Tables[0];
+ if (maindt.Rows.Count == 0 || subdt.Rows.Count == 0)
+ {
+ LogService.Write("鍙戣揣閫氱煡鍗曞悓姝ュ紓甯革細" + sql);
+ continue;
+ }
+ JArray array = new JArray();//鏄庣粏琛�
+ foreach (DataRow dr in subdt.Rows)
+ {
+ JObject fentrymodel = new JObject();
+ foreach (DataColumn column in subdt.Columns)
+ {
+ fentrymodel.Add(column.ColumnName, dr[column.ColumnName].ToString());
+ }
+ array.Add(fentrymodel);
+ }
+ JObject model = new JObject();//涓昏〃
+ DataRow maindr = maindt.Rows[0];
+ foreach (DataColumn column in maindt.Columns)
+ {
+ model.Add(column.ColumnName, maindr[column.ColumnName].ToString());
+ }
+ model.Add("HENTRY", array);
+ JObject jsonRoot = new JObject()
+ {
+ ["model"] = model
+ };
+ //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://10.11.18.195:8080/simoerapi/");
+ //鏂板
+ var requestPost = new RestRequest("Xs_SeOutStockBill/Xs_SeOutStockBillSaveApi", Method.POST);
+ requestPost.AddParameter("application/json", JsonConvert.SerializeObject(jsonRoot), ParameterType.RequestBody);
+ IRestResponse responsePost = client.Execute(requestPost);
+ var contentPost = responsePost.Content;
+ if (!contentPost.Contains("鎴愬姛"))
+ {
+ LogService.Write("鍙戣揣閫氱煡鍗曞悓姝ュ紓甯�,POST鏂瑰紡鑾峰彇缁撴灉," + billObj["Id"] + "," + responsePost.ErrorMessage);
+ LogService.Write("鍙戣揣閫氱煡鍗曞悓姝ュ紓甯�,POST," + "Xs_SeOutStockBill/Xs_SeOutStockBillSaveApi");
+ LogService.Write("鍙戣揣閫氱煡鍗曞悓姝ュ紓甯�,JsonConvert.SerializeObject(jsonRoot)," + JsonConvert.SerializeObject(jsonRoot));
+ }
+ };
+ foreach (var item in dictionary)
+ {
+ ResultMessage.dataError(this.OperationResult.OperateResult, item.Key, item.Value);
+ }
+ }
+ public static class ResultMessage
+ {/// <summary>
+ /// 淇敼鎻愮ず淇℃伅
+ /// </summary>
+ /// <param name="operateResult"></param>
+ /// <param name="billno"></param>
+ public static void dataError(OperateResultCollection operateResult, string billno, string message)
+ {
+ OperateResult operate = operateResult.Where(n => n.Number == billno).First();
+ operate.Message = message;
+ operate.SuccessStatus = false;
+ operate.MessageType = MessageType.FatalError;
+ }
+ }
+ }
+}
diff --git a/zymes/OperationService/zymes_RealessSettleStyle.cs b/zymes/OperationService/zymes_RealessSettleStyle.cs
index 9305af1..0267d61 100644
--- a/zymes/OperationService/zymes_RealessSettleStyle.cs
+++ b/zymes/OperationService/zymes_RealessSettleStyle.cs
@@ -45,6 +45,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_RealessSettleStyle {billObj["Id"]} ";
var id = billObj["Id"].ToString();
string sql = string.Empty;
@@ -76,14 +79,14 @@
//LogService.Write("缁撶畻鏂瑰紡鍚屾绀轰緥JsonConvert.SerializeObject(_jsonRoot)锛�" + JsonConvert.SerializeObject(_jsonRoot));
//LogService.Write("缁撶畻鏂瑰紡鍚屾绀轰緥锛�" + _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("Gy_SettleStyle/SaveGy_SettleStyleListApi", Method.POST);
requestPost.AddParameter("application/json", JsonConvert.SerializeObject(_jsonRoot), ParameterType.RequestBody);
IRestResponse responsePost = client.Execute(requestPost);
var contentPost = responsePost.Content;
if (!contentPost.Contains("鎴愬姛"))
{
- LogService.Write("缁撶畻鏂瑰紡鍚屾寮傚父,POST鏂瑰紡鑾峰彇缁撴灉," + billObj["Id"] + "," + contentPost);
+ LogService.Write("缁撶畻鏂瑰紡鍚屾寮傚父,POST鏂瑰紡鑾峰彇缁撴灉," + billObj["Id"] + "," + responsePost.ErrorMessage);
LogService.Write("缁撶畻鏂瑰紡鍚屾寮傚父,POST," + "Gy_SettleStyle/SaveGy_SettleStyleListApi");
LogService.Write("缁撶畻鏂瑰紡鍚屾寮傚父,JsonConvert.SerializeObject(_jsonRoot)," + JsonConvert.SerializeObject(_jsonRoot));
}
diff --git a/zymes/OperationService/zymes_RealessStaff.cs b/zymes/OperationService/zymes_RealessStaff.cs
new file mode 100644
index 0000000..63925bc
--- /dev/null
+++ b/zymes/OperationService/zymes_RealessStaff.cs
@@ -0,0 +1,116 @@
+锘縰sing System;
+using System.Collections.Generic;
+using Kingdee.BOS.Util;
+using Kingdee.BOS.Core.Metadata.EntityElement;
+using Kingdee.BOS.Core.DynamicForm.PlugIn;
+using Kingdee.BOS.Core.DynamicForm.PlugIn.Args;
+using Kingdee.BOS.Orm.DataEntity;
+using System.ComponentModel;
+using Kingdee.BOS.ServiceHelper;
+using System.Data;
+using Newtonsoft.Json.Linq;
+using ZD.Cloud.WebApi;
+using Newtonsoft.Json;
+using Kingdee.BOS.Core.DynamicForm;
+using System.Linq;
+using RestSharp;
+using zymes_Project.Utility;
+
+namespace zymes_Project.OperationService
+{
+ [Description("[鍛樺伐-瀹℃牳]鏈嶅姟鎻掍欢]")]
+ [HotUpdate]
+ public class zymes_RealessStaff : AbstractOperationServicePlugIn
+ {
+ Dictionary<string, string> dictionary = new Dictionary<string, string>();
+ public override void OnPrepareOperationServiceOption(OnPrepareOperationServiceEventArgs e)
+ {
+ base.OnPrepareOperationServiceOption(e);
+
+ //涓轰簡鍦˙eginOperationTransaction閲屾鏌ユ暟鎹姏鍑哄紓甯告椂
+ //鍙洖婊氬綋鍓嶅崟鎹殑浜嬪姟,杩欓噷璁剧疆涓轰笉鏀寔鎵归噺浜嬪姟,杩欐牱BOS浼�
+ //寰幆涓烘瘡涓�寮犲崟鎹垱寤轰簨鍔¤皟鐢ㄦ搷浣�
+ e.SupportTransaction = true;
+ e.SurportBatchTransaction = false;
+ }
+ public override void OnPreparePropertys(PreparePropertysEventArgs e)
+ {
+ base.OnPreparePropertys(e);
+ e.FieldKeys.Add("FEntity");
+ e.FieldKeys.Add("FEntity_FEntryID");
+ }
+ public override void AfterExecuteOperationTransaction(AfterExecuteOperationTransaction e)
+ {
+ base.AfterExecuteOperationTransaction(e);
+ 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_RealessStaff {billObj["Id"]} ";
+ var id = billObj["Id"].ToString();
+ string sql =string.Empty;
+ sql = $@"
+/*dialect*/
+select a.FID as HItemID,a.FNUMBER as HNumber,l.FNAME as HName,'' as HHelpCode,a.FNUMBER as HShortNumber,0 as HParentID
+,1 as HLevel,'true' as HEndFlag,'false' as HStopflag,'CLD-ERP瀵煎叆' as HRemark,'' as HUseFlag,a.FUSEORGID as HUSEORGID
+,a.FCREATEORGID as HCREATEORGID,a.FPERSONID as HPERSONID,a.FPOSTID as HPOSTID,a.FFIRSTCARDID as HFIRSTCARDID
+,0 as HDEPTID,a.FSTAFFNUMBER as HSTAFFNUMBER
+from T_HR_EMPINFO a with(nolock)
+inner join T_HR_EMPINFO_L l with(nolock) on a.FID=l.FID and FLOCALEID=2052
+Where a.FID={id}
+";
+ DataTable dt = DBServiceHelper.ExecuteDataSet(Context, sql).Tables[0];
+ if (dt.Rows.Count == 0)
+ {
+ LogService.Write("鍛樺伐鍚屾寮傚父锛�" + sql);
+ continue;
+ }
+ DataRow dr = dt.Rows[0];
+ JObject model = new JObject();
+ foreach (DataColumn column in dt.Columns)
+ {
+ model.Add(column.ColumnName, dr[column.ColumnName].ToString());
+ }
+ JObject _jsonRoot = new JObject()
+ {
+ ["model"] = model
+ };
+ //LogService.Write("鍛樺伐鍚屾绀轰緥锛�" + JsonConvert.SerializeObject(_jsonRoot));
+ //LogService.Write("鍛樺伐鍚屾绀轰緥锛�" + _jsonRoot);
+ //string clientUrl = Util.GetConfigKey(AppDomain.CurrentDomain.BaseDirectory + "/Config/kdapi.config", "ClientUrl");//K/3 Cloud 涓氬姟绔欑偣鍦板潃
+ var client = new RestSharp.RestClient(" http://10.11.18.195:8080/simoerapi/");
+ var requestPost = new RestRequest("Gy_Staff/SaveGy_StaffListApi", Method.POST);
+ requestPost.AddParameter("application/json", JsonConvert.SerializeObject(_jsonRoot), ParameterType.RequestBody);
+ IRestResponse responsePost = client.Execute(requestPost);
+ var contentPost = responsePost.Content;
+ if (!contentPost.Contains("鎴愬姛"))
+ {
+ LogService.Write("鍛樺伐鍚屾寮傚父,POST鏂瑰紡鑾峰彇缁撴灉," + billObj["Id"] + "," + responsePost.ErrorMessage);
+ LogService.Write("鍛樺伐鍚屾寮傚父,POST," + "Gy_Staff/SaveGy_StaffListApi");
+ LogService.Write("鍛樺伐鍚屾寮傚父,JsonConvert.SerializeObject(_jsonRoot)," + JsonConvert.SerializeObject(_jsonRoot));
+ }
+ };
+
+ foreach (var item in dictionary)
+ {
+ ResultMessage.dataError(this.OperationResult.OperateResult, item.Key, item.Value);
+ }
+ }
+ public static class ResultMessage
+ {/// <summary>
+ /// 淇敼鎻愮ず淇℃伅
+ /// </summary>
+ /// <param name="operateResult"></param>
+ /// <param name="billno"></param>
+ public static void dataError(OperateResultCollection operateResult, string billno, string message)
+ {
+ OperateResult operate = operateResult.Where(n => n.Number == billno).First();
+ operate.Message = message;
+ operate.SuccessStatus = false;
+ operate.MessageType = MessageType.FatalError;
+ }
+ }
+ }
+}
diff --git a/zymes/OperationService/zymes_RealessStock.cs b/zymes/OperationService/zymes_RealessStock.cs
index 4238a7d..258e5d1 100644
--- a/zymes/OperationService/zymes_RealessStock.cs
+++ b/zymes/OperationService/zymes_RealessStock.cs
@@ -45,6 +45,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_RealessStock {billObj["Id"]} ";
var id = billObj["Id"].ToString();
string sql = string.Empty;
@@ -58,26 +61,44 @@
inner join T_BD_STOCK_L l with(nolock) on a.FSTOCKID=l.FSTOCKID
Where a.FSTOCKID = {0}
-select c.HID as HItemID,c.HID as HERPItemID,c.HNumber as HNumber,c.HName as HName,c.HNumber as HShortNumber,0 as HParentID,c.HSPType as HSPType,c.HSrcSPType as HSrcSPType,c.HDesSPType as HDesSPType
-,1 as HLevel,'true' as HEndFlag,'false' as HStopflag,'CLD-ERP瀵煎叆' as HRemark,a.FSTOCKID as HSPGroupID,'宸蹭娇鐢�' as HUseFlag,getdate() as HMakeTime,a.FCREATEORGID as HCREATEORGID,a.FUSEORGID as HUSEORGID
-from T_BD_STOCK A with(nolock)
-inner join T_BD_STOCK_L L with(nolock) on A.FSTOCKID=L.FSTOCKID
-inner join T_BD_FLEXVALUESCOM ST with(nolock) on a.FSTOCKID = st.FSTOCKID
-inner join (select c.FID HID,c.FF100001 HSPTypeID
-,''""FStockLocId"":{""FSTOCKLOCID__FF100001"":{""FNUMBER"":""'' HSPType
-,''""FSrcStockLocId"":{""FSRCSTOCKLOCID__FF100001"":{""FNUMBER"":""'' HSrcSPType
-,''""FDestStockLocId"":{""FDESTSTOCKLOCID__FF100001"":{""FNUMBER"":""'' HDesSPType
-,s.FNUMBER HNumber, sp.FName HName
-from T_BAS_FLEXVALUESDETAIL c
-inner
-join T_BAS_FLEXVALUESENTRY s on s.FENTRYID = c.FF100001
-inner
-join T_BAS_FLEXVALUESENTRY_L sp on sp.FENTRYID = c.FF100001) c on c.HID = st.FSTOCKLOCID
-inner join T_ORG_ORGANIZATIONS_L o with(nolock) on o.FORGID = A.FUSEORGID
-where ST.FISDISABLE = '0' AND ST.FSYSDISABLE = '0'
-and l.FLOCALEID = 2052 and isnull(o.FNAME,'') <> ''
-and a.FSTOCKID = {0}
-",id);
+select t1.FSTOCKLOCID as HItemID,t1.FSTOCKLOCID as HERPItemID,t3.FNUMBER HNumber,t4.FNAME HName,t3.FNUMBER HShortNumber,1 HParentID,'' HSPType,'' HSrcSPType,'' HDesSPType
+,1 as HLevel,'true' as HEndFlag, 'false' as HStopflag,'CLD-ERP瀵煎叆' HRemark,t1.fstockid as HSPGroupID,'宸蹭娇鐢�' as HUseFlag,getdate() as HMakeTime,st.FCREATORID HCREATEORGID,st.FUSEORGID HUSEORGID from
+T_BD_FLEXVALUESCOM t1
+join T_BD_STOCK st on t1.FSTOCKID = st.FSTOCKID
+join T_BD_STOCK_l stl on t1.FSTOCKID = stl.FSTOCKID and stl.FLOCALEID = 2052
+join T_BAS_FLEXVALUESDETAIL t2 on t1.FSTOCKLOCID = t2.FID
+--SELECT * FROM T_BAS_FLEXVALUESENTRY t1--浠撲綅鍊奸泦鍒楄〃鏄庣粏
+--join T_BAS_FLEXVALUESENTRY_L t2 on t1.FENTRYID=t2.FENTRYID--浠撲綅鍊奸泦鍒楄〃
+join T_BAS_FLEXVALUESENTRY t3 on t2.FF100003 = t3.FENTRYID--浠撲綅鍊奸泦鍒楄〃鏄庣粏
+join T_BAS_FLEXVALUESENTRY_L t4 on t3.FENTRYID=t4.FENTRYID
+where t1.fstockid= {0} --閲囪喘鍏ュ簱鍗曢�夋嫨浠撳簱鍚� 閫夋嫨浠撲綅
+", id);
+//select c.HID as HItemID,c.HID as HERPItemID,c.HNumber as HNumber,c.HName as HName,c.HNumber as HShortNumber,0 as HParentID,c.HSPType as HSPType,c.HSrcSPType as HSrcSPType,c.HDesSPType as HDesSPType
+//,1 as HLevel,'true' as HEndFlag,'false' as HStopflag,'CLD-ERP瀵煎叆' as HRemark,a.FSTOCKID as HSPGroupID,'宸蹭娇鐢�' as HUseFlag,getdate() as HMakeTime,a.FCREATEORGID as HCREATEORGID,a.FUSEORGID as HUSEORGID
+//from T_BD_STOCK A with(nolock)
+//inner join T_BD_STOCK_L L with(nolock) on A.FSTOCKID = L.FSTOCKID
+//inner join T_BD_FLEXVALUESCOM ST with(nolock) on a.FSTOCKID = st.FSTOCKID
+//inner join(select c.FID HID, c.FF100001 HSPTypeID
+//,''""FStockLocId"":{
+//""FSTOCKLOCID__FF100001"":{
+//""FNUMBER"":""'' HSPType
+//,''""FSrcStockLocId"":{
+//""FSRCSTOCKLOCID__FF100001"":{
+//""FNUMBER"":""'' HSrcSPType
+//,''""FDestStockLocId"":{
+//""FDESTSTOCKLOCID__FF100001"":{
+//""FNUMBER"":""'' HDesSPType
+//,s.FNUMBER HNumber, sp.FName HName
+//from T_BAS_FLEXVALUESDETAIL c
+//inner
+//join T_BAS_FLEXVALUESENTRY s on s.FENTRYID = c.FF100001
+//inner
+//join T_BAS_FLEXVALUESENTRY_L sp on sp.FENTRYID = c.FF100001) c on c.HID = st.FSTOCKLOCID
+//inner join T_ORG_ORGANIZATIONS_L o with(nolock) on o.FORGID = A.FUSEORGID
+//where ST.FISDISABLE = '0' AND ST.FSYSDISABLE = '0'
+//and l.FLOCALEID = 2052 and isnull(o.FNAME,'') <> ''
+//and a.FSTOCKID = {0}
+
DataSet ds = DBServiceHelper.ExecuteDataSet(Context, sql);
DataTable maindt = ds.Tables[0];//浠撳簱
DataTable subdt = ds.Tables[1];//浠撲綅
@@ -109,14 +130,14 @@
};
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("Gy_Warehouse/SaveGy_WarehouseListApi", Method.POST);
requestPost.AddParameter("application/json", JsonConvert.SerializeObject(jsonRoot), ParameterType.RequestBody);
IRestResponse responsePost = client.Execute(requestPost);
var contentPost = responsePost.Content;
if (!contentPost.Contains("鎴愬姛"))
{
- LogService.Write("浠撳簱浠撲綅鍚屾寮傚父,POST鏂瑰紡鑾峰彇缁撴灉," + billObj["Id"] + "," + contentPost);
+ LogService.Write("浠撳簱浠撲綅鍚屾寮傚父,POST鏂瑰紡鑾峰彇缁撴灉," + billObj["Id"] + "," + responsePost.ErrorMessage);
LogService.Write("浠撳簱浠撲綅鍚屾寮傚父,POST," + "Gy_Warehouse/SaveGy_WarehouseListApi");
LogService.Write("浠撳簱浠撲綅鍚屾寮傚父,JsonConvert.SerializeObject(_jsonRoot)," + JsonConvert.SerializeObject(jsonRoot));
}
diff --git a/zymes/OperationService/zymes_RealessStockStatus.cs b/zymes/OperationService/zymes_RealessStockStatus.cs
index 0b45e57..557b587 100644
--- a/zymes/OperationService/zymes_RealessStockStatus.cs
+++ b/zymes/OperationService/zymes_RealessStockStatus.cs
@@ -45,6 +45,9 @@
Entity entity = this.BusinessInfo.GetEntity("FEntity");//鑾峰彇鏄庣粏淇℃伅
foreach (var billObj in e.DataEntitys)
{
+ var forgName = Context.CurrentOrganizationInfo.Name;
+ //if (!forgName.Contains("鏉窞鏂帿灏旂鎬ф潗鏂欐湁闄愬叕鍙�"))
+ // continue;
var id = billObj["Id"].ToString();
string sql = string.Empty;
sql = $@"
@@ -75,14 +78,14 @@
//LogService.Write("搴撳瓨鐘舵�佸悓姝ョず渚婮sonConvert.SerializeObject(_jsonRoot)锛�" + JsonConvert.SerializeObject(_jsonRoot));
//LogService.Write("搴撳瓨鐘舵�佸悓姝ョず渚嬶細" + _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("Gy_StockStatus/SaveGy_StockStatusListApi", Method.POST);
requestPost.AddParameter("application/json", JsonConvert.SerializeObject(_jsonRoot), ParameterType.RequestBody);
IRestResponse responsePost = client.Execute(requestPost);
var contentPost = responsePost.Content;
if (!contentPost.Contains("鎴愬姛"))
{
- LogService.Write("搴撳瓨鐘舵�佸悓姝ュ紓甯�,POST鏂瑰紡鑾峰彇缁撴灉," + billObj["Id"] + "," + contentPost);
+ LogService.Write("搴撳瓨鐘舵�佸悓姝ュ紓甯�,POST鏂瑰紡鑾峰彇缁撴灉," + billObj["Id"] + "," + responsePost.ErrorMessage);
LogService.Write("搴撳瓨鐘舵�佸悓姝ュ紓甯�,POST," + "Gy_StockStatus/SaveGy_StockStatusListApi");
LogService.Write("搴撳瓨鐘舵�佸悓姝ュ紓甯�,JsonConvert.SerializeObject(_jsonRoot)," + JsonConvert.SerializeObject(_jsonRoot));
}
diff --git a/zymes/OperationService/zymes_RealessSupplier.cs b/zymes/OperationService/zymes_RealessSupplier.cs
index 8e7a68f..b7db55a 100644
--- a/zymes/OperationService/zymes_RealessSupplier.cs
+++ b/zymes/OperationService/zymes_RealessSupplier.cs
@@ -45,6 +45,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_RealessSupplier {billObj["Id"]} ";
var id = billObj["Id"].ToString();
string sql = string.Empty;
@@ -74,14 +77,14 @@
};
//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("Gy_Supplier/SaveGy_SupplierListApi", Method.POST);
requestPost.AddParameter("application/json", JsonConvert.SerializeObject(_jsonRoot), ParameterType.RequestBody);
IRestResponse responsePost = client.Execute(requestPost);
var contentPost = responsePost.Content;
if (!contentPost.Contains("鎴愬姛"))
{
- LogService.Write("渚涘簲鍟嗗悓姝ュ紓甯�,POST鏂瑰紡鑾峰彇缁撴灉," + billObj["Id"] + "," + contentPost);
+ LogService.Write("渚涘簲鍟嗗悓姝ュ紓甯�,POST鏂瑰紡鑾峰彇缁撴灉," + billObj["Id"] + "," + responsePost.ErrorMessage);
LogService.Write("渚涘簲鍟嗘寮傚父,POST," + "Gy_Supplier/SaveGy_SupplierListApi");
LogService.Write("渚涘簲鍟嗗悓姝ュ紓甯�,JsonConvert.SerializeObject(_jsonRoot)," + JsonConvert.SerializeObject(_jsonRoot));
}
diff --git a/zymes/OperationService/zymes_RealessTaxMIX.cs b/zymes/OperationService/zymes_RealessTaxMIX.cs
index c8f0865..26881f4 100644
--- a/zymes/OperationService/zymes_RealessTaxMIX.cs
+++ b/zymes/OperationService/zymes_RealessTaxMIX.cs
@@ -15,6 +15,7 @@
using System.Linq;
using RestSharp;
using zymes_Project.Utility;
+using Kingdee.BOS;
namespace zymes_Project.OperationService
{
@@ -46,6 +47,10 @@
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_RealessTaxMIX {billObj["Id"]} ";
DataSet ds = DBServiceHelper.ExecuteDataSet(Context, sql);
DataTable maindt = ds.Tables[1];
@@ -85,7 +90,7 @@
var contentPost = responsePost.Content;
if (!contentPost.Contains("鎴愬姛"))
{
- LogService.Write("绋庣巼缁勫悎鍚屾寮傚父,POST鏂瑰紡鑾峰彇缁撴灉," + billObj["Id"] + "," + contentPost);
+ LogService.Write("绋庣巼缁勫悎鍚屾寮傚父,POST鏂瑰紡鑾峰彇缁撴灉," + billObj["Id"] + "," + responsePost.ErrorMessage);
LogService.Write("绋庣巼缁勫悎鍚屾寮傚父,POST," + clientUrl + "Gy_TaxMIXMain/SaveGy_TaxMIXMainListApi");
LogService.Write("绋庣巼缁勫悎鍚屾寮傚父,JsonConvert.SerializeObject(jsonRoot)," + JsonConvert.SerializeObject(jsonRoot));
}
diff --git a/zymes/OperationService/zymes_RealessTaxRate.cs b/zymes/OperationService/zymes_RealessTaxRate.cs
index f31874f..5650c4f 100644
--- a/zymes/OperationService/zymes_RealessTaxRate.cs
+++ b/zymes/OperationService/zymes_RealessTaxRate.cs
@@ -45,6 +45,9 @@
Entity entity = this.BusinessInfo.GetEntity("FEntity");//鑾峰彇鏄庣粏淇℃伅
foreach (var billObj in e.DataEntitys)
{
+ var forgName = Context.CurrentOrganizationInfo.Name;
+ //if (!forgName.Contains("鏉窞鏂帿灏旂鎬ф潗鏂欐湁闄愬叕鍙�"))
+ // continue;
var id = billObj["Id"].ToString();
string sql = string.Empty;
sql = $@"
@@ -75,14 +78,14 @@
//LogService.Write("绋庣巼鍚屾绀轰緥JsonConvert.SerializeObject(_jsonRoot)锛�" + JsonConvert.SerializeObject(_jsonRoot));
//LogService.Write("绋庣巼鍚屾绀轰緥锛�" + _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("Gy_TaxRate/SaveGy_TaxRateListApi", Method.POST);
requestPost.AddParameter("application/json", JsonConvert.SerializeObject(_jsonRoot), ParameterType.RequestBody);
IRestResponse responsePost = client.Execute(requestPost);
var contentPost = responsePost.Content;
if (!contentPost.Contains("鎴愬姛"))
{
- LogService.Write("绋庣巼鍚屾寮傚父,POST鏂瑰紡鑾峰彇缁撴灉," + billObj["Id"] + "," + contentPost);
+ LogService.Write("绋庣巼鍚屾寮傚父,POST鏂瑰紡鑾峰彇缁撴灉," + billObj["Id"] + "," + responsePost.ErrorMessage);
LogService.Write("绋庣巼鍚屾寮傚父,POST," + "Gy_TaxRate/SaveGy_TaxRateListApi");
LogService.Write("绋庣巼鍚屾寮傚父,JsonConvert.SerializeObject(_jsonRoot)," + JsonConvert.SerializeObject(_jsonRoot));
}
diff --git a/zymes/OperationService/zymes_RealessUnit.cs b/zymes/OperationService/zymes_RealessUnit.cs
index ec03407..823323c 100644
--- a/zymes/OperationService/zymes_RealessUnit.cs
+++ b/zymes/OperationService/zymes_RealessUnit.cs
@@ -45,13 +45,16 @@
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_RealessUnit {billObj["Id"]} ";
var id = billObj["Id"].ToString();
string sql =string.Empty;
sql = $@"
/*dialect*/
select a.FUNITID as HItemID,a.FUNITID as HERPItemID,a.FNumber as HNumber,l.FName as HName,a.FNumber as HShortNumber,0 as HParentID
-,1 as HLevel,'true' as HEndFlag,case when a.FFORBIDSTATUS='A' then 'false' else 'true' end as HStopflag,'CLD-ERP瀵煎叆' as HRemark,'鏈娴�' as HMakeTime,getdate() as HMakeTime,'true' as HStandard,a.FCREATEORGID as HCREATEORGID,a.FUSEORGID as HUSEORGID
+,1 as HLevel,'true' as HEndFlag,case when a.FFORBIDSTATUS='A' then 'false' else 'true' end as HStopflag,'CLD-ERP瀵煎叆' as HRemark,getdate() as HMakeTime,'true' as HStandard,a.FCREATEORGID as HCREATEORGID,a.FUSEORGID as HUSEORGID
from T_BD_UNIT a with(nolock)
inner join T_BD_UNIT_L l with(nolock) on a.FUNITID=l.FUNITID
Where a.FUNITID={id}
@@ -75,14 +78,15 @@
//LogService.Write("鍗曚綅鍚屾绀轰緥锛�" + JsonConvert.SerializeObject(_jsonRoot));
//LogService.Write("鍗曚綅鍚屾绀轰緥锛�" + _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://47.96.97.237/API/");
+ var client = new RestSharp.RestClient(" http://10.11.18.195:8080/simoerapi/");
var requestPost = new RestRequest("Gy_Unit/SaveGy_UnitListApi", Method.POST);
requestPost.AddParameter("application/json", JsonConvert.SerializeObject(_jsonRoot), ParameterType.RequestBody);
IRestResponse responsePost = client.Execute(requestPost);
var contentPost = responsePost.Content;
if (!contentPost.Contains("鎴愬姛"))
{
- LogService.Write("鍗曚綅鍚屾寮傚父,POST鏂瑰紡鑾峰彇缁撴灉," + billObj["Id"] + "," + contentPost);
+ LogService.Write("鍗曚綅鍚屾寮傚父,POST鏂瑰紡鑾峰彇缁撴灉," + billObj["Id"] + "," + responsePost.ErrorMessage);
LogService.Write("鍗曚綅鍚屾寮傚父,POST," + "Gy_Unit/SaveGy_UnitListApi");
LogService.Write("鍗曚綅鍚屾寮傚父,JsonConvert.SerializeObject(_jsonRoot)," + JsonConvert.SerializeObject(_jsonRoot));
}
diff --git a/zymes/OperationService/zymes_RealessWork.cs b/zymes/OperationService/zymes_RealessWork.cs
new file mode 100644
index 0000000..0918cef
--- /dev/null
+++ b/zymes/OperationService/zymes_RealessWork.cs
@@ -0,0 +1,115 @@
+锘縰sing System;
+using System.Collections.Generic;
+using Kingdee.BOS.Util;
+using Kingdee.BOS.Core.Metadata.EntityElement;
+using Kingdee.BOS.Core.DynamicForm.PlugIn;
+using Kingdee.BOS.Core.DynamicForm.PlugIn.Args;
+using Kingdee.BOS.Orm.DataEntity;
+using System.ComponentModel;
+using Kingdee.BOS.ServiceHelper;
+using System.Data;
+using Newtonsoft.Json.Linq;
+using ZD.Cloud.WebApi;
+using Newtonsoft.Json;
+using Kingdee.BOS.Core.DynamicForm;
+using System.Linq;
+using RestSharp;
+using zymes_Project.Utility;
+
+namespace zymes_Project.OperationService
+{
+ [Description("[浣滀笟-瀹℃牳]鏈嶅姟鎻掍欢]")]
+ [HotUpdate]
+ public class zymes_RealessWork : AbstractOperationServicePlugIn
+ {
+ Dictionary<string, string> dictionary = new Dictionary<string, string>();
+ public override void OnPrepareOperationServiceOption(OnPrepareOperationServiceEventArgs e)
+ {
+ base.OnPrepareOperationServiceOption(e);
+
+ //涓轰簡鍦˙eginOperationTransaction閲屾鏌ユ暟鎹姏鍑哄紓甯告椂
+ //鍙洖婊氬綋鍓嶅崟鎹殑浜嬪姟,杩欓噷璁剧疆涓轰笉鏀寔鎵归噺浜嬪姟,杩欐牱BOS浼�
+ //寰幆涓烘瘡涓�寮犲崟鎹垱寤轰簨鍔¤皟鐢ㄦ搷浣�
+ e.SupportTransaction = true;
+ e.SurportBatchTransaction = false;
+ }
+ public override void OnPreparePropertys(PreparePropertysEventArgs e)
+ {
+ base.OnPreparePropertys(e);
+ e.FieldKeys.Add("FEntity");
+ e.FieldKeys.Add("FEntity_FEntryID");
+ }
+ public override void AfterExecuteOperationTransaction(AfterExecuteOperationTransaction e)
+ {
+ base.AfterExecuteOperationTransaction(e);
+ 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_RealessWork {billObj["Id"]} ";
+ var id = billObj["Id"].ToString();
+ string sql =string.Empty;
+ sql = $@"
+/*dialect*/
+select a.FID as HItemID,a.FNUMBER as HNumber,l.FNAME as HName,'' as HHelpCode,a.FNUMBER as HShortNumber,0 as HParentID
+,1 as HLevel,'true' as HEndFlag,'false' as HStopflag,'CLD-ERP瀵煎叆' as HRemark,'' as HUseFlag,a.FUSEORGID as HUSEORGID
+,a.FCREATEORGID as HCREATEORGID,a.FWORKCENTERID as HWORKCENTERID
+from T_ENG_PROCESS a with(nolock)
+inner join T_ENG_PROCESS_L l with(nolock) on a.FID=l.FID and FLOCALEID=2052
+Where a.FID={id}
+";
+ DataTable dt = DBServiceHelper.ExecuteDataSet(Context, sql).Tables[0];
+ if (dt.Rows.Count == 0)
+ {
+ LogService.Write("浣滀笟鍚屾寮傚父锛�" + sql);
+ continue;
+ }
+ DataRow dr = dt.Rows[0];
+ JObject model = new JObject();
+ foreach (DataColumn column in dt.Columns)
+ {
+ model.Add(column.ColumnName, dr[column.ColumnName].ToString());
+ }
+ JObject _jsonRoot = new JObject()
+ {
+ ["model"] = model
+ };
+ //LogService.Write("浣滀笟鍚屾绀轰緥锛�" + JsonConvert.SerializeObject(_jsonRoot));
+ //LogService.Write("浣滀笟鍚屾绀轰緥锛�" + _jsonRoot);
+ //string clientUrl = Util.GetConfigKey(AppDomain.CurrentDomain.BaseDirectory + "/Config/kdapi.config", "ClientUrl");//K/3 Cloud 涓氬姟绔欑偣鍦板潃
+ var client = new RestSharp.RestClient(" http://10.11.18.195:8080/simoerapi/");
+ var requestPost = new RestRequest("Gy_Work/SaveGy_WorkListApi", Method.POST);
+ requestPost.AddParameter("application/json", JsonConvert.SerializeObject(_jsonRoot), ParameterType.RequestBody);
+ IRestResponse responsePost = client.Execute(requestPost);
+ var contentPost = responsePost.Content;
+ if (!contentPost.Contains("鎴愬姛"))
+ {
+ LogService.Write("浣滀笟鍚屾寮傚父,POST鏂瑰紡鑾峰彇缁撴灉," + billObj["Id"] + "," + responsePost.ErrorMessage);
+ LogService.Write("浣滀笟鍚屾寮傚父,POST," + "Gy_Work/SaveGy_WorkListApi");
+ LogService.Write("浣滀笟鍚屾寮傚父,JsonConvert.SerializeObject(_jsonRoot)," + JsonConvert.SerializeObject(_jsonRoot));
+ }
+ };
+
+ foreach (var item in dictionary)
+ {
+ ResultMessage.dataError(this.OperationResult.OperateResult, item.Key, item.Value);
+ }
+ }
+ public static class ResultMessage
+ {/// <summary>
+ /// 淇敼鎻愮ず淇℃伅
+ /// </summary>
+ /// <param name="operateResult"></param>
+ /// <param name="billno"></param>
+ public static void dataError(OperateResultCollection operateResult, string billno, string message)
+ {
+ OperateResult operate = operateResult.Where(n => n.Number == billno).First();
+ operate.Message = message;
+ operate.SuccessStatus = false;
+ operate.MessageType = MessageType.FatalError;
+ }
+ }
+ }
+}
diff --git a/zymes/test/Program.cs b/zymes/test/Program.cs
index 23a983d..82b3fdf 100644
--- a/zymes/test/Program.cs
+++ b/zymes/test/Program.cs
@@ -11,7 +11,9 @@
{
static void Main(string[] args)
{
- CustomDemo1();
+ //CustomDemo1();
+ Console.WriteLine(DateTime.Now);
+ Console.WriteLine(DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:fff:ffffff"));
Console.WriteLine(Convert.ToDecimal(1 / 10));
Console.WriteLine(1 % 10);
Console.WriteLine(1 % 10.0);
@@ -19,6 +21,7 @@
Console.WriteLine((double)61 / 111);
Console.WriteLine(Math.Round(((decimal)61 / 111), 2));
Console.WriteLine(Math.Round(((decimal)61 * 100 / 111), 2));
+ Console.Read();
}
private static void CustomDemo()
{
diff --git a/zymes/zymes_Project.csproj b/zymes/zymes_Project.csproj
index dc63553..b8bddbb 100644
--- a/zymes/zymes_Project.csproj
+++ b/zymes/zymes_Project.csproj
@@ -137,6 +137,7 @@
<Compile Include="OperationService\zymes_RealessPrdPpbom.cs" />
<Compile Include="OperationService\zymes_RealessBillType.cs" />
<Compile Include="OperationService\zymes_RealessMatePriceSup.cs" />
+ <Compile Include="OperationService\zymes_RealessSalSeOutStock.cs" />
<Compile Include="OperationService\zymes_RealessSettleStyle.cs" />
<Compile Include="OperationService\zymes_RealessRecCondition.cs" />
<Compile Include="OperationService\zymes_RealessStock.cs" />
@@ -146,6 +147,8 @@
<Compile Include="OperationService\zymes_RealessTaxRate.cs" />
<Compile Include="OperationService\zymes_RealessSupplier.cs" />
<Compile Include="OperationService\zymes_RealessStockStatus.cs" />
+ <Compile Include="OperationService\zymes_RealessStaff.cs" />
+ <Compile Include="OperationService\zymes_RealessWork.cs" />
<Compile Include="OperationService\zymes_RealessUnit.cs" />
<Compile Include="OperationService\zymes_RealessPrdMo.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
--
Gitblit v1.9.1