From d06646be7c7dbc7be3a05a9be14e15fcced2bc2c Mon Sep 17 00:00:00 2001
From: zrg <z1873@LAPTOP-EAVL132E>
Date: 星期一, 22 九月 2025 17:10:59 +0800
Subject: [PATCH] 优化同步插件
---
zymes/OperationService/zymes_RealessCustomer.cs | 49 +-
zymes/OperationService/zymes_RealessPurReceive.cs | 63 +-
zymes/OperationService/zymes_RealessSettleStyle.cs | 28
zymes/Config/kdapi.config | 2
zymes/OperationService/zymes_RealessPrdMoReport.cs | 58 +-
zymes/OperationService/zymes_RealessWork.cs | 22
zymes/zymes_Project.csproj | 14
zymes/OperationService/zymes_RealessStock.cs | 55 +-
zymes/OperationService/zymes_RealessCurrency.cs | 21
zymes/OperationService/zymes_RealessMaterial.cs | 85 +--
zymes/OperationService/zymes_MOCHANGE.cs | 3
zymes/OperationService/zymes_RealessStaff.cs | 24
zymes/OperationService/zymes_RealessRecCondition.cs | 22
zymes/OperationService/zymes_RealessSalOrder.cs | 84 ++--
zymes/OperationService/zymes_RealessPrdPpbom.cs | 51 +-
zymes/OperationService/zymes_RealessRateType.cs | 24
zymes/OperationService/zymes_RealessSupplier.cs | 21
zymes/OperationService/zymes_RealessMatePriceSup.cs | 24
zymes/OperationService/zymes_RealessUnit.cs | 33 -
zymes/OperationService/zymes_RealessSalSeOutStock.cs | 92 ++--
zymes/OperationService/zymes_RealessTaxMIX.cs | 48 +
zymes/OperationService/zymes_RealessDepartment.cs | 23
zymes/OperationService/zymes_RealessStockStatus.cs | 27
zymes/OperationService/zymes_RealessPrdMo.cs | 105 ++--
zymes/OperationService/zymes_RealessPurPoorder.cs | 67 +-
zymes/OperationService/zymes_RealessTaxRate.cs | 26
zymes/OperationService/zymes_RealessBillType.cs | 25
zymes/LogService.cs | 11
zymes/OperationService/zymes_RealessBom.cs | 39
zymes/zymes_Project.csproj.user | 2
zymes/OperationService/zymes_RealessPaymentCondition.cs | 24
zymes/OperationService/zymes_RealessOperator.cs | 32
32 files changed, 571 insertions(+), 633 deletions(-)
diff --git a/zymes/Config/kdapi.config b/zymes/Config/kdapi.config
index 6c273ec..0ffb5e8 100644
--- a/zymes/Config/kdapi.config
+++ b/zymes/Config/kdapi.config
@@ -7,6 +7,6 @@
<add key="KDApiUrl" value=""></add>
<add key="DataBaseName" value=""></add>
<add key="ClientUrl" value=""></add>
- <add key="HOrganNumber" value="9010"></add>
+ <add key="HOrganNumber" value="9010,9011"></add>
</appSettings>
</configuration>
\ No newline at end of file
diff --git a/zymes/LogService.cs b/zymes/LogService.cs
index 2a3010f..49244c1 100644
--- a/zymes/LogService.cs
+++ b/zymes/LogService.cs
@@ -26,7 +26,7 @@
Task.Run(() =>
{
Write(obj, $@"{filePath}\{typeof(T).Name}", isAppend);
- });
+ });
}
#region 鏃ュ織
@@ -78,16 +78,15 @@
if (HOrganNumber.Contains(FNUMBER))
{
sql = $@"
-/*dialect*/
-select F_RCZU_MesIp ,FISNEEDPUSH from T_ORG_Organizations
-where FNUMBER ='{FNUMBER}'";
+ /*dialect*/
+ select F_RCZU_MesIp ,FISNEEDPUSH from T_ORG_Organizations where FNUMBER ='{FNUMBER}'";
}
- else
+ else
{
sql = $@"select 0 as F_RCZU_MesIp, 0 as FISNEEDPUSH";
}
-
+
DataTable dt = DBServiceHelper.ExecuteDataSet(Context, sql).Tables[0];
LogService.Write("鏌ヨ璇彞:" + sql);
diff --git a/zymes/OperationService/zymes_MOCHANGE.cs b/zymes/OperationService/zymes_MOCHANGE.cs
index dc59f59..be2d83d 100644
--- a/zymes/OperationService/zymes_MOCHANGE.cs
+++ b/zymes/OperationService/zymes_MOCHANGE.cs
@@ -46,8 +46,7 @@
foreach (var billObj in e.DataEntitys)
{
var forgName = Context.CurrentOrganizationInfo.Name;
- //if (!forgName.Contains("鏉窞鏂帿灏旂鎬ф潗鏂欐湁闄愬叕鍙�"))
- // continue;
+
var id = billObj["Id"].ToString();
var sqls= string.Empty;
diff --git a/zymes/OperationService/zymes_RealessBillType.cs b/zymes/OperationService/zymes_RealessBillType.cs
index 6556fb5..c6f6f97 100644
--- a/zymes/OperationService/zymes_RealessBillType.cs
+++ b/zymes/OperationService/zymes_RealessBillType.cs
@@ -45,20 +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_RealessBillType '{billObj["Id"]}' ";
var id = billObj["Id"].ToString();
string sql = string.Empty;
sql = $@"
-/*dialect*/
-select a.FBILLTYPEID as HBilltypeID,a.FNumber as HNumber,l.FName as HName,'' as HTemplate,'' HHeadTable,
-'' HEntryTable,'' HViewName,'' HRightName
-from T_BAS_BILLTYPE a with(nolock)
-inner join T_BAS_BILLTYPE_L l with(nolock) on a.FBILLTYPEID=l.FBILLTYPEID and FLOCALEID=2052
-Where a.FBILLTYPEID='{id}'
-";
+ /*dialect*/
+ select a.FBILLTYPEID as HBilltypeID,a.FNumber as HNumber,l.FName as HName,'' as HTemplate,'' HHeadTable,
+ '' HEntryTable,'' HViewName,'' HRightName
+ from T_BAS_BILLTYPE a with(nolock)
+ inner join T_BAS_BILLTYPE_L l with(nolock) on a.FBILLTYPEID=l.FBILLTYPEID and FLOCALEID=2052
+ Where a.FBILLTYPEID='{id}'
+ ";
DataTable dt = DBServiceHelper.ExecuteDataSet(Context, sql).Tables[0];
if (dt.Rows.Count == 0)
@@ -92,18 +88,15 @@
{
["model"] = model
};
- //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);
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"] + "," + responsePost.ErrorMessage);
- LogService.Write("鍗曟嵁绫诲瀷鍚屾寮傚父,POST," + "Xt_BillType/SaveXt_BillTypeListApi");
+ 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 7eec908..29ddebb 100644
--- a/zymes/OperationService/zymes_RealessBom.cs
+++ b/zymes/OperationService/zymes_RealessBom.cs
@@ -192,25 +192,25 @@
var id = billObj["Id"].ToString();
string sql = string.Empty;
sql = $@"
-/*dialect*/
-select a.FID AS HInterID,a.FENTRYID as HENTRYID,a.FMATERIALID as HMaterID,'' HRemark2
-,0 HQty,a.FUNITID as HUnitID,'' HRemark3,0 HRelQty,a.FSCRAPRATE HWasteRate
-,a.FOPERID HProcID,a.FSTOCKID HWHID,'' HRemark4,a.FMATERIALTYPE HChildType
-,'' HCloseMan,'false' HCloseType,'CLOUD瀵煎叆' HRemark
-,0 HSourceInterID,0 HSourceEntryID,'' HSourceBillNo,0 HSourceBillType,0 HRelationQty,0 HRelationMoney
-from T_ENG_BOMCHILD a with(nolock)
-inner join T_ENG_BOMCHILD_A aa with(nolock) on a.FENTRYID=aa.FENTRYID
-Where a.FID={id}
+ /*dialect*/
+ select a.FID AS HInterID,a.FENTRYID as HENTRYID,a.FMATERIALID as HMaterID,'' HRemark2
+ ,0 HQty,a.FUNITID as HUnitID,'' HRemark3,0 HRelQty,a.FSCRAPRATE HWasteRate
+ ,a.FOPERID HProcID,a.FSTOCKID HWHID,'' HRemark4,a.FMATERIALTYPE HChildType
+ ,'' HCloseMan,'false' HCloseType,'CLOUD瀵煎叆' HRemark
+ ,0 HSourceInterID,0 HSourceEntryID,'' HSourceBillNo,0 HSourceBillType,0 HRelationQty,0 HRelationMoney
+ from T_ENG_BOMCHILD a with(nolock)
+ inner join T_ENG_BOMCHILD_A aa with(nolock) on a.FENTRYID=aa.FENTRYID
+ Where a.FID={id}
-select
- '3302' HBillType,a.FID HInterID,'' HBillNo,a.FCREATEDATE HDate
- ,YEAR(GETDATE()) HYear,MONTH(GETDATE()) HPeriod,'CLOUD瀵煎叆' HRemark,a.FCREATORID HMaker,getdate() HMakeDate,0 as HMaterTypeID ,a.FDOCUMENTSTATUS HStatus
-,a.FMATERIALID HMaterID,0 HParentID,a.FNUMBER HVersion,'' HPicNo,0 HPropertyID
-,a.FUNITID HUnitID,0 HQty,a.FYIELDRATE HProdRate,'' HJump,o.FNUMBER as HOrganNumber
-from T_ENG_BOM a with(nolock)
-left join T_ORG_Organizations o with(nolock) on a.FUSEORGID=o.FORGID
-Where a.FID={id}
-";
+ select
+ '3302' HBillType,a.FID HInterID,'' HBillNo,a.FCREATEDATE HDate
+ ,YEAR(GETDATE()) HYear,MONTH(GETDATE()) HPeriod,'CLOUD瀵煎叆' HRemark,a.FCREATORID HMaker,getdate() HMakeDate,0 as HMaterTypeID ,a.FDOCUMENTSTATUS HStatus
+ ,a.FMATERIALID HMaterID,0 HParentID,a.FNUMBER HVersion,'' HPicNo,0 HPropertyID
+ ,a.FUNITID HUnitID,0 HQty,a.FYIELDRATE HProdRate,'' HJump,o.FNUMBER as HOrganNumber
+ from T_ENG_BOM a with(nolock)
+ left join T_ORG_Organizations o with(nolock) on a.FUSEORGID=o.FORGID
+ Where a.FID={id}
+ ";
DataSet ds = DBServiceHelper.ExecuteDataSet(Context, sql);
DataTable maindt = ds.Tables[1];
DataTable subdt = ds.Tables[0];
@@ -251,8 +251,7 @@
{
["model"] = model
};
- //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);
//鏂板
var requestPost = new RestRequest("Gy_ICBomBill/Gy_ICBomBillaveApi", Method.POST);
diff --git a/zymes/OperationService/zymes_RealessCurrency.cs b/zymes/OperationService/zymes_RealessCurrency.cs
index d93fc59..8aca2c4 100644
--- a/zymes/OperationService/zymes_RealessCurrency.cs
+++ b/zymes/OperationService/zymes_RealessCurrency.cs
@@ -52,14 +52,14 @@
var id = billObj["Id"].ToString();
string sql = string.Empty;
sql = $@"
-/*dialect*/
-select a.FCURRENCYID as HItemID,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
-,'' HHelpCode,FAMOUNTDIGITS as HScale,0 as HExchangeRate
-from T_BD_CURRENCY a with(nolock)
-inner join T_BD_CURRENCY_L l with(nolock) on a.FCURRENCYID=l.FCURRENCYID and FLOCALEID=2052
-Where a.FCURRENCYID={id}
-";
+ /*dialect*/
+ select a.FCURRENCYID as HItemID,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
+ ,'' HHelpCode,FAMOUNTDIGITS as HScale,0 as HExchangeRate
+ from T_BD_CURRENCY a with(nolock)
+ 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)
{
@@ -90,9 +90,8 @@
{
["model"] = model
};
- //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);
var requestPost = new RestRequest("Gy_Currency/SaveGy_CurrencyListApi", Method.POST);
requestPost.AddParameter("application/json", JsonConvert.SerializeObject(_jsonRoot), ParameterType.RequestBody);
diff --git a/zymes/OperationService/zymes_RealessCustomer.cs b/zymes/OperationService/zymes_RealessCustomer.cs
index 3b02b82..dec322c 100644
--- a/zymes/OperationService/zymes_RealessCustomer.cs
+++ b/zymes/OperationService/zymes_RealessCustomer.cs
@@ -52,31 +52,31 @@
var id = billObj["Id"].ToString();
string sql = string.Empty;
sql = $@"
-/*dialect*/
-select a.FCUSTID as HItemID,a.FCUSTID as HERPItemID,a.FNUMBER as HNumber,l.FNAME as HName,a.FNUMBER as HShortNumber,0 as HParentID
-,1 as HLevel,1 as HEndFlag,case when a.FFORBIDSTATUS='A' then 0 else 1 end as HStopflag,'CLD-ERP瀵煎叆' as HRemark
-,'宸蹭娇鐢�' as HUseFlag,getdate() as HMakeTime,FCREATEORGID as HCREATEORGID,FUSEORGID as HUSEORGID,o.FNUMBER as HOrganNumber
-from T_BD_CUSTOMER a with(nolock)
-inner join T_BD_CUSTOMER_L l with(nolock) on a.FCUSTID=l.FCUSTID
-left join T_ORG_Organizations o with(nolock) on a.FUSEORGID=o.FORGID
-Where a.FCUSTID = {id}
+ /*dialect*/
+ select a.FCUSTID as HItemID,a.FCUSTID as HERPItemID,a.FNUMBER as HNumber,l.FNAME as HName,a.FNUMBER as HShortNumber,0 as HParentID
+ ,1 as HLevel,1 as HEndFlag,case when a.FFORBIDSTATUS='A' then 0 else 1 end as HStopflag,'CLD-ERP瀵煎叆' as HRemark
+ ,'宸蹭娇鐢�' as HUseFlag,getdate() as HMakeTime,FCREATEORGID as HCREATEORGID,FUSEORGID as HUSEORGID,o.FNUMBER as HOrganNumber
+ from T_BD_CUSTOMER a with(nolock)
+ inner join T_BD_CUSTOMER_L l with(nolock) on a.FCUSTID=l.FCUSTID
+ left join T_ORG_Organizations o with(nolock) on a.FUSEORGID=o.FORGID
+ Where a.FCUSTID = {id}
-select a.FCUSTID as HItemID,a.FENTRYID as HEntryID,a.FNumber as HNumber,a.FName as HName,a.FNumber as HShortNumber,0 as HParentID
-,1 as HLevel,'true' as HEndFlag,case when a.FLOCATIONSTATUS='A' then 'false' else 'true' end as HStopflag,'CLD-ERP瀵煎叆' as HRemark,'' HHelpCode,'鏈娴�' as HUseFlag,getdate() as HMakeTime
-,'' HMakeEmp,'' HCheckEmp,getdate() as HCheckTime,'' HModifyEmp,getdate() HModifyTime,'' HStopEmp,0 as HUSEORGID,0 as HCREATEORGID
-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.FCUSTID as HItemID,a.FENTRYID as HEntryID,a.FNumber as HNumber,a.FName as HName,a.FNumber as HShortNumber,0 as HParentID
+ ,1 as HLevel,'true' as HEndFlag,case when a.FLOCATIONSTATUS='A' then 'false' else 'true' end as HStopflag,'CLD-ERP瀵煎叆' as HRemark,'' HHelpCode,'鏈娴�' as HUseFlag,getdate() as HMakeTime
+ ,'' HMakeEmp,'' HCheckEmp,getdate() as HCheckTime,'' HModifyEmp,getdate() HModifyTime,'' HStopEmp,0 as HUSEORGID,0 as HCREATEORGID
+ 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}
-";
+ 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];//瀹㈡埛_浜よ揣鍦扮偣
@@ -130,8 +130,7 @@
{
["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);
var requestPost = new RestRequest("Gy_Customer/SaveGy_CustomerListApi", Method.POST);
requestPost.AddParameter("application/json", JsonConvert.SerializeObject(jsonRoot), ParameterType.RequestBody);
diff --git a/zymes/OperationService/zymes_RealessDepartment.cs b/zymes/OperationService/zymes_RealessDepartment.cs
index dc6acc8..ffe3aaa 100644
--- a/zymes/OperationService/zymes_RealessDepartment.cs
+++ b/zymes/OperationService/zymes_RealessDepartment.cs
@@ -52,16 +52,16 @@
var id = billObj["Id"].ToString();
string sql = string.Empty;
sql = $@"
-/*dialect*/
-select a.FDEPTID AS HItemID,a.FDEPTID 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 HUseFlag,getdate() AS HMakeTime,a.FCREATEORGID AS HCREATEORGID,a.FUSEORGID AS HUSEORGID
-,o.FNUMBER as HOrganNumber
-from T_BD_DEPARTMENT a with(nolock)
-inner join T_BD_DEPARTMENT_L l with(nolock) on a.FDEPTID=l.FDEPTID
-left join T_ORG_Organizations o with(nolock) on a.FUSEORGID=o.FORGID
-Where a.FDEPTID ={id}
-";
+ /*dialect*/
+ select a.FDEPTID AS HItemID,a.FDEPTID 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 HUseFlag,getdate() AS HMakeTime,a.FCREATEORGID AS HCREATEORGID,a.FUSEORGID AS HUSEORGID
+ ,o.FNUMBER as HOrganNumber
+ from T_BD_DEPARTMENT a with(nolock)
+ inner join T_BD_DEPARTMENT_L l with(nolock) on a.FDEPTID=l.FDEPTID
+ left join T_ORG_Organizations o with(nolock) on a.FUSEORGID=o.FORGID
+ Where a.FDEPTID ={id}
+ ";
DataTable dt = DBServiceHelper.ExecuteDataSet(Context, sql).Tables[0];
if (dt.Rows.Count == 0)
{
@@ -89,8 +89,7 @@
{
["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);
var requestPost = new RestRequest("Gy_Department/SaveGy_DepartmentListApi", Method.POST);
requestPost.AddParameter("application/json", JsonConvert.SerializeObject(_jsonRoot), ParameterType.RequestBody);
diff --git a/zymes/OperationService/zymes_RealessMatePriceSup.cs b/zymes/OperationService/zymes_RealessMatePriceSup.cs
index 7b28559..6ed07d8 100644
--- a/zymes/OperationService/zymes_RealessMatePriceSup.cs
+++ b/zymes/OperationService/zymes_RealessMatePriceSup.cs
@@ -52,16 +52,16 @@
var id = billObj["Id"].ToString();
string sql = string.Empty;
sql = $@"
-/*dialect*/
-select a.FID as HItemID,0 as HInterID,a.FNUMBER as HNumber,0 as HEntryID,0 as HMaterID,0 as HRelationID
-,0 as HUnitID,0 as HBeginQty,0 as HEndQty,0 as HCurID,'' as HType,0 as HPrice,a.FEFFECTIVEDATE as HBeginDate
-,a.FEXPIRYDATE as HEndDate,0 as HUsed,'' as HRemark,'' as HMaker,a.FCREATEDATE as HMakeDate
-,o.FNUMBER as HOrganNumber
-from T_PUR_PRICELIST a with(nolock)
-inner join T_PUR_PRICELIST_L l with(nolock) on a.FID=l.FID and FLOCALEID=2052
-left join T_ORG_Organizations o with(nolock) on a.FUSEORGID=o.FORGID
-Where a.FID={id}
-";
+ /*dialect*/
+ select a.FID as HItemID,0 as HInterID,a.FNUMBER as HNumber,0 as HEntryID,0 as HMaterID,0 as HRelationID
+ ,0 as HUnitID,0 as HBeginQty,0 as HEndQty,0 as HCurID,'' as HType,0 as HPrice,a.FEFFECTIVEDATE as HBeginDate
+ ,a.FEXPIRYDATE as HEndDate,0 as HUsed,'' as HRemark,'' as HMaker,a.FCREATEDATE as HMakeDate
+ ,o.FNUMBER as HOrganNumber
+ from T_PUR_PRICELIST a with(nolock)
+ inner join T_PUR_PRICELIST_L l with(nolock) on a.FID=l.FID and FLOCALEID=2052
+ left join T_ORG_Organizations o with(nolock) on a.FUSEORGID=o.FORGID
+ Where a.FID={id}
+ ";
DataTable dt = DBServiceHelper.ExecuteDataSet(Context, sql).Tables[0];
if (dt.Rows.Count == 0)
@@ -90,9 +90,7 @@
{
["model"] = model
};
- //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);
var requestPost = new RestRequest("Gy_MatePriceSup/SaveGy_MatePriceSupListApi", Method.POST);
requestPost.AddParameter("application/json", JsonConvert.SerializeObject(_jsonRoot), ParameterType.RequestBody);
diff --git a/zymes/OperationService/zymes_RealessMaterial.cs b/zymes/OperationService/zymes_RealessMaterial.cs
index e45b934..3b68957 100644
--- a/zymes/OperationService/zymes_RealessMaterial.cs
+++ b/zymes/OperationService/zymes_RealessMaterial.cs
@@ -186,43 +186,38 @@
try
{
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"]} ";
+ {
+ LogService.Write("鐗╂枡鍚屾鎻掍欢鎵ц寮�濮嬶細" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:fff:ffffff"));
+
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
-,b.FLENGTH as HLength,b.FWIDTH as HWidth,b.FHEIGHT as HHeight,b.FNETWEIGHT as HJQty,b.FGROSSWEIGHT as HMQty,a.FOLDNUMBER as HOldMaterNumber
-,s.FSTOCKID as HWHID,s.FSTOCKPLACEID as HSPID,p.FPLANMODE HPlanMode,'鏈楠�' as HUseFlag,getdate() as HMakeTime,0 as HMinPickQty
-,a.FCREATEORGID as HCREATEORGID,a.FUSEORGID as HUSEORGID,case when isnull(s.FISBATCHMANAGE,0)='1' then 1 else 0 end as HBatchManager
-,case when isnull(ap.FISENABLE,0)='1' then 1 else 0 end as HAuxPropFlag,isnull(s.FAUXUNITID,0) as HAuxUnitID,isnull(s.FSNUNIT,0) as HSNUnitID
-,case when isnull(s.FISKFPERIOD,0)='1' then 1 else 0 end as HISKFPERIOD
-,b.FERPCLSID as HMaterTypeID,o.FNUMBER as HOrganNumber
-,case when isnull(q.FCHECKINCOMING,0)='1' then 1 else 0 end as HCHECKINCOMING,isnull(s.FEXPUNIT,'') as HEXPUNIT,isnull(s.FEXPPERIOD,0) as HEXPPERIOD
-,isnull(b.FBASEUNITID,0) as HBASEUNITID,isnull(ms.FSALEUNITID,0) as HSALEUNITID,isnull(ms.FSALEPRICEUNITID,0) HSALEPRICEUNITID
-,isnull(mp.FPERUNITSTANDHOUR,0) as HPERUNITSTANDHOUR,isnull(mp.FSTDLABORPREPARETIME,0) as HSTDLABORPREPARETIME,isnull(mp.FSTDMACHINEPREPARETIME,0) as HSTDMACHINEPREPARETIME
-,isnull(a.FMASTERID,0) as HMASTERID
- from T_BD_MATERIAL a with(nolock)
-inner join T_BD_MATERIAL_L l with(nolock) on a.FMATERIALID=l.FMATERIALID
-inner join T_BD_MATERIALBASE b with(nolock) on a.FMATERIALID=b.FMATERIALID
-inner join T_BD_MATERIALSTOCK s with(nolock) on a.FMATERIALID=s.FMATERIALID
-inner join T_BD_MATERIALPLAN p with(nolock) on a.FMATERIALID=p.FMATERIALID
-left join (select max(FISENABLE) FISENABLE,FMATERIALID from T_BD_MATERIALAUXPTY with(nolock)
- group by FISENABLE,FMATERIALID) ap on a.FMATERIALID=ap.FMATERIALID
-left join T_BD_MATERIALQUALITY q with(nolock) on a.FMATERIALID=q.FMATERIALID
-left join t_BD_MaterialSale ms with(nolock) on a.FMATERIALID=ms.FMATERIALID
-left join t_BD_MaterialProduce mp with(nolock) on a.FMATERIALID=mp.FMATERIALID
- left join T_ORG_Organizations o with(nolock) on a.FUseOrgId=o.FORGID
-Where l.FLOCALEID=2052
-and a.FMATERIALID = {id}
+ /*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
+ ,b.FLENGTH as HLength,b.FWIDTH as HWidth,b.FHEIGHT as HHeight,b.FNETWEIGHT as HJQty,b.FGROSSWEIGHT as HMQty,a.FOLDNUMBER as HOldMaterNumber
+ ,s.FSTOCKID as HWHID,s.FSTOCKPLACEID as HSPID,p.FPLANMODE HPlanMode,'鏈楠�' as HUseFlag,getdate() as HMakeTime,0 as HMinPickQty
+ ,a.FCREATEORGID as HCREATEORGID,a.FUSEORGID as HUSEORGID,case when isnull(s.FISBATCHMANAGE,0)='1' then 1 else 0 end as HBatchManager
+ ,case when isnull(ap.FISENABLE,0)='1' then 1 else 0 end as HAuxPropFlag,isnull(s.FAUXUNITID,0) as HAuxUnitID,isnull(s.FSNUNIT,0) as HSNUnitID
+ ,case when isnull(s.FISKFPERIOD,0)='1' then 1 else 0 end as HISKFPERIOD
+ ,b.FERPCLSID as HMaterTypeID,o.FNUMBER as HOrganNumber
+ ,case when isnull(q.FCHECKINCOMING,0)='1' then 1 else 0 end as HCHECKINCOMING,isnull(s.FEXPUNIT,'') as HEXPUNIT,isnull(s.FEXPPERIOD,0) as HEXPPERIOD
+ ,isnull(b.FBASEUNITID,0) as HBASEUNITID,isnull(ms.FSALEUNITID,0) as HSALEUNITID,isnull(ms.FSALEPRICEUNITID,0) HSALEPRICEUNITID
+ ,isnull(mp.FPERUNITSTANDHOUR,0) as HPERUNITSTANDHOUR,isnull(mp.FSTDLABORPREPARETIME,0) as HSTDLABORPREPARETIME,isnull(mp.FSTDMACHINEPREPARETIME,0) as HSTDMACHINEPREPARETIME
+ ,isnull(a.FMASTERID,0) as HMASTERID
+ from T_BD_MATERIAL a with(nolock)
+ inner join T_BD_MATERIAL_L l with(nolock) on a.FMATERIALID=l.FMATERIALID
+ inner join T_BD_MATERIALBASE b with(nolock) on a.FMATERIALID=b.FMATERIALID
+ inner join T_BD_MATERIALSTOCK s with(nolock) on a.FMATERIALID=s.FMATERIALID
+ inner join T_BD_MATERIALPLAN p with(nolock) on a.FMATERIALID=p.FMATERIALID
+ left join (select max(FISENABLE) FISENABLE,FMATERIALID from T_BD_MATERIALAUXPTY with(nolock)
+ group by FISENABLE,FMATERIALID) ap on a.FMATERIALID=ap.FMATERIALID
+ left join T_BD_MATERIALQUALITY q with(nolock) on a.FMATERIALID=q.FMATERIALID
+ left join t_BD_MaterialSale ms with(nolock) on a.FMATERIALID=ms.FMATERIALID
+ left join t_BD_MaterialProduce mp with(nolock) on a.FMATERIALID=mp.FMATERIALID
+ left join T_ORG_Organizations o with(nolock) on a.FUseOrgId=o.FORGID
+ Where l.FLOCALEID=2052
+ and a.FMATERIALID = {id}
";
DataTable dt = DBServiceHelper.ExecuteDataSet(Context, sql).Tables[0];
if (dt.Rows.Count == 0)
@@ -252,11 +247,9 @@
{
["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);
- //var client = new RestSharp.RestClient(" http://10.11.18.195:8080/simoerapi/");
+ LogService.Write("鐗╂枡鍚屾鎻掍欢,JSON鎷兼帴瀹屾垚锛�" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:fff:ffffff"));
+
+ var client = new RestSharp.RestClient(http);
//鍒犻櫎
//var requestGet = new RestRequest("Gy_Material/Delete", Method.GET);
//requestGet.AddParameter("HItemID", dr["HERPItemID"].ToString());
@@ -265,11 +258,11 @@
//var contentGet = response.Content;
//Console.WriteLine("GET鏂瑰紡鑾峰彇缁撴灉锛�" + contentGet);
//鏂板
- //LogService.Write("鐗╂枡鍚屾绀轰緥锛�"+ JsonConvert.SerializeObject(_jsonRoot));
+ 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"));
+ LogService.Write("鐗╂枡鍚屾鎻掍欢,post瀹屾垚锛�" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:fff:ffffff"));
var contentPost = responsePost.Content;
if (!contentPost.Contains("鎴愬姛"))
{
@@ -282,20 +275,14 @@
//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();
+ }
};
}
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);
- //}
+ LogService.Write("鐗╂枡鍚屾鎻掍欢,浠ｇ爜鎵ц瀹屾垚锛�" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:fff:ffffff"));
}
public static class ResultMessage
{/// <summary>
diff --git a/zymes/OperationService/zymes_RealessOperator.cs b/zymes/OperationService/zymes_RealessOperator.cs
index 76f04c2..563f646 100644
--- a/zymes/OperationService/zymes_RealessOperator.cs
+++ b/zymes/OperationService/zymes_RealessOperator.cs
@@ -52,17 +52,17 @@
var id = billObj["Id"].ToString();
string sql =string.Empty;
sql = $@"
-/*dialect*/
-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
-,a.FOPERATORID as HOperatorId,a.FOPERATORTYPE as HOperatorType,a.FSEQ as HSEQ,a.FSTAFFID as HStaffId,a.FISUSE as HIsUse,o.FNUMBER as HOrganNumber
-from T_BD_OPERATOR a1 with(nolock)
-inner join T_BD_OPERATORENTRY a with(nolock) on a.FOPERATORID=a1.FOPERATORID
-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
-left join T_ORG_Organizations o with(nolock) on a.FBIZORGID=o.FORGID
-Where a.FOPERATORID={id}
-";
+ /*dialect*/
+ 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
+ ,a.FOPERATORID as HOperatorId,a.FOPERATORTYPE as HOperatorType,a.FSEQ as HSEQ,a.FSTAFFID as HStaffId,a.FISUSE as HIsUse,o.FNUMBER as HOrganNumber
+ from T_BD_OPERATOR a1 with(nolock)
+ inner join T_BD_OPERATORENTRY a with(nolock) on a.FOPERATORID=a1.FOPERATORID
+ 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
+ left join T_ORG_Organizations o with(nolock) on a.FBIZORGID=o.FORGID
+ Where a.FOPERATORID={id}
+ ";
DataTable dt = DBServiceHelper.ExecuteDataSet(Context, sql).Tables[0];
if (dt.Rows.Count == 0)
{
@@ -80,7 +80,6 @@
string http = dataTable.Rows[0]["F_RCZU_MesIp"].ToString();
- //DataRow dr = dt.Rows[0];
JArray array = new JArray();
foreach(DataRow dr in dt.Rows)
{
@@ -93,17 +92,12 @@
}
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);
- //string clientUrl = Util.GetConfigKey(AppDomain.CurrentDomain.BaseDirectory + "/Config/kdapi.config", "ClientUrl");//K/3 Cloud 涓氬姟绔欑偣鍦板潃
+
var client = new RestSharp.RestClient(http);
var requestPost = new RestRequest("Gy_Operator/SaveGy_OperatorListApi", Method.POST);
requestPost.AddParameter("application/json", JsonConvert.SerializeObject(_jsonRoot), ParameterType.RequestBody);
diff --git a/zymes/OperationService/zymes_RealessPaymentCondition.cs b/zymes/OperationService/zymes_RealessPaymentCondition.cs
index b5ca934..edeac6c 100644
--- a/zymes/OperationService/zymes_RealessPaymentCondition.cs
+++ b/zymes/OperationService/zymes_RealessPaymentCondition.cs
@@ -51,16 +51,16 @@
var id = billObj["Id"].ToString();
string sql = string.Empty;
sql = $@"
-/*dialect*/
-select a.FID as HItemID,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
-,'' HHelpCode,'鏈娴�' as HUseFlag,a.FCREATEDATE as HMakeTime
-,'' HMakeEmp,'' HCheckEmp,a.FAUDITDATE HCheckTime,'' HModifyEmp,a.FMODIFYDATE HModifyTime,'' HStopEmp,a.FUSEORGID as HUSEORGID,a.FCREATEORGID as HCREATEORGID
-,o.FNUMBER as HOrganNumber
-from T_BD_PaymentCondition a with(nolock)
-inner join T_BD_PAYMENTCONDITION_L l with(nolock) on a.FID=l.FID and FLOCALEID=2052
-left join T_ORG_Organizations o with(nolock) on a.FUSEORGID=o.FORGID
-Where a.FID='{id}'";
+ /*dialect*/
+ select a.FID as HItemID,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
+ ,'' HHelpCode,'鏈娴�' as HUseFlag,a.FCREATEDATE as HMakeTime
+ ,'' HMakeEmp,'' HCheckEmp,a.FAUDITDATE HCheckTime,'' HModifyEmp,a.FMODIFYDATE HModifyTime,'' HStopEmp,a.FUSEORGID as HUSEORGID,a.FCREATEORGID as HCREATEORGID
+ ,o.FNUMBER as HOrganNumber
+ from T_BD_PaymentCondition a with(nolock)
+ inner join T_BD_PAYMENTCONDITION_L l with(nolock) on a.FID=l.FID and FLOCALEID=2052
+ left join T_ORG_Organizations o with(nolock) on a.FUSEORGID=o.FORGID
+ Where a.FID='{id}'";
DataTable dt = DBServiceHelper.ExecuteDataSet(Context, sql).Tables[0];
if (dt.Rows.Count == 0)
@@ -92,9 +92,7 @@
{
["model"] = model
};
- //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);
var requestPost = new RestRequest("Gy_PaymentCondition/SaveGy_PaymentConditionListApi", Method.POST);
requestPost.AddParameter("application/json", JsonConvert.SerializeObject(_jsonRoot), ParameterType.RequestBody);
diff --git a/zymes/OperationService/zymes_RealessPrdMo.cs b/zymes/OperationService/zymes_RealessPrdMo.cs
index e7e611b..8383e61 100644
--- a/zymes/OperationService/zymes_RealessPrdMo.cs
+++ b/zymes/OperationService/zymes_RealessPrdMo.cs
@@ -192,57 +192,57 @@
var id = billObj["Id"].ToString();
string sql = string.Empty;
sql = $@"
-/*dialect*/
-select a.FID AS HInterID,a.FENTRYID as HENTRYID,a.FSEQ as HSEQ,a.FQTY as HQty,a.FQTY as HQTYMUST,aa.FSTOCKINQUASELAUXQTY as HRelationQty,0 as HRelationMoney,a.FPLANSTARTDATE as HPlanBeginDate,a.FPLANFINISHDATE as HPlanEndDate
-,a.FPLANSTARTDATE as HBeginDate,a.FPLANFINISHDATE as HEndDate,a.FMATERIALID as HMaterID,a.FUNITID as HUnitID,a.FSTOCKID as HWHID,isnull(a.FSTOCKLOCID,0) as HSPID,0 as HPROCID,isnull(a.FWORKSHOPID,0) as HDEPTID,a.FBOMID as HBomID,a.FLOT_TEXT as HBatchNo,'CLOUD瀵煎叆' as HRemark
-,a.FSRCBILLID as HSourceInterID,a.FSRCBILLENTRYID as HSourceEntryID,a.FSRCBILLNO as HSourceBillNo,a.FSRCBILLTYPE as HSourceBillType,a.FSALEORDERID as HSeOrderInterID,a.FSALEORDERENTRYID as HSeOrderEntryID,a.FSALEORDERNO as HSeOrderBillNo
-,FSTOCKINORGID as HSTOCKINORGID,FINSTOCKOWNERID as HINSTOCKOWNERID,FINSTOCKOWNERTYPEID as HINSTOCKOWNERTYPEID,FREQUESTORGID as HREQUESTORGID
-,0 as HPlanMode,a.FMTONO as HMTONo,a.FID as HERPInterID,a.FENTRYID as HERPEntryID,aa.FSTATUS as HSTATUS
-,isnull(orm.FCUSTID,0) as HEntryCusID,aa.FREPQUASELAUXQTY as HICMOReportRelationQty,a.FAUXPROPID as HAuxPropID
-,'' as HProdMaterCode,'' as HCusShortName,'' as HCusNeedMaterial,'' as HPlanSendGoodsDate
-,'' as HProdMaterName,'' as HWorkRemark,'' as HImportNote,'' as HCusName
-,0 as HInstockQty_Max,0 as HInstockQty_Min,FCOSTRATE as HCOSTRATE,FISBACKFLUSH as HISBACKFLUSH,FCHECKPRODUCT as HCHECKPRODUCT
---,a.FMX_CPCODE,a.FMX_KHNOTE,a.FMX_KHCLCF,a.FMX_CHDATE--姹熶赴鎴庡垱閲戣澏鑷畾涔夊瓧娈�
---,a.FMX_CPNAME,a.FMX_SCNOTE,a.FMX_ZYNOTE,a.FMX_KHNAME--姹熶赴鎴庡垱閲戣澏鑷畾涔夊瓧娈�
-,'' as HPickLabel,a.FSTOCKINLIMITH as HPickLabelNumber,a.FSTOCKINLIMITL as HCusNumber
-from T_PRD_MOENTRY a with(nolock)
-inner join T_PRD_MOENTRY_A aa with(nolock) on a.FENTRYID=aa.FENTRYID
-left join T_SAL_ORDERENTRY ore with(nolock) on a.FSALEORDERID=ore.FID and a.FSALEORDERENTRYID=ore.FEntryID
-left join T_SAL_ORDER orm with(nolock) on ore.FID=orm.FID
-Where a.FID={id}
-select a.FID HInterID ,2000 HYear,1 HPeriod,'3710' HBillType,a.FDATE HDate,a.FbillNo HBillNo,'2' HBillStatus,0 HEMPID,0 HRoutingInterID
-,1 HPlanQty,0 HRelationQty,a.FDATE HPlanBeginDate ,getdate() HPlanEndDate ,a.FDATE HBeginDate,getdate() HEndDate,0 HMaterID,0 HUnitID,0 HBomID,'' HBatchNo
-,0 HSourceInterID,0 HSourceEntryID,'' HSourceBillNo,'' HSourceBillType,0 HSeOrderInterID,0 HSeOrderEntryID,'' HSeOrderBillNo
-,FPRDORGID HPRDORGID,FENTRUSTORGID HENTRUSTORGID,FOWNERID HOWNERID,FOWNERTYPEID HOWNERTYPEID
-,0 HCusID,isnull(a.FWORKSHOPID,0) HDeptID,'CLOUD瀵煎叆' HRemark,a.FCREATORID HMaker,getdate() HMakeDate,a.FAPPROVERID HChecker,a.FAPPROVEDATE HCheckDate,'' HMTONo,a.FID HERPInterID,a.FBILLTYPE HERPBillType
-,case when a.FISREWORK=1 then '杩斿伐' else '鏅��' end HBillSubType,o.FNUMBER as HOrganNumber
-,a.FComboXSLX HComboXSLX
-from T_PRD_MO a with(nolock)
-left join T_ORG_Organizations o with(nolock) on a.FPRDORGID=o.FORGID
-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}
-";
+ /*dialect*/
+ select a.FID AS HInterID,a.FENTRYID as HENTRYID,a.FSEQ as HSEQ,a.FQTY as HQty,a.FQTY as HQTYMUST,aa.FSTOCKINQUASELAUXQTY as HRelationQty,0 as HRelationMoney,a.FPLANSTARTDATE as HPlanBeginDate,a.FPLANFINISHDATE as HPlanEndDate
+ ,a.FPLANSTARTDATE as HBeginDate,a.FPLANFINISHDATE as HEndDate,a.FMATERIALID as HMaterID,a.FUNITID as HUnitID,a.FSTOCKID as HWHID,isnull(a.FSTOCKLOCID,0) as HSPID,0 as HPROCID,isnull(a.FWORKSHOPID,0) as HDEPTID,a.FBOMID as HBomID,a.FLOT_TEXT as HBatchNo,'CLOUD瀵煎叆' as HRemark
+ ,a.FSRCBILLID as HSourceInterID,a.FSRCBILLENTRYID as HSourceEntryID,a.FSRCBILLNO as HSourceBillNo,a.FSRCBILLTYPE as HSourceBillType,a.FSALEORDERID as HSeOrderInterID,a.FSALEORDERENTRYID as HSeOrderEntryID,a.FSALEORDERNO as HSeOrderBillNo
+ ,FSTOCKINORGID as HSTOCKINORGID,FINSTOCKOWNERID as HINSTOCKOWNERID,FINSTOCKOWNERTYPEID as HINSTOCKOWNERTYPEID,FREQUESTORGID as HREQUESTORGID
+ ,0 as HPlanMode,a.FMTONO as HMTONo,a.FID as HERPInterID,a.FENTRYID as HERPEntryID,aa.FSTATUS as HSTATUS
+ ,isnull(orm.FCUSTID,0) as HEntryCusID,aa.FREPQUASELAUXQTY as HICMOReportRelationQty,a.FAUXPROPID as HAuxPropID
+ ,'' as HProdMaterCode,'' as HCusShortName,'' as HCusNeedMaterial,'' as HPlanSendGoodsDate
+ ,'' as HProdMaterName,'' as HWorkRemark,'' as HImportNote,'' as HCusName
+ ,0 as HInstockQty_Max,0 as HInstockQty_Min,FCOSTRATE as HCOSTRATE,FISBACKFLUSH as HISBACKFLUSH,FCHECKPRODUCT as HCHECKPRODUCT
+ --,a.FMX_CPCODE,a.FMX_KHNOTE,a.FMX_KHCLCF,a.FMX_CHDATE--姹熶赴鎴庡垱閲戣澏鑷畾涔夊瓧娈�
+ --,a.FMX_CPNAME,a.FMX_SCNOTE,a.FMX_ZYNOTE,a.FMX_KHNAME--姹熶赴鎴庡垱閲戣澏鑷畾涔夊瓧娈�
+ ,'' as HPickLabel,a.FSTOCKINLIMITH as HPickLabelNumber,a.FSTOCKINLIMITL as HCusNumber
+ from T_PRD_MOENTRY a with(nolock)
+ inner join T_PRD_MOENTRY_A aa with(nolock) on a.FENTRYID=aa.FENTRYID
+ left join T_SAL_ORDERENTRY ore with(nolock) on a.FSALEORDERID=ore.FID and a.FSALEORDERENTRYID=ore.FEntryID
+ left join T_SAL_ORDER orm with(nolock) on ore.FID=orm.FID
+ Where a.FID={id}
+ select a.FID HInterID ,2000 HYear,1 HPeriod,'3710' HBillType,a.FDATE HDate,a.FbillNo HBillNo,'2' HBillStatus,0 HEMPID,0 HRoutingInterID
+ ,1 HPlanQty,0 HRelationQty,a.FDATE HPlanBeginDate ,getdate() HPlanEndDate ,a.FDATE HBeginDate,getdate() HEndDate,0 HMaterID,0 HUnitID,0 HBomID,'' HBatchNo
+ ,0 HSourceInterID,0 HSourceEntryID,'' HSourceBillNo,'' HSourceBillType,0 HSeOrderInterID,0 HSeOrderEntryID,'' HSeOrderBillNo
+ ,FPRDORGID HPRDORGID,FENTRUSTORGID HENTRUSTORGID,FOWNERID HOWNERID,FOWNERTYPEID HOWNERTYPEID
+ ,0 HCusID,isnull(a.FWORKSHOPID,0) HDeptID,'CLOUD瀵煎叆' HRemark,a.FCREATORID HMaker,getdate() HMakeDate,a.FAPPROVERID HChecker,a.FAPPROVEDATE HCheckDate,'' HMTONo,a.FID HERPInterID,a.FBILLTYPE HERPBillType
+ ,case when a.FISREWORK=1 then '杩斿伐' else '鏅��' end HBillSubType,o.FNUMBER as HOrganNumber
+ ,a.FComboXSLX HComboXSLX
+ from T_PRD_MO a with(nolock)
+ left join T_ORG_Organizations o with(nolock) on a.FPRDORGID=o.FORGID
+ 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 subdt = ds.Tables[0];
DataTable maindt = ds.Tables[1];
@@ -307,8 +307,7 @@
{
["model"] = model
};
- //string clientUrl = Util.GetConfigKey(AppDomain.CurrentDomain.BaseDirectory + "/Config/kdapi.config", "ClientUrl");//K/3 Cloud 涓氬姟绔欑偣鍦板潃
- //var client = new RestSharp.RestClient("http://47.96.97.237/api/");
+
var client = new RestSharp.RestClient(http);
//鏂板
var requestPost = new RestRequest("Sc_ICMOBill/ICMOBillSaveApi", Method.POST);
diff --git a/zymes/OperationService/zymes_RealessPrdMoReport.cs b/zymes/OperationService/zymes_RealessPrdMoReport.cs
index 3e3997e..ff146a8 100644
--- a/zymes/OperationService/zymes_RealessPrdMoReport.cs
+++ b/zymes/OperationService/zymes_RealessPrdMoReport.cs
@@ -192,36 +192,36 @@
var id = billObj["Id"].ToString();
string sql = string.Empty;
sql = $@"
-/*dialect*/
-SELECT
-a.FID AS HInterID,a.FENTRYID as HENTRYID,a.FMATERIALID as HMaterID,m.FNUMBER HMaterNumber
-,a.FFINISHQTY as HQty,a.FUNITID as HUnitID,u.FNUMBER HUnitNumber,a.FHRWORKTIME HTimes,0 HSourceID
-,0 HQtyMust,0 HWorkerID,'' HWorkerNumber,0 HBadCount,0 HWasterQty
-,'' HCloseMan,'false' HCloseType,'CLOUD瀵煎叆' HRemark
-,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
-,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
-,0 HWHID,0 HSPID,a.FLOT_TEXT as HBatchNo,a.FAUXPROPID as HAuxPropID,a.FMTONO as HMTONo,0 as HPlanMode,a.FID as HERPInterID,a.FENTRYID as HERPEntryID
-from T_PRD_MORPTENTRY a with(nolock)
-inner join T_PRD_MORPTENTRY_A aa with(nolock) on a.FENTRYID=aa.FENTRYID
-left join T_BD_MATERIAL m on a.FMATERIALID=m.FMATERIALID
-left join T_BD_UNIT u on a.FUNITID=u.FUNITID
-Where a.FID={id}
+ /*dialect*/
+ SELECT
+ a.FID AS HInterID,a.FENTRYID as HENTRYID,a.FMATERIALID as HMaterID,m.FNUMBER HMaterNumber
+ ,a.FFINISHQTY as HQty,a.FUNITID as HUnitID,u.FNUMBER HUnitNumber,a.FHRWORKTIME HTimes,0 HSourceID
+ ,0 HQtyMust,0 HWorkerID,'' HWorkerNumber,0 HBadCount,0 HWasterQty
+ ,'' HCloseMan,'false' HCloseType,'CLOUD瀵煎叆' HRemark
+ ,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
+ ,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
+ ,0 HWHID,0 HSPID,a.FLOT_TEXT as HBatchNo,a.FAUXPROPID as HAuxPropID,a.FMTONO as HMTONo,0 as HPlanMode,a.FID as HERPInterID,a.FENTRYID as HERPEntryID
+ from T_PRD_MORPTENTRY a with(nolock)
+ inner join T_PRD_MORPTENTRY_A aa with(nolock) on a.FENTRYID=aa.FENTRYID
+ left join T_BD_MATERIAL m on a.FMATERIALID=m.FMATERIALID
+ left join T_BD_UNIT u on a.FUNITID=u.FUNITID
+ Where a.FID={id}
-select
-'3711' HBillType,'3711' HBillSubType,a.FID HInterID,a.FbillNo HBillNo,a.FDATE HDate,a.FCREATORID HMaker,getdate() HMakeDate
-,YEAR(GETDATE()) HYear,MONTH(GETDATE()) HPeriod,'CLOUD瀵煎叆' HRemark,0 HEMPID,'' HEmpNumber
-,0 HGroupID,0 HDeptID,'' HDeptNumber,'' HMainSourceBillNo,0 HMainSourceInterID,0 HMainSourceEntryID,0 HMainSourceBillType
-,a.FAPPROVERID HChecker,a.FAPPROVEDATE HCheckDate,a.FAPPROVERID FAPPROVERID,a.FAPPROVEDATE HUpDateDate,'' HDeleteMan,null HDeleteDate,0 HPrintQty,'' HCheckType
-,a.FID HERPInterID,a.FBILLTYPE HERPBillType,FPRDORGID HPRDORGID,o.FNUMBER as HOrganNumber
-from T_PRD_MORPT a with(nolock)
-left join T_ORG_Organizations o with(nolock) on a.FPRDORGID=o.FORGID
-Where a.FID={id}
-";
+ select
+ '3711' HBillType,'3711' HBillSubType,a.FID HInterID,a.FbillNo HBillNo,a.FDATE HDate,a.FCREATORID HMaker,getdate() HMakeDate
+ ,YEAR(GETDATE()) HYear,MONTH(GETDATE()) HPeriod,'CLOUD瀵煎叆' HRemark,0 HEMPID,'' HEmpNumber
+ ,0 HGroupID,0 HDeptID,'' HDeptNumber,'' HMainSourceBillNo,0 HMainSourceInterID,0 HMainSourceEntryID,0 HMainSourceBillType
+ ,a.FAPPROVERID HChecker,a.FAPPROVEDATE HCheckDate,a.FAPPROVERID FAPPROVERID,a.FAPPROVEDATE HUpDateDate,'' HDeleteMan,null HDeleteDate,0 HPrintQty,'' HCheckType
+ ,a.FID HERPInterID,a.FBILLTYPE HERPBillType,FPRDORGID HPRDORGID,o.FNUMBER as HOrganNumber
+ from T_PRD_MORPT a with(nolock)
+ left join T_ORG_Organizations o with(nolock) on a.FPRDORGID=o.FORGID
+ Where a.FID={id}
+ ";
DataSet ds = DBServiceHelper.ExecuteDataSet(Context, sql);
DataTable maindt = ds.Tables[1];
DataTable subdt = ds.Tables[0];
diff --git a/zymes/OperationService/zymes_RealessPrdPpbom.cs b/zymes/OperationService/zymes_RealessPrdPpbom.cs
index a843a82..3cb2d28 100644
--- a/zymes/OperationService/zymes_RealessPrdPpbom.cs
+++ b/zymes/OperationService/zymes_RealessPrdPpbom.cs
@@ -192,31 +192,31 @@
var id = billObj["Id"].ToString();
string sql = string.Empty;
sql = $@"
-/*dialect*/
-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.FID={id}
+ /*dialect*/
+ 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.FID={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,o.FNUMBER as HOrganNumber
-from T_PRD_PPBOM a with(nolock)
-left join T_ORG_Organizations o with(nolock) on a.FPRDORGID=o.FORGID
-Where a.FID={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,o.FNUMBER as HOrganNumber
+ from T_PRD_PPBOM a with(nolock)
+ left join T_ORG_Organizations o with(nolock) on a.FPRDORGID=o.FORGID
+ Where a.FID={id}
";
DataSet ds = DBServiceHelper.ExecuteDataSet(Context, sql);
DataTable maindt = ds.Tables[1];
@@ -258,8 +258,7 @@
{
["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);
//鏂板
var requestPost = new RestRequest("Sc_PPBomBill/Sc_PPBomBillSaveApi", Method.POST);
diff --git a/zymes/OperationService/zymes_RealessPurPoorder.cs b/zymes/OperationService/zymes_RealessPurPoorder.cs
index 7ffbfc6..976b9ec 100644
--- a/zymes/OperationService/zymes_RealessPurPoorder.cs
+++ b/zymes/OperationService/zymes_RealessPurPoorder.cs
@@ -192,38 +192,38 @@
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(t.FTAXRATE,0) HTaxRate_TAX,isnull(t.FTAXAMOUNT,0) HTaxMoney_TAX
-,isnull(f.FTAXPRICE,0) HTaxPrice,isnull(f.FDISCOUNTRATE,0) HDiscountRate,0 HRelTaxPrice,isnull(f.FAMOUNT,0) HMoney,isnull(f.FTAXRATE,0) HTaxRate,isnull(f.FTAXAMOUNT,0) HTaxMoney
-,0 HLineTotal,0 HlineTotalBB,d.FDELIVERYDATE HDate,0 HInStockQty,0 HInvoiceQty,a.FNOTE HRemark
-,'' HSeOrderBillNo,0 HSeOrderInterID,0 HSeOrderEntryID,0 HSourceInterID,0 HSourceEntryID,'' HSourceBillNo,'' HSourceBillType
-,isnull(r.FJOINQTY,0) HRelationQty,isnull(r.FSTOCKRETQTY,0) HBackRelationQty,0 HPropertyID,a.FLOT_TEXT HBatChNo,a.FAUXPROPID HAuxPropID,a.FMTONo HMTONo
-,a.FID HERPInterID,a.FEntryID HERPEntryID,a.FSEQ HSEQ,a.FRECEIVEDEPTID HRECEIVEDEPTID,a.FSUPPLIERLOT HSUPPLIERLOT,a.FBOMID HBOMID
-,a.FSTOCKUNITID HSTOCKUNITID,a.FBASEUNITID HBASEUNITID,a.FBFLOWID HBFLOWID,a.FGIVEAWAY HGIVEAWAY,a.FROWTYPE HROWTYPE,a.FBASEUNITQTY HBASEUNITQTY
-,a.FSTOCKBASEQTY HSTOCKBASEQTY,isnull(r.FREQTRACENO,'') HREQTRACENO,isnull(l.FMATERIALDESC,'') HMATERIALDESC,isnull(d.FRECEIVEORGID,0) HRECEIVEORGID,isnull(d.FREQUIREORGID,0) HREQUIREORGID
-,isnull(f.FTAXNETPRICE,0) HTAXNETPRICE,isnull(f.FPRICECOEFFICIENT,0) HPRICECOEFFICIENT,isnull(f.FTAXCOMBINATION,0) HTAXCOMBINATION,isnull(f.FPRICEUNITID,0) HPRICEUNITID,isnull(f.FPRICELISTENTRY,0) HPRICELISTENTRY,isnull(f.FPAYORGID,0) HPAYORGID
-,isnull(fin.FSETTLEMODEID,0) HSETTLEMODEID,isnull(fin.FSETTLECURRID,0) HSETTLECURRID,isnull(fin.FEXCHANGETYPEID,0) HEXCHANGETYPEID,isnull(fin.FPAYCONDITIONID,0) HPAYCONDITIONID,isnull(fin.FEXCHANGERATE,0) HEXCHANGERATE,isnull(fin.FLOCALCURRID,0) HLOCALCURRID
-,isnull(fin.FISINCLUDEDTAX,0) HISINCLUDEDTAX,isnull(fin.FISPRICEEXCLUDETAX,0) HISPRICEEXCLUDETAX,isnull(fin.FSETTLEORGID,0) HSETTLEORGID
-,isnull(t.FTAXRATEID,0) HTAXRATEID,isnull(t.FCOSTPERCENT,0) HCOSTPERCENT,isnull(t.FCOSTAMOUNT,0) HCOSTAMOUNT,isnull(t.FVAT,0) HVAT,isnull(t.FSELLERWITHHOLDING,0) HSELLERWITHHOLDING,isnull(t.FBUYERWITHHOLDING,0) HBUYERWITHHOLDING
-from T_PUR_POORDERENTRY a with(nolock)
-left join T_PUR_POORDERENTRY_D d with(nolock) on a.FENTRYID=d.FENTRYID
-left join T_PUR_POORDERENTRY_R r with(nolock) on a.FENTRYID=r.FENTRYID
-left join T_PUR_POORDERENTRY_F f with(nolock) on a.FENTRYID=f.FENTRYID
-left join T_PUR_POORDERENTRY_TAX t with(nolock) on a.FENTRYID=t.FENTRYID
-left join T_PUR_POORDERENTRY_L l with(nolock) on a.FENTRYID=l.FENTRYID and l.FLOCALEID=2052
-left join T_PUR_POORDERFIN fin with(nolock) on a.FENTRYID=fin.FENTRYID
-Where a.FID={id}
-select a.FID as HInterID,year(a.FDATE) as HYear,month(a.FDATE) as HPeriod,'1102' as HBillType,'1102' as HBillSubType,a.FDate as HDate
-,a.FBillNo as HBillNo,case when a.FAPPROVERID=0 then 1 else 2 end HBillStatus,'' as HAddress,0 as HSSID,a.FDATE as HSSDate,0 as HPSStyleID
-,a.FSUPPLIERID as HSupID,a.F_RCZU_JXS HSupDealerID,0 as HCurID,0 as HExRate,a.FPURCHASERID as HEmpID,0 as HManagerID,a.FPURCHASEDEPTID as HDeptID
-,'CLOUD瀵煎叆' as HExplanation,'CLOUD瀵煎叆' as HRemark,a.FBillNo as HInnerBillNo
-,a.FAPPROVERID as HChecker,a.FAPPROVEDATE as HCheckDate,a.FCREATORID as HMaker,a.FCREATEDATE as HMakeDate
-,a.FID as HERPInterID,a.FBILLTYPEID as HERPBillType,a.FPURCHASEORGID as HPURCHASEORGID,a.FPURCHASERGROUPID as HPURCHASERGROUPID,a.FPROVIDERID as HPROVIDERID,a.FSETTLEID as HSETTLEID
-,a.FCHARGEID as HCHARGEID,a.FBUSINESSTYPE as HBUSINESSTYPE,a.FPROVIDERADDRESS as HPROVIDERADDRESS,isnull(a.FCORRESPONDORGID,0) as HCORRESPONDORGID,a.FPROVIDERCONTACTID as HPROVIDERCONTACTID
-,o.FNUMBER as HOrganNumber
-from T_PUR_POORDER a with(nolock)
-left join T_ORG_Organizations o with(nolock) on a.FPURCHASEORGID=o.FORGID
-Where a.FID={id}
+ /*dialect*/
+ select a.FID HInterID,a.FEntryID HEntryID,a.FMATERIALID HMaterID,a.FUnitID HUnitID,a.FQty HQty,isnull(f.FPRICE,0) HPrice,isnull(t.FTAXRATE,0) HTaxRate_TAX,isnull(t.FTAXAMOUNT,0) HTaxMoney_TAX
+ ,isnull(f.FTAXPRICE,0) HTaxPrice,isnull(f.FDISCOUNTRATE,0) HDiscountRate,0 HRelTaxPrice,isnull(f.FAMOUNT,0) HMoney,isnull(f.FTAXRATE,0) HTaxRate,isnull(f.FTAXAMOUNT,0) HTaxMoney
+ ,0 HLineTotal,0 HlineTotalBB,d.FDELIVERYDATE HDate,0 HInStockQty,0 HInvoiceQty,a.FNOTE HRemark
+ ,'' HSeOrderBillNo,0 HSeOrderInterID,0 HSeOrderEntryID,0 HSourceInterID,0 HSourceEntryID,'' HSourceBillNo,'' HSourceBillType
+ ,isnull(r.FJOINQTY,0) HRelationQty,isnull(r.FSTOCKRETQTY,0) HBackRelationQty,0 HPropertyID,a.FLOT_TEXT HBatChNo,a.FAUXPROPID HAuxPropID,a.FMTONo HMTONo
+ ,a.FID HERPInterID,a.FEntryID HERPEntryID,a.FSEQ HSEQ,a.FRECEIVEDEPTID HRECEIVEDEPTID,a.FSUPPLIERLOT HSUPPLIERLOT,a.FBOMID HBOMID
+ ,a.FSTOCKUNITID HSTOCKUNITID,a.FBASEUNITID HBASEUNITID,a.FBFLOWID HBFLOWID,a.FGIVEAWAY HGIVEAWAY,a.FROWTYPE HROWTYPE,a.FBASEUNITQTY HBASEUNITQTY
+ ,a.FSTOCKBASEQTY HSTOCKBASEQTY,isnull(r.FREQTRACENO,'') HREQTRACENO,isnull(l.FMATERIALDESC,'') HMATERIALDESC,isnull(d.FRECEIVEORGID,0) HRECEIVEORGID,isnull(d.FREQUIREORGID,0) HREQUIREORGID
+ ,isnull(f.FTAXNETPRICE,0) HTAXNETPRICE,isnull(f.FPRICECOEFFICIENT,0) HPRICECOEFFICIENT,isnull(f.FTAXCOMBINATION,0) HTAXCOMBINATION,isnull(f.FPRICEUNITID,0) HPRICEUNITID,isnull(f.FPRICELISTENTRY,0) HPRICELISTENTRY,isnull(f.FPAYORGID,0) HPAYORGID
+ ,isnull(fin.FSETTLEMODEID,0) HSETTLEMODEID,isnull(fin.FSETTLECURRID,0) HSETTLECURRID,isnull(fin.FEXCHANGETYPEID,0) HEXCHANGETYPEID,isnull(fin.FPAYCONDITIONID,0) HPAYCONDITIONID,isnull(fin.FEXCHANGERATE,0) HEXCHANGERATE,isnull(fin.FLOCALCURRID,0) HLOCALCURRID
+ ,isnull(fin.FISINCLUDEDTAX,0) HISINCLUDEDTAX,isnull(fin.FISPRICEEXCLUDETAX,0) HISPRICEEXCLUDETAX,isnull(fin.FSETTLEORGID,0) HSETTLEORGID
+ ,isnull(t.FTAXRATEID,0) HTAXRATEID,isnull(t.FCOSTPERCENT,0) HCOSTPERCENT,isnull(t.FCOSTAMOUNT,0) HCOSTAMOUNT,isnull(t.FVAT,0) HVAT,isnull(t.FSELLERWITHHOLDING,0) HSELLERWITHHOLDING,isnull(t.FBUYERWITHHOLDING,0) HBUYERWITHHOLDING
+ from T_PUR_POORDERENTRY a with(nolock)
+ left join T_PUR_POORDERENTRY_D d with(nolock) on a.FENTRYID=d.FENTRYID
+ left join T_PUR_POORDERENTRY_R r with(nolock) on a.FENTRYID=r.FENTRYID
+ left join T_PUR_POORDERENTRY_F f with(nolock) on a.FENTRYID=f.FENTRYID
+ left join T_PUR_POORDERENTRY_TAX t with(nolock) on a.FENTRYID=t.FENTRYID
+ left join T_PUR_POORDERENTRY_L l with(nolock) on a.FENTRYID=l.FENTRYID and l.FLOCALEID=2052
+ left join T_PUR_POORDERFIN fin with(nolock) on a.FENTRYID=fin.FENTRYID
+ Where a.FID={id}
+ select a.FID as HInterID,year(a.FDATE) as HYear,month(a.FDATE) as HPeriod,'1102' as HBillType,'1102' as HBillSubType,a.FDate as HDate
+ ,a.FBillNo as HBillNo,case when a.FAPPROVERID=0 then 1 else 2 end HBillStatus,'' as HAddress,0 as HSSID,a.FDATE as HSSDate,0 as HPSStyleID
+ ,a.FSUPPLIERID as HSupID,a.F_RCZU_JXS HSupDealerID,0 as HCurID,0 as HExRate,a.FPURCHASERID as HEmpID,0 as HManagerID,a.FPURCHASEDEPTID as HDeptID
+ ,'CLOUD瀵煎叆' as HExplanation,'CLOUD瀵煎叆' as HRemark,a.FBillNo as HInnerBillNo
+ ,a.FAPPROVERID as HChecker,a.FAPPROVEDATE as HCheckDate,a.FCREATORID as HMaker,a.FCREATEDATE as HMakeDate
+ ,a.FID as HERPInterID,a.FBILLTYPEID as HERPBillType,a.FPURCHASEORGID as HPURCHASEORGID,a.FPURCHASERGROUPID as HPURCHASERGROUPID,a.FPROVIDERID as HPROVIDERID,a.FSETTLEID as HSETTLEID
+ ,a.FCHARGEID as HCHARGEID,a.FBUSINESSTYPE as HBUSINESSTYPE,a.FPROVIDERADDRESS as HPROVIDERADDRESS,isnull(a.FCORRESPONDORGID,0) as HCORRESPONDORGID,a.FPROVIDERCONTACTID as HPROVIDERCONTACTID
+ ,o.FNUMBER as HOrganNumber
+ from T_PUR_POORDER a with(nolock)
+ left join T_ORG_Organizations o with(nolock) on a.FPURCHASEORGID=o.FORGID
+ Where a.FID={id}
";
DataSet ds = DBServiceHelper.ExecuteDataSet(Context, sql);
DataTable maindt = ds.Tables[1];
@@ -265,8 +265,7 @@
{
["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);
//鏂板
var requestPost = new RestRequest("Cg_POOrderBill/Cg_POOrderBillSaveApi", Method.POST);
diff --git a/zymes/OperationService/zymes_RealessPurReceive.cs b/zymes/OperationService/zymes_RealessPurReceive.cs
index afc2120..ef01a87 100644
--- a/zymes/OperationService/zymes_RealessPurReceive.cs
+++ b/zymes/OperationService/zymes_RealessPurReceive.cs
@@ -192,39 +192,39 @@
var id = billObj["Id"].ToString();
string sql = string.Empty;
sql = $@"
-/*dialect*/
-select a.FID as HInterID,a.FEntryID as HEntryID,a.FMaterialID as HMaterID,a.FUnitID as HUnitID,a.FACTRECEIVEQTY as HQty,isnull(f.FPRICE,0) as HPrice
-,isnull(f.FAMOUNT,0) as HMoney,isnull(a.FSTOCKID,0) as HWHID,isnull(a.FSTOCKLOCID,0) as HSPID,'CLOUD瀵煎叆' as HRemark,isnull(f.FTAXAMOUNT,0) as HTaxMoney,isnull(f.FTAXRATE,0) as HTaxRate,isnull(t.FTAXAMOUNT,0) as HTaxMoney_TAX,isnull(t.FTAXRATE,0) as HTaxRate_TAX
-,a.FSRCID as HSourceInterID,a.FSRCENTRYID as HSourceEntryID,a.FSRCBILLNO as HSourceBillNo,'1102' as HSourceBillType,a.FSRCID as HPOOrderInterID,a.FPOOrderEntryID as HPOOrderEntryID,isnull(a.FORDERBILLNO,'') as HPOORderBillNo
-,a.FAuxPropID as HAuxPropID,a.FLOT_TEXT as HBatchNO,a.FMTONo as HMTONo,'' as HPlanMode,a.FID as HERPInterID,a.FEntryID as HERPEntryID
-,b.FInStockBaseQty as HRelationQty,a.FGIVEAWAY as HGiveAwayFlag,b.FReceiveQty as HReceiveQty,a.FEXTAUXUNITID as HSecUnitID
-,a.FSEQ as HSEQ,a.FPRODUCEDATE as HPRODUCEDATE,a.FEXPIRYDATE as HEXPIRYDATE,isnull(a.FSUPPLYLOT,'') as HSUPPLYLOT,a.FREQTRACENO as HREQTRACENO,a.FBOMID as HBOMID,a.FSTOCKUNITID as HSTOCKUNITID
+ /*dialect*/
+ select a.FID as HInterID,a.FEntryID as HEntryID,a.FMaterialID as HMaterID,a.FUnitID as HUnitID,a.FACTRECEIVEQTY as HQty,isnull(f.FPRICE,0) as HPrice
+ ,isnull(f.FAMOUNT,0) as HMoney,isnull(a.FSTOCKID,0) as HWHID,isnull(a.FSTOCKLOCID,0) as HSPID,'CLOUD瀵煎叆' as HRemark,isnull(f.FTAXAMOUNT,0) as HTaxMoney,isnull(f.FTAXRATE,0) as HTaxRate,isnull(t.FTAXAMOUNT,0) as HTaxMoney_TAX,isnull(t.FTAXRATE,0) as HTaxRate_TAX
+ ,a.FSRCID as HSourceInterID,a.FSRCENTRYID as HSourceEntryID,a.FSRCBILLNO as HSourceBillNo,'1102' as HSourceBillType,a.FSRCID as HPOOrderInterID,a.FPOOrderEntryID as HPOOrderEntryID,isnull(a.FORDERBILLNO,'') as HPOORderBillNo
+ ,a.FAuxPropID as HAuxPropID,a.FLOT_TEXT as HBatchNO,a.FMTONo as HMTONo,'' as HPlanMode,a.FID as HERPInterID,a.FEntryID as HERPEntryID
+ ,b.FInStockBaseQty as HRelationQty,a.FGIVEAWAY as HGiveAwayFlag,b.FReceiveQty as HReceiveQty,a.FEXTAUXUNITID as HSecUnitID
+ ,a.FSEQ as HSEQ,a.FPRODUCEDATE as HPRODUCEDATE,a.FEXPIRYDATE as HEXPIRYDATE,isnull(a.FSUPPLYLOT,'') as HSUPPLYLOT,a.FREQTRACENO as HREQTRACENO,a.FBOMID as HBOMID,a.FSTOCKUNITID as HSTOCKUNITID
-,a.FBASEUNITID as HBASEUNITID,a.FSTOCKSTATUSID as HSTOCKSTATUSID,a.FKEEPERTYPEID as HKEEPERTYPEID,isnull(a.FPROJECTNO,'') as HPROJECTNO,a.FCHECKINCOMING as HCHECKINCOMING
-,isnull(f.FTAXPRICE,0) as HTAXPRICE,isnull(f.FDISCOUNTRATE,0) as HDISCOUNTRATE,isnull(f.FPRICECOEFFICIENT,0) as HPRICECOEFFICIENT,isnull(f.FPRICEUNITID,0) as HPRICEUNITID,isnull(f.FPRICELISTENTRY,0) as HPRICELISTENTRY
+ ,a.FBASEUNITID as HBASEUNITID,a.FSTOCKSTATUSID as HSTOCKSTATUSID,a.FKEEPERTYPEID as HKEEPERTYPEID,isnull(a.FPROJECTNO,'') as HPROJECTNO,a.FCHECKINCOMING as HCHECKINCOMING
+ ,isnull(f.FTAXPRICE,0) as HTAXPRICE,isnull(f.FDISCOUNTRATE,0) as HDISCOUNTRATE,isnull(f.FPRICECOEFFICIENT,0) as HPRICECOEFFICIENT,isnull(f.FPRICEUNITID,0) as HPRICEUNITID,isnull(f.FPRICELISTENTRY,0) as HPRICELISTENTRY
-,f.FTAXCOMBINATION as HTAXCOMBINATION,b.FSAMPLEDAMAGEQTY as HSAMPLEDAMAGEQTY,b.FSAMPLEDAMAGEBASEQTY as HSAMPLEDAMAGEBASEQTY,a.FOWNERTYPEID as HOWNERTYPEID,a.FOWNERID as HOWNERID,a.FBFLOWID as HBFLOWID
-,isnull(fin.FPAYORGID,0) as HPAYORGID,isnull(fin.FSETTLEORGID,0) as HSETTLEORGID,isnull(fin.FSETTLECURRID,0) as HSETTLECURRID,isnull(fin.FSETTLEMODEID,0) as HSETTLEMODEID,isnull(fin.FEXCHANGETYPEID,0) as HEXCHANGETYPEID ,isnull(fin.FPAYCONDITONID,0) as HPAYCONDITONID
-,isnull(fin.FEXCHANGERATE,0) as HEXCHANGERATE,isnull(fin.FLOCALCURRID,0) as HLOCALCURRID,isnull(fin.FISINCLUDEDTAX,0) as HISINCLUDEDTAX,isnull(fin.FISPRICEEXCLUDETAX,0) as HISPRICEEXCLUDETAX
-,isnull(t.FTAXRATEID,0) as HTAXRATEID,isnull(t.FCOSTPERCENT,0) as HCOSTPERCENT,isnull(t.FCOSTAMOUNT,0) as HCOSTAMOUNT,isnull(t.FVAT,0),isnull(t.FSELLERWITHHOLDING,0) as HSELLERWITHHOLDING,isnull(t.FBUYERWITHHOLDING,0) as HBUYERWITHHOLDING,a.FSalOutStockBillNo as HSalOutStockBillNo,isnull(a.FSalOutStockEntryId,0) as HSalOutStockEntryId
-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.FID=fin.FID
-left join T_PUR_RECEIVEENTRY_TAX t with(nolock) on a.FENTRYID=t.FENTRYID
-where a.FID={id}
+ ,f.FTAXCOMBINATION as HTAXCOMBINATION,b.FSAMPLEDAMAGEQTY as HSAMPLEDAMAGEQTY,b.FSAMPLEDAMAGEBASEQTY as HSAMPLEDAMAGEBASEQTY,a.FOWNERTYPEID as HOWNERTYPEID,a.FOWNERID as HOWNERID,a.FBFLOWID as HBFLOWID
+ ,isnull(fin.FPAYORGID,0) as HPAYORGID,isnull(fin.FSETTLEORGID,0) as HSETTLEORGID,isnull(fin.FSETTLECURRID,0) as HSETTLECURRID,isnull(fin.FSETTLEMODEID,0) as HSETTLEMODEID,isnull(fin.FEXCHANGETYPEID,0) as HEXCHANGETYPEID ,isnull(fin.FPAYCONDITONID,0) as HPAYCONDITONID
+ ,isnull(fin.FEXCHANGERATE,0) as HEXCHANGERATE,isnull(fin.FLOCALCURRID,0) as HLOCALCURRID,isnull(fin.FISINCLUDEDTAX,0) as HISINCLUDEDTAX,isnull(fin.FISPRICEEXCLUDETAX,0) as HISPRICEEXCLUDETAX
+ ,isnull(t.FTAXRATEID,0) as HTAXRATEID,isnull(t.FCOSTPERCENT,0) as HCOSTPERCENT,isnull(t.FCOSTAMOUNT,0) as HCOSTAMOUNT,isnull(t.FVAT,0),isnull(t.FSELLERWITHHOLDING,0) as HSELLERWITHHOLDING,isnull(t.FBUYERWITHHOLDING,0) as HBUYERWITHHOLDING,a.FSalOutStockBillNo as HSalOutStockBillNo,isnull(a.FSalOutStockEntryId,0) as HSalOutStockEntryId
+ 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.FID=fin.FID
+ left join T_PUR_RECEIVEENTRY_TAX t with(nolock) on a.FENTRYID=t.FENTRYID
+ where a.FID={id}
-select a.FID as HInterID,year(isnull(a.FDATE,GETDATE())) as HYear,month(isnull(a.FDATE,GETDATE())) as HPeriod,'1103' as HBillType,case when a.FBUSINESSTYPE='WW' then '12511' else '12510' end as HBillSubType,isnull(a.FDATE,GETDATE()) as HDate
-,a.FBillNo as HBillNo,case when a.FAPPROVERID=0 then 1 else 2 end HBillStatus,a.FSUPPLIERID as HSupID,a.F_RCZU_JXS HSupDealerID,a.FPURCHASERID as HManagerID,a.FRECEIVERID as HEmpID,a.FRECEIVEDEPTID as HDeptID,a.FNOTE as HRemark
-,a.FCREATORID as HMaker,a.FCREATEDATE as HMakeDate,a.FAPPROVERID as HChecker ,a.FAPPROVEDATE as HCheckDate,a.FOWNERTYPEID as HOWNERTYPEID,a.FOWNERID as HOWNERID
-,a.FID as HERPInterID,a.FBillTypeID as HERPBillType,a.FPURORGID as HPURCHASEORGID,a.FSTOCKORGID as HSTOCKORGID,a.FDEMANDORGID as HREQUIREORGID
-,a.FSTOCKGROUPID as HSTOCKGROUPID,isnull(a.FSENDBILLNO,'') as HSENDBILLNO,isnull(a.FLADBILLNO,'') as HLADBILLNO,a.FPURDEPTID as HPURDEPTID,a.FPURGROUPID as HPURGROUPID,a.FSUPPLYID as HSUPPLYID
-,a.FSETTLEID as HSETTLEID,a.FCHARGEID as HCHARGEID,a.FBUSINESSTYPE as HBUSINESSTYPE,a.FSUPPLYADDRESS as HSUPPLYADDRESS,isnull(a.FCORRESPONDORGID,0) as HCORRESPONDORGID,a.FPROVIDERCONTACTID as HPROVIDERCONTACTID
-,a.F_RCZU_NBDDH as HInnerBillNo,o.FNUMBER as HOrganNumber
-from T_PUR_RECEIVE a with(nolock)
-left join T_ORG_Organizations o with(nolock) on a.FSTOCKORGID=o.FORGID
-Where a.FID={id}
-";
+ select a.FID as HInterID,year(isnull(a.FDATE,GETDATE())) as HYear,month(isnull(a.FDATE,GETDATE())) as HPeriod,'1103' as HBillType,case when a.FBUSINESSTYPE='WW' then '12511' else '12510' end as HBillSubType,isnull(a.FDATE,GETDATE()) as HDate
+ ,a.FBillNo as HBillNo,case when a.FAPPROVERID=0 then 1 else 2 end HBillStatus,a.FSUPPLIERID as HSupID,a.F_RCZU_JXS HSupDealerID,a.FPURCHASERID as HManagerID,a.FRECEIVERID as HEmpID,a.FRECEIVEDEPTID as HDeptID,a.FNOTE as HRemark
+ ,a.FCREATORID as HMaker,a.FCREATEDATE as HMakeDate,a.FAPPROVERID as HChecker ,a.FAPPROVEDATE as HCheckDate,a.FOWNERTYPEID as HOWNERTYPEID,a.FOWNERID as HOWNERID
+ ,a.FID as HERPInterID,a.FBillTypeID as HERPBillType,a.FPURORGID as HPURCHASEORGID,a.FSTOCKORGID as HSTOCKORGID,a.FDEMANDORGID as HREQUIREORGID
+ ,a.FSTOCKGROUPID as HSTOCKGROUPID,isnull(a.FSENDBILLNO,'') as HSENDBILLNO,isnull(a.FLADBILLNO,'') as HLADBILLNO,a.FPURDEPTID as HPURDEPTID,a.FPURGROUPID as HPURGROUPID,a.FSUPPLYID as HSUPPLYID
+ ,a.FSETTLEID as HSETTLEID,a.FCHARGEID as HCHARGEID,a.FBUSINESSTYPE as HBUSINESSTYPE,a.FSUPPLYADDRESS as HSUPPLYADDRESS,isnull(a.FCORRESPONDORGID,0) as HCORRESPONDORGID,a.FPROVIDERCONTACTID as HPROVIDERCONTACTID
+ ,a.F_RCZU_NBDDH as HInnerBillNo,o.FNUMBER as HOrganNumber
+ from T_PUR_RECEIVE a with(nolock)
+ left join T_ORG_Organizations o with(nolock) on a.FSTOCKORGID=o.FORGID
+ Where a.FID={id}
+ ";
DataSet ds = DBServiceHelper.ExecuteDataSet(Context, sql);
DataTable maindt = ds.Tables[1];
DataTable subdt = ds.Tables[0];
@@ -265,8 +265,7 @@
{
["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);
//鏂板
var requestPost = new RestRequest("Cg_POInStockBill/Cg_POInStockBillSaveApi", Method.POST);
diff --git a/zymes/OperationService/zymes_RealessRateType.cs b/zymes/OperationService/zymes_RealessRateType.cs
index 46ac546..1325f7a 100644
--- a/zymes/OperationService/zymes_RealessRateType.cs
+++ b/zymes/OperationService/zymes_RealessRateType.cs
@@ -52,16 +52,16 @@
var id = billObj["Id"].ToString();
string sql = string.Empty;
sql = $@"
-/*dialect*/
-select a.FRATETYPEID as HItemID,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,'' HHelpCode,'鏈娴�' as HUseFlag,a.FCREATEDATE as HMakeTime
-,'' HMakeEmp,'' HCheckEmp,a.FAUDITDATE HCheckTime,'' HModifyEmp,a.FMODIFYDATE HModifyTime,'' HStopEmp,a.FUSEORGID as HUSEORGID,a.FCREATEORGID as HCREATEORGID
-,o.FNUMBER as HOrganNumber
-from T_BD_RateType a with(nolock)
-inner join T_BD_RATETYPE_L l with(nolock) on a.FRATETYPEID=l.FRATETYPEID and FLOCALEID=2052
-left join T_ORG_Organizations o with(nolock) on a.FUSEORGID=o.FORGID
-Where a.FRATETYPEID={id}
-";
+ /*dialect*/
+ select a.FRATETYPEID as HItemID,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,'' HHelpCode,'鏈娴�' as HUseFlag,a.FCREATEDATE as HMakeTime
+ ,'' HMakeEmp,'' HCheckEmp,a.FAUDITDATE HCheckTime,'' HModifyEmp,a.FMODIFYDATE HModifyTime,'' HStopEmp,a.FUSEORGID as HUSEORGID,a.FCREATEORGID as HCREATEORGID
+ ,o.FNUMBER as HOrganNumber
+ from T_BD_RateType a with(nolock)
+ inner join T_BD_RATETYPE_L l with(nolock) on a.FRATETYPEID=l.FRATETYPEID and FLOCALEID=2052
+ left join T_ORG_Organizations o with(nolock) on a.FUSEORGID=o.FORGID
+ Where a.FRATETYPEID={id}
+ ";
DataTable dt = DBServiceHelper.ExecuteDataSet(Context, sql).Tables[0];
if (dt.Rows.Count == 0)
@@ -90,9 +90,7 @@
{
["model"] = model
};
- //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);
var requestPost = new RestRequest("Gy_RateType/SaveGy_RateTypeListApi", Method.POST);
requestPost.AddParameter("application/json", JsonConvert.SerializeObject(_jsonRoot), ParameterType.RequestBody);
diff --git a/zymes/OperationService/zymes_RealessRecCondition.cs b/zymes/OperationService/zymes_RealessRecCondition.cs
index 6e9d3b3..1f35a92 100644
--- a/zymes/OperationService/zymes_RealessRecCondition.cs
+++ b/zymes/OperationService/zymes_RealessRecCondition.cs
@@ -51,15 +51,15 @@
var id = billObj["Id"].ToString();
string sql = string.Empty;
sql = $@"
-/*dialect*/
-select a.FID as HItemID,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,'' HHelpCode,'鏈娴�' as HUseFlag,a.FCREATEDATE as HMakeTime
-,'' HMakeEmp,'' HCheckEmp,a.FAUDITDATE HCheckTime,'' HModifyEmp,a.FMODIFYDATE HModifyTime,'' HStopEmp,a.FUSEORGID as HUSEORGID,a.FCREATEORGID as HCREATEORGID
-,o.FNUMBER as HOrganNumber
-from T_BD_RecCondition a with(nolock)
-inner join T_BD_RECCONDITION_L l with(nolock) on a.FID=l.FID and FLOCALEID=2052
-left join T_ORG_Organizations o with(nolock) on a.FUSEORGID=o.FORGID
-Where a.FID='{id}'";
+ /*dialect*/
+ select a.FID as HItemID,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,'' HHelpCode,'鏈娴�' as HUseFlag,a.FCREATEDATE as HMakeTime
+ ,'' HMakeEmp,'' HCheckEmp,a.FAUDITDATE HCheckTime,'' HModifyEmp,a.FMODIFYDATE HModifyTime,'' HStopEmp,a.FUSEORGID as HUSEORGID,a.FCREATEORGID as HCREATEORGID
+ ,o.FNUMBER as HOrganNumber
+ from T_BD_RecCondition a with(nolock)
+ inner join T_BD_RECCONDITION_L l with(nolock) on a.FID=l.FID and FLOCALEID=2052
+ left join T_ORG_Organizations o with(nolock) on a.FUSEORGID=o.FORGID
+ Where a.FID='{id}'";
DataTable dt = DBServiceHelper.ExecuteDataSet(Context, sql).Tables[0];
if (dt.Rows.Count == 0)
@@ -91,9 +91,7 @@
{
["model"] = model
};
- //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);
var requestPost = new RestRequest("Gy_RecCondition/SaveGy_RecConditionListApi", Method.POST);
requestPost.AddParameter("application/json", JsonConvert.SerializeObject(_jsonRoot), ParameterType.RequestBody);
diff --git a/zymes/OperationService/zymes_RealessSalOrder.cs b/zymes/OperationService/zymes_RealessSalOrder.cs
index 69ff761..ae8414d 100644
--- a/zymes/OperationService/zymes_RealessSalOrder.cs
+++ b/zymes/OperationService/zymes_RealessSalOrder.cs
@@ -52,48 +52,48 @@
var id = billObj["Id"].ToString();
string sql = string.Empty;
sql = $@"
-/*dialect*/
-select a.FID as HInterID, a.FEntryID as HEntryID, a.FMATERIALID as HMaterID, a.FUnitID as HUnitID, a.FQty as HQty,
-isnull(f.FPRICE,0) as HPrice, isnull(f.FTAXPRICE,0) as HTaxPrice, isnull(f.FDISCOUNTRATE,0) as HDiscountRate,
-0 as HRelTaxPrice, 0 as HMoney,isnull(f.FTAXRATE,0) as HTaxRate, 0 as HTaxMoney, 0 as HLineTotal, 0 as HlineTotalBB,
-isnull(a.FPLANDELIVERYDATE,'') as HDate, a.FSTOCKBASEQTY as HOutStockQty, 0 as HInvoiceQty, a.FNOTE as HRemark,
-isnull(R.FSRCBILLID,0) as HSourceInterID, isnull(LK.FSID,0) as HSourceEntryID, R.FSRCBILLNO as HSourceBillNo,
-R.FSRCTYPE as HSourceBillType, isnull(a.FQty-R.FBASECANOUTQTY,0) as HRelationQty, 0 as HPropertyID, a.FLot_TEXT as HBatChNo,
-a.FAUXPROPID as HAuxPropID, isnull(a.FMTONO,'') as HMTONo, a.FID as HERPInterID, a.FEntryID as HERPEntryID,
-isnull(a.FQty-R.FBASECANRETURNQTY,0) as HBackRelationQty, isnull(a.FSOStockId,0) as HWhID,isnull(a.FSOStockLocalId,0) as HSPID,
-a.FSTOCKORGID as HSTOCKORGID, a.FOWNERID as HOWNERID, a.FOWNERTYPEID as HOWNERTYPEID, isnull(a.FMAPID,'') as HMAPID,
-a.FSTOCKUNITID as HSTOCKUNITID, a.FBASEUNITID as HBASEUNITID, a.FBFLOWID as HBFLOWID, isnull(f.FSETTLEORGID,0) as HSETTLEORGID,
-isnull(f.FTAXCOMBINATION,0) as HTAXCOMBINATION, isnull(f.FPRICEUNITID,0) as HPRICEUNITID, isnull(f.FISFREE,0) as HISFREE,
-isnull(f.FPRICECOEFFICIENT,0) as HPRICECOEFFICIENT, isnull(f.FSYSPRICE,0) as HSYSPRICE, isnull(f.FLIMITDOWNPRICE,0) as HLIMITDOWNPRICE,
-isnull(e.FPARENTMATID,0) as HPARENTMATID, isnull(e.FROWTYPE,'') as HROWTYPE, isnull(e.FROWID,'') as HROWID,
-isnull(e.FPARENTROWID,'') as HPARENTROWID, isnull(d.FDELIVERYCONTROL,0) as HDELIVERYCONTROL, isnull(fin.FLOCALCURRID,0) as HLOCALCURRID,
-isnull(fin.FEXCHANGETYPEID,0) as HEXCHANGETYPEID, isnull(fin.FSETTLECURRID,0) as HSETTLECURRID, isnull(fin.FSETTLEMODEID,0) as HSETTLEMODEID,
-isnull(fin.FRECCONDITIONID,0) as HRECCONDITIONID, isnull(fin.FISINCLUDEDTAX,0) as HISINCLUDEDTAX, isnull(fin.FISPRICEEXCLUDETAX,0) as HISPRICEEXCLUDETAX,
-isnull(fin.FEXCHANGERATE,0) as HEXCHANGERATE, isnull(tax.FTAXRATEID,0) as HTAXRATEID, isnull(tax.FCOSTPERCENT,0) as HCOSTPERCENT,
-isnull(tax.FVAT,0) as HVAT, isnull(tax.FSELLERWITHHOLDING,0) as HSELLERWITHHOLDING,
-isnull(tax.FBUYERWITHHOLDING,0) as HBUYERWITHHOLDING, isnull(f.FPRICELISTENTRY,0) as HPRICELISTENTRY
-from T_SAL_ORDERENTRY a with(nolock)
-inner join T_SAL_ORDERENTRY_R R with(nolock) on a.FENTRYID=R.FENTRYID
-left join T_SAL_ORDERENTRY_F f with(nolock) on a.FID=f.FID and a.FENTRYID=f.FENTRYID
-left join T_SAL_ORDERENTRY_E e with(nolock) on a.FID=e.FID and a.FENTRYID=e.FENTRYID
-left join T_SAL_ORDERENTRY_D d with(nolock) on a.FID=d.FID and a.FENTRYID=d.FENTRYID
-left join T_SAL_ORDERENTRYTAX tax with(nolock) on a.FID=tax.FDETAILID and a.FENTRYID=tax.FENTRYID
-left join T_SAL_ORDERFIN fin with(nolock) on a.FID=fin.FID
-left join T_SAL_ORDERENTRY_LK LK with(nolock) on a.FENTRYID=LK.FENTRYID
-Where a.FID={id}
-select a.FID as HInterID, year(a.FDate) as HYear, month(a.FDate) as HPeriod, '1401' as HBillType, '1401' as HBillSubType,
-a.FDate as HDate, a.FbillNo as HBillNo, case when isnull(a.FAPPROVERID,0)=0 then 1 else 2 end HBillStatus,
-a.FRECEIVEADDRESS as HAddress, 0 as HSSID,a.FDATE as HSSDate, a.FCUSTID as HCusID, 0 as HCurID, 0 as HExRate,
-a.FSALERID as HEmpID, 0 as HManagerID, isnull(a.FSALEDEPTID,0) as HDeptID, 'CLOUD瀵煎叆' as HExplanation, a.FNOTE as HRemark,
-''as HInnerBillNo, a.FAPPROVERID as HChecker, a.FAPPROVEDATE as HCheckDate, a.FCREATORID as HMaker, a.FCREATEDATE as HMakeDate,
-a.FCLOSERID as HCloseMan, a.FCLOSEDATE as HCloseDate, a.FID as HERPInterID, a.FBILLTYPEID as HERPBillType, a.FSALEORGID as HSALEORGID,
-a.FSALEGROUPID as HSALEGROUPID, a.FRECEIVEID as HRECEIVEID, a.FSETTLEID as HSETTLEID, a.FCHARGEID as HCHARGEID, a.FHEADLOCID as HHEADLOCID,
-a.FRECCONTACTID as HRECCONTACTID, isnull(a.FCORRESPONDORGID, 0) as HCORRESPONDORGID, a.FBUSINESSTYPE as HBUSINESSTYPE
-,o.FNUMBER as HOrganNumber
-from T_SAL_ORDER a with(nolock)
-left join T_ORG_Organizations o with(nolock) on a.FSALEORGID=o.FORGID
-Where FID={id}
-";
+ /*dialect*/
+ select a.FID as HInterID, a.FEntryID as HEntryID, a.FMATERIALID as HMaterID, a.FUnitID as HUnitID, a.FQty as HQty,
+ isnull(f.FPRICE,0) as HPrice, isnull(f.FTAXPRICE,0) as HTaxPrice, isnull(f.FDISCOUNTRATE,0) as HDiscountRate,
+ 0 as HRelTaxPrice, 0 as HMoney,isnull(f.FTAXRATE,0) as HTaxRate, 0 as HTaxMoney, 0 as HLineTotal, 0 as HlineTotalBB,
+ isnull(a.FPLANDELIVERYDATE,'') as HDate, a.FSTOCKBASEQTY as HOutStockQty, 0 as HInvoiceQty, a.FNOTE as HRemark,
+ isnull(R.FSRCBILLID,0) as HSourceInterID, isnull(LK.FSID,0) as HSourceEntryID, R.FSRCBILLNO as HSourceBillNo,
+ R.FSRCTYPE as HSourceBillType, isnull(a.FQty-R.FBASECANOUTQTY,0) as HRelationQty, 0 as HPropertyID, a.FLot_TEXT as HBatChNo,
+ a.FAUXPROPID as HAuxPropID, isnull(a.FMTONO,'') as HMTONo, a.FID as HERPInterID, a.FEntryID as HERPEntryID,
+ isnull(a.FQty-R.FBASECANRETURNQTY,0) as HBackRelationQty, isnull(a.FSOStockId,0) as HWhID,isnull(a.FSOStockLocalId,0) as HSPID,
+ a.FSTOCKORGID as HSTOCKORGID, a.FOWNERID as HOWNERID, a.FOWNERTYPEID as HOWNERTYPEID, isnull(a.FMAPID,'') as HMAPID,
+ a.FSTOCKUNITID as HSTOCKUNITID, a.FBASEUNITID as HBASEUNITID, a.FBFLOWID as HBFLOWID, isnull(f.FSETTLEORGID,0) as HSETTLEORGID,
+ isnull(f.FTAXCOMBINATION,0) as HTAXCOMBINATION, isnull(f.FPRICEUNITID,0) as HPRICEUNITID, isnull(f.FISFREE,0) as HISFREE,
+ isnull(f.FPRICECOEFFICIENT,0) as HPRICECOEFFICIENT, isnull(f.FSYSPRICE,0) as HSYSPRICE, isnull(f.FLIMITDOWNPRICE,0) as HLIMITDOWNPRICE,
+ isnull(e.FPARENTMATID,0) as HPARENTMATID, isnull(e.FROWTYPE,'') as HROWTYPE, isnull(e.FROWID,'') as HROWID,
+ isnull(e.FPARENTROWID,'') as HPARENTROWID, isnull(d.FDELIVERYCONTROL,0) as HDELIVERYCONTROL, isnull(fin.FLOCALCURRID,0) as HLOCALCURRID,
+ isnull(fin.FEXCHANGETYPEID,0) as HEXCHANGETYPEID, isnull(fin.FSETTLECURRID,0) as HSETTLECURRID, isnull(fin.FSETTLEMODEID,0) as HSETTLEMODEID,
+ isnull(fin.FRECCONDITIONID,0) as HRECCONDITIONID, isnull(fin.FISINCLUDEDTAX,0) as HISINCLUDEDTAX, isnull(fin.FISPRICEEXCLUDETAX,0) as HISPRICEEXCLUDETAX,
+ isnull(fin.FEXCHANGERATE,0) as HEXCHANGERATE, isnull(tax.FTAXRATEID,0) as HTAXRATEID, isnull(tax.FCOSTPERCENT,0) as HCOSTPERCENT,
+ isnull(tax.FVAT,0) as HVAT, isnull(tax.FSELLERWITHHOLDING,0) as HSELLERWITHHOLDING,
+ isnull(tax.FBUYERWITHHOLDING,0) as HBUYERWITHHOLDING, isnull(f.FPRICELISTENTRY,0) as HPRICELISTENTRY
+ from T_SAL_ORDERENTRY a with(nolock)
+ inner join T_SAL_ORDERENTRY_R R with(nolock) on a.FENTRYID=R.FENTRYID
+ left join T_SAL_ORDERENTRY_F f with(nolock) on a.FID=f.FID and a.FENTRYID=f.FENTRYID
+ left join T_SAL_ORDERENTRY_E e with(nolock) on a.FID=e.FID and a.FENTRYID=e.FENTRYID
+ left join T_SAL_ORDERENTRY_D d with(nolock) on a.FID=d.FID and a.FENTRYID=d.FENTRYID
+ left join T_SAL_ORDERENTRYTAX tax with(nolock) on a.FID=tax.FDETAILID and a.FENTRYID=tax.FENTRYID
+ left join T_SAL_ORDERFIN fin with(nolock) on a.FID=fin.FID
+ left join T_SAL_ORDERENTRY_LK LK with(nolock) on a.FENTRYID=LK.FENTRYID
+ Where a.FID={id}
+ select a.FID as HInterID, year(a.FDate) as HYear, month(a.FDate) as HPeriod, '1401' as HBillType, '1401' as HBillSubType,
+ a.FDate as HDate, a.FbillNo as HBillNo, case when isnull(a.FAPPROVERID,0)=0 then 1 else 2 end HBillStatus,
+ a.FRECEIVEADDRESS as HAddress, 0 as HSSID,a.FDATE as HSSDate, a.FCUSTID as HCusID, 0 as HCurID, 0 as HExRate,
+ a.FSALERID as HEmpID, 0 as HManagerID, isnull(a.FSALEDEPTID,0) as HDeptID, 'CLOUD瀵煎叆' as HExplanation, a.FNOTE as HRemark,
+ ''as HInnerBillNo, a.FAPPROVERID as HChecker, a.FAPPROVEDATE as HCheckDate, a.FCREATORID as HMaker, a.FCREATEDATE as HMakeDate,
+ a.FCLOSERID as HCloseMan, a.FCLOSEDATE as HCloseDate, a.FID as HERPInterID, a.FBILLTYPEID as HERPBillType, a.FSALEORGID as HSALEORGID,
+ a.FSALEGROUPID as HSALEGROUPID, a.FRECEIVEID as HRECEIVEID, a.FSETTLEID as HSETTLEID, a.FCHARGEID as HCHARGEID, a.FHEADLOCID as HHEADLOCID,
+ a.FRECCONTACTID as HRECCONTACTID, isnull(a.FCORRESPONDORGID, 0) as HCORRESPONDORGID, a.FBUSINESSTYPE as HBUSINESSTYPE
+ ,o.FNUMBER as HOrganNumber
+ from T_SAL_ORDER a with(nolock)
+ left join T_ORG_Organizations o with(nolock) on a.FSALEORGID=o.FORGID
+ Where FID={id}
+ ";
DataSet ds = DBServiceHelper.ExecuteDataSet(Context, sql);
DataTable maindt = ds.Tables[1];
DataTable subdt = ds.Tables[0];
diff --git a/zymes/OperationService/zymes_RealessSalSeOutStock.cs b/zymes/OperationService/zymes_RealessSalSeOutStock.cs
index 9940b71..ffbe813 100644
--- a/zymes/OperationService/zymes_RealessSalSeOutStock.cs
+++ b/zymes/OperationService/zymes_RealessSalSeOutStock.cs
@@ -45,55 +45,52 @@
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, 0 HMoney,isnull(a.FSHIPMENTSTOCKID,0) HWHID, isnull(a.FSHIPMENTSTOCKLOCID,0) HSPID,
-a.FNOTE HRemark,isnull(L.FSBILLID,0) HSourceInterID, isnull(L.FSID,0) HSourceEntryID,a.FSRCBILLNO HSourceBillNo,a.FSRCTYPE HSourceBillType,
-0 HSeOrderInterID,e.FSOENTRYID HSeOrderEntryID,a.FORDERNO HSeOrderBillNo, e.FOWNERID HOWNERID, e.FOWNERTYPEID HOWNERTYPEID,
-isnull(fin.FSETTLEORGID,0) HSETTLEORGID, e.FSTOCKBASETRANSQTY HMoveStockQty,e.FSTOCKBASEJOINOUTQTY HRelationQty, a.FAUXPROPID HAuxPropID,
-a.FLot_TEXT HBatchNO,isnull(a.FMTONo,'') HMTONo, a.FID HERPInterID, a.FEntryID HERPEntryID, a.FCUSTMATID HCUSTMATID,
-a.FBASEUNITID HBASEUNITID, a.FBFLOWID HBFLOWID, a.FOUTCONTROL HOUTCONTROL,e.FSTOCKUNITID HSTOCKUNITID,
-e.FROWTYPE 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, isnull(tax.FTAXRATE,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.FID = fin.FID
-left join T_SAL_DELIVERYNOTICEENTRY_LK L with(nolock) on a.FENTRYID=L.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 isnull(a.FAPPROVERID,0)=0 then 1 else 2 end HBillStatus, FCUSTOMERID as HCusID,
-a.FSTOCKERID HManagerID, isnull(a.FDELIVERYDEPTID,0) as HDeptID,a.FNOTE as HRemark, FRECEIVEADDRESS as HAddress, 0 HSSID, 0 HCurID,
-0 HWHID, 1 HExRate,a.FSALESMANID HEmpID, '' as HExplanation, '' as HInnerBillNo, a.FSALEORGID as HSALEORGID,
-FDELIVERYORGID as HDELIVERYORGID, FOWNERID as HOWNERID, FOWNERTYPEID as HOWNERTYPEID, FID as HERPInterID,
-FBILLTYPEID as HERPBillType,isnull(us1.FNAME,'') as HMaker, a.FCREATEDATE as HMakeDate, isnull(us2.FNAME,'') as HChecker,
-a.FAPPROVEDATE as HCheckDate, isnull(us3.FNAME,'') 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, isnull(a.FCORRESPONDORGID,0) as HCORRESPONDORGID, FCARRIAGENO as HCARRIAGENO
-,o.FNUMBER as HOrganNumber
-from T_SAL_DELIVERYNOTICE a with(nolock)
-left join T_SEC_user us1 with(nolock) on a.FCREATORID=us1.FUSERID
-left join T_SEC_user us2 with(nolock) on a.FAPPROVERID=us2.FUSERID
-left join T_SEC_user us3 with(nolock) on a.FCLOSERID=us3.FUSERID
-left join T_ORG_Organizations o with(nolock) on a.FDELIVERYORGID=o.FORGID
-Where FID={id}
-";
+ /*dialect*/
+ select a.FID HInterID, a.FENTRYID HEntryID, a.FMATERIALID HMaterID, a.FUnitID HUnitID,
+ a.FQTY HQty, isnull(f.FPRICE,0) HPrice, 0 HMoney,isnull(a.FSHIPMENTSTOCKID,0) HWHID, isnull(a.FSHIPMENTSTOCKLOCID,0) HSPID,
+ a.FNOTE HRemark,isnull(L.FSBILLID,0) HSourceInterID, isnull(L.FSID,0) HSourceEntryID,a.FSRCBILLNO HSourceBillNo,a.FSRCTYPE HSourceBillType,
+ 0 HSeOrderInterID,e.FSOENTRYID HSeOrderEntryID,a.FORDERNO HSeOrderBillNo, e.FOWNERID HOWNERID, e.FOWNERTYPEID HOWNERTYPEID,
+ isnull(fin.FSETTLEORGID,0) HSETTLEORGID, e.FSTOCKBASETRANSQTY HMoveStockQty,e.FSTOCKBASEJOINOUTQTY HRelationQty, a.FAUXPROPID HAuxPropID,
+ a.FLot_TEXT HBatchNO,isnull(a.FMTONo,'') HMTONo, a.FID HERPInterID, a.FEntryID HERPEntryID, a.FCUSTMATID HCUSTMATID,
+ a.FBASEUNITID HBASEUNITID, a.FBFLOWID HBFLOWID, a.FOUTCONTROL HOUTCONTROL,e.FSTOCKUNITID HSTOCKUNITID,
+ e.FROWTYPE 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, isnull(tax.FTAXRATE,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.FID = fin.FID
+ left join T_SAL_DELIVERYNOTICEENTRY_LK L with(nolock) on a.FENTRYID=L.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 isnull(a.FAPPROVERID,0)=0 then 1 else 2 end HBillStatus, FCUSTOMERID as HCusID,
+ a.FSTOCKERID HManagerID, isnull(a.FDELIVERYDEPTID,0) as HDeptID,a.FNOTE as HRemark, FRECEIVEADDRESS as HAddress, 0 HSSID, 0 HCurID,
+ 0 HWHID, 1 HExRate,a.FSALESMANID HEmpID, '' as HExplanation, '' as HInnerBillNo, a.FSALEORGID as HSALEORGID,
+ FDELIVERYORGID as HDELIVERYORGID, FOWNERID as HOWNERID, FOWNERTYPEID as HOWNERTYPEID, FID as HERPInterID,
+ FBILLTYPEID as HERPBillType,isnull(us1.FNAME,'') as HMaker, a.FCREATEDATE as HMakeDate, isnull(us2.FNAME,'') as HChecker,
+ a.FAPPROVEDATE as HCheckDate, isnull(us3.FNAME,'') 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, isnull(a.FCORRESPONDORGID,0) as HCORRESPONDORGID, FCARRIAGENO as HCARRIAGENO
+ ,o.FNUMBER as HOrganNumber
+ from T_SAL_DELIVERYNOTICE a with(nolock)
+ left join T_SEC_user us1 with(nolock) on a.FCREATORID=us1.FUSERID
+ left join T_SEC_user us2 with(nolock) on a.FAPPROVERID=us2.FUSERID
+ left join T_SEC_user us3 with(nolock) on a.FCLOSERID=us3.FUSERID
+ left join T_ORG_Organizations o with(nolock) on a.FDELIVERYORGID=o.FORGID
+ Where FID={id}
+ ";
DataSet ds = DBServiceHelper.ExecuteDataSet(Context, sql);
DataTable maindt = ds.Tables[1];
DataTable subdt = ds.Tables[0];
@@ -134,8 +131,7 @@
{
["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);
//鏂板
var requestPost = new RestRequest("Xs_SeOutStockBill/Xs_SeOutStockBillSaveApi", Method.POST);
diff --git a/zymes/OperationService/zymes_RealessSettleStyle.cs b/zymes/OperationService/zymes_RealessSettleStyle.cs
index 670a210..e53aaa0 100644
--- a/zymes/OperationService/zymes_RealessSettleStyle.cs
+++ b/zymes/OperationService/zymes_RealessSettleStyle.cs
@@ -44,23 +44,19 @@
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_RealessSettleStyle {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,case when a.FFORBIDSTATUS='A' then 'false' else 'true' end as HStopflag,'CLD-ERP瀵煎叆' as HRemark
-,o.FNUMBER as HOrganNumber
-from T_BD_SETTLETYPE a with(nolock)
-inner join T_BD_SETTLETYPE_L l with(nolock) on a.FID=l.FID and FLOCALEID=2052
-left join T_ORG_Organizations o with(nolock) on a.FUSEORGID=o.FORGID
-Where a.FID={id}
-";
+ /*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,case when a.FFORBIDSTATUS='A' then 'false' else 'true' end as HStopflag,'CLD-ERP瀵煎叆' as HRemark
+ ,o.FNUMBER as HOrganNumber
+ from T_BD_SETTLETYPE a with(nolock)
+ inner join T_BD_SETTLETYPE_L l with(nolock) on a.FID=l.FID and FLOCALEID=2052
+ left join T_ORG_Organizations o with(nolock) on a.FUSEORGID=o.FORGID
+ Where a.FID={id}
+ ";
DataTable dt = DBServiceHelper.ExecuteDataSet(Context, sql).Tables[0];
if (dt.Rows.Count == 0)
@@ -89,9 +85,7 @@
{
["model"] = model
};
- //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);
var requestPost = new RestRequest("Gy_SettleStyle/SaveGy_SettleStyleListApi", Method.POST);
requestPost.AddParameter("application/json", JsonConvert.SerializeObject(_jsonRoot), ParameterType.RequestBody);
diff --git a/zymes/OperationService/zymes_RealessStaff.cs b/zymes/OperationService/zymes_RealessStaff.cs
index 6085e11..b2992a6 100644
--- a/zymes/OperationService/zymes_RealessStaff.cs
+++ b/zymes/OperationService/zymes_RealessStaff.cs
@@ -52,16 +52,16 @@
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,o.FNUMBER as HOrganNumber
-from T_HR_EMPINFO a with(nolock)
-inner join T_HR_EMPINFO_L l with(nolock) on a.FID=l.FID and FLOCALEID=2052
-left join T_ORG_Organizations o with(nolock) on a.FUSEORGID=o.FORGID
-Where a.FID={id}
-";
+ /*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,o.FNUMBER as HOrganNumber
+ from T_HR_EMPINFO a with(nolock)
+ inner join T_HR_EMPINFO_L l with(nolock) on a.FID=l.FID and FLOCALEID=2052
+ left join T_ORG_Organizations o with(nolock) on a.FUSEORGID=o.FORGID
+ Where a.FID={id}
+ ";
DataTable dt = DBServiceHelper.ExecuteDataSet(Context, sql).Tables[0];
if (dt.Rows.Count == 0)
{
@@ -89,9 +89,7 @@
{
["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);
var requestPost = new RestRequest("Gy_Staff/SaveGy_StaffListApi", Method.POST);
requestPost.AddParameter("application/json", JsonConvert.SerializeObject(_jsonRoot), ParameterType.RequestBody);
diff --git a/zymes/OperationService/zymes_RealessStock.cs b/zymes/OperationService/zymes_RealessStock.cs
index 97ff4a4..fdb60ed 100644
--- a/zymes/OperationService/zymes_RealessStock.cs
+++ b/zymes/OperationService/zymes_RealessStock.cs
@@ -44,37 +44,33 @@
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_RealessStock {billObj["Id"]} ";
+ {
var id = billObj["Id"].ToString();
string sql = string.Empty;
sql = string.Format(@"
-/*dialect*/
-select a.FSTOCKID as HItemID,a.FSTOCKID 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
-,a.FIsOpenLocation as HSPFlag,a.FSTOCKID as HSPGroupID,a.FAllowMinusQty as HUnderStock,'宸蹭娇鐢�' as HUseFlag
-,getdate() as HMakeTime,a.FCREATEORGID as HCREATEORGID,a.FUSEORGID as HUSEORGID,a.FSTOCKPROPERTY as HSTOCKPROPERTY
-,o.FNUMBER as HOrganNumber
-from T_BD_STOCK a with(nolock)
-inner join T_BD_STOCK_L l with(nolock) on a.FSTOCKID=l.FSTOCKID
-left join T_ORG_Organizations o with(nolock) on a.FUSEORGID=o.FORGID
-Where a.FSTOCKID = {0}
+ /*dialect*/
+ select a.FSTOCKID as HItemID,a.FSTOCKID 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
+ ,a.FIsOpenLocation as HSPFlag,a.FSTOCKID as HSPGroupID,a.FAllowMinusQty as HUnderStock,'宸蹭娇鐢�' as HUseFlag
+ ,getdate() as HMakeTime,a.FCREATEORGID as HCREATEORGID,a.FUSEORGID as HUSEORGID,a.FSTOCKPROPERTY as HSTOCKPROPERTY
+ ,o.FNUMBER as HOrganNumber
+ from T_BD_STOCK a with(nolock)
+ inner join T_BD_STOCK_L l with(nolock) on a.FSTOCKID=l.FSTOCKID
+ left join T_ORG_Organizations o with(nolock) on a.FUSEORGID=o.FORGID
+ Where a.FSTOCKID = {0}
-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.FF100006 = t3.FENTRYID--浠撲綅鍊奸泦鍒楄〃鏄庣粏
-join T_BAS_FLEXVALUESENTRY_L t4 on t3.FENTRYID=t4.FENTRYID
-where t1.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.FF100006 = 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)
@@ -110,8 +106,6 @@
continue;
}
- //string HOrganNumber = Util.GetConfigKey(AppDomain.CurrentDomain.BaseDirectory + "/Config/kdapi.config", "HOrganNumber");
-
//鑾峰彇鍒涘缓浠撳簱浠撲綅鐨勪娇鐢ㄧ粍缁�
DataTable dataTable = LogService.Get_DisPlayOrg(Context, maindt.Rows[0]["HOrganNumber"].ToString());
if (dataTable.Rows.Count == 0)
@@ -143,8 +137,7 @@
{
["model"] = model
};
- //LogService.Write("浠撳簱浠撲綅鍚屾绀轰緥锛�" + JsonConvert.SerializeObject(jsonRoot));
- //string clientUrl = Util.GetConfigKey(AppDomain.CurrentDomain.BaseDirectory + "/Config/kdapi.config", "ClientUrl");//K/3 Cloud 涓氬姟绔欑偣鍦板潃
+
LogService.Write("浠撳簱浠撲綅鍚屾绀轰緥,JsonConvert.SerializeObject(_jsonRoot)," + JsonConvert.SerializeObject(jsonRoot));
var client = new RestSharp.RestClient(http);
var requestPost = new RestRequest("Gy_Warehouse/SaveGy_WarehouseListApi", Method.POST);
diff --git a/zymes/OperationService/zymes_RealessStockStatus.cs b/zymes/OperationService/zymes_RealessStockStatus.cs
index 2105827..13fa248 100644
--- a/zymes/OperationService/zymes_RealessStockStatus.cs
+++ b/zymes/OperationService/zymes_RealessStockStatus.cs
@@ -45,22 +45,20 @@
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.FSTOCKSTATUSID as HItemID,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,'' HHelpCode,'鏈娴�' as HUseFlag
-,a.FCREATEDATE as HMakeTime
-,'' HMakeEmp,'' HCheckEmp,a.FAUDITDATE HCheckTime,'' HModifyEmp,a.FMODIFYDATE HModifyTime,'' HStopEmp,a.FUSEORGID as HUSEORGID,a.FCREATEORGID as HCREATEORGID
-,o.FNUMBER as HOrganNumber
-from t_BD_StockStatus a with(nolock)
-inner join T_BD_STOCKSTATUS_L l with(nolock) on a.FSTOCKSTATUSID=l.FSTOCKSTATUSID
-left join T_ORG_Organizations o with(nolock) on a.FUSEORGID=o.FORGID
-Where a.FSTOCKSTATUSID='{id}'";
+ /*dialect*/
+ select a.FSTOCKSTATUSID as HItemID,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,'' HHelpCode,'鏈娴�' as HUseFlag
+ ,a.FCREATEDATE as HMakeTime
+ ,'' HMakeEmp,'' HCheckEmp,a.FAUDITDATE HCheckTime,'' HModifyEmp,a.FMODIFYDATE HModifyTime,'' HStopEmp,a.FUSEORGID as HUSEORGID,a.FCREATEORGID as HCREATEORGID
+ ,o.FNUMBER as HOrganNumber
+ from t_BD_StockStatus a with(nolock)
+ inner join T_BD_STOCKSTATUS_L l with(nolock) on a.FSTOCKSTATUSID=l.FSTOCKSTATUSID
+ left join T_ORG_Organizations o with(nolock) on a.FUSEORGID=o.FORGID
+ Where a.FSTOCKSTATUSID='{id}'";
DataTable dt = DBServiceHelper.ExecuteDataSet(Context, sql).Tables[0];
if (dt.Rows.Count == 0)
@@ -92,9 +90,6 @@
{
["model"] = model
};
- //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);
var requestPost = new RestRequest("Gy_StockStatus/SaveGy_StockStatusListApi", Method.POST);
requestPost.AddParameter("application/json", JsonConvert.SerializeObject(_jsonRoot), ParameterType.RequestBody);
diff --git a/zymes/OperationService/zymes_RealessSupplier.cs b/zymes/OperationService/zymes_RealessSupplier.cs
index 53ffba7..cd81ba0 100644
--- a/zymes/OperationService/zymes_RealessSupplier.cs
+++ b/zymes/OperationService/zymes_RealessSupplier.cs
@@ -52,15 +52,15 @@
var id = billObj["Id"].ToString();
string sql = string.Empty;
sql = $@"
-/*dialect*/
-select a.FSUPPLIERID as HItemID,a.FSUPPLIERID as HERPItemID,a.FNumber as HNumber,l.FName as HName,a.fnumber as HShortNumber,0 as HParentID
-,1 as HLevel,1 as HEndFlag,case when a.FFORBIDSTATUS='A' then 0 else 1 end as HStopflag,'CLD-ERP瀵煎叆' as HRemark,'宸蹭娇鐢�' as HUseFlag,getdate() as HMakeTime
-,a.FCREATEORGID as HCREATEORGID,a.FUSEORGID as HUSEORGID,o.FNUMBER as HOrganNumber
-from T_BD_SUPPLIER a with(nolock)
-inner join T_BD_SUPPLIER_L l with(nolock) on a.FSUPPLIERID=l.FSUPPLIERID and l.FLOCALEID=2052
-left join T_ORG_Organizations o with(nolock) on a.FUSEORGID=o.FORGID
-Where a.FSUPPLIERID = {id}
-";
+ /*dialect*/
+ select a.FSUPPLIERID as HItemID,a.FSUPPLIERID as HERPItemID,a.FNumber as HNumber,l.FName as HName,a.fnumber as HShortNumber,0 as HParentID
+ ,1 as HLevel,1 as HEndFlag,case when a.FFORBIDSTATUS='A' then 0 else 1 end as HStopflag,'CLD-ERP瀵煎叆' as HRemark,'宸蹭娇鐢�' as HUseFlag,getdate() as HMakeTime
+ ,a.FCREATEORGID as HCREATEORGID,a.FUSEORGID as HUSEORGID,o.FNUMBER as HOrganNumber
+ from T_BD_SUPPLIER a with(nolock)
+ inner join T_BD_SUPPLIER_L l with(nolock) on a.FSUPPLIERID=l.FSUPPLIERID and l.FLOCALEID=2052
+ left join T_ORG_Organizations o with(nolock) on a.FUSEORGID=o.FORGID
+ Where a.FSUPPLIERID = {id}
+ ";
DataTable dt = DBServiceHelper.ExecuteDataSet(Context, sql).Tables[0];
if (dt.Rows.Count == 0)
{
@@ -88,8 +88,7 @@
{
["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);
var requestPost = new RestRequest("Gy_Supplier/SaveGy_SupplierListApi", Method.POST);
requestPost.AddParameter("application/json", JsonConvert.SerializeObject(_jsonRoot), ParameterType.RequestBody);
diff --git a/zymes/OperationService/zymes_RealessTaxMIX.cs b/zymes/OperationService/zymes_RealessTaxMIX.cs
index 6c96219..878cc15 100644
--- a/zymes/OperationService/zymes_RealessTaxMIX.cs
+++ b/zymes/OperationService/zymes_RealessTaxMIX.cs
@@ -46,20 +46,44 @@
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_RealessTaxMIX {billObj["Id"]} ";
- DataSet ds = DBServiceHelper.ExecuteDataSet(Context, sql);
- DataTable maindt = ds.Tables[1];
+ {
+ var id = billObj["Id"].ToString();
+ string sql = string.Empty;
+ sql = $@"
+ /*dialect*/
+ select a.FENTRYID AS HItemID,a.FTAXMIXID as HTaxMixID,a.FTAXBENCHMARK as HTAXBENCHMARK,a.FTAXRATEID as FTAXRATEID
+ from T_BD_TAXMIXENTRY a with(nolock)
+ Where a.FTAXMIXID={id}
+ select a.FTAXMIXID HItemID ,a.FNUMBER HNumber,l.FNAME HName,a.FNUMBER HShortNumber,0 HParentID,1 HLevel,
+ 'true' as HEndFlag,case when a.FFORBIDSTATUS='A' then 'false' else 'true' end as HStopflag,'CLD-ERP瀵煎叆' as HRemark,
+ '' HHelpCode,'false' HUseFlag,a.FCREATEDATE HMakeTime,'' HMakeEmp,'' HCheckEmp,a.FCREATEDATE HCheckTime,'' HModifyEmp,
+ a.FMODIFYDATE HModifyTime,'' HStopEmp,a.FSTARTDATE HStopTime,a.FUSEORGID HUSEORGID,a.FCREATEORGID HCREATEORGID
+ from T_BD_TAXMIX a with(nolock)
+ inner join T_BD_TAXMIX_L l on a.FTAXMIXID = l.FTAXMIXID
+ Where a.FTAXMIXID={id}
+ ";
+ DataSet ds = DBServiceHelper.ExecuteDataSet(Context, sql);
DataTable subdt = ds.Tables[0];
+ DataTable maindt = ds.Tables[1];
+
if (maindt.Rows.Count == 0 || subdt.Rows.Count == 0)
{
LogService.Write("绋庣巼缁勫悎鍚屾寮傚父锛�" + sql);
continue;
}
+
+
+ //鑾峰彇渚涘簲鍟嗙殑浣跨敤缁勭粐
+ DataTable dataTable = LogService.Get_DisPlayOrg(Context, subdt.Rows[0]["HUSEORGID"].ToString());
+ if (dataTable.Rows.Count == 0)
+ continue;
+
+ if (dataTable.Rows[0]["FISNEEDPUSH"].ToString() == "0")
+ continue;
+
+ string http = dataTable.Rows[0]["F_RCZU_MesIp"].ToString();
+
+
JArray array = new JArray();//鏄庣粏琛�
foreach (DataRow dr in subdt.Rows)
{
@@ -81,8 +105,10 @@
{
["model"] = model
};
- string clientUrl = Util.GetConfigKey(AppDomain.CurrentDomain.BaseDirectory + "/Config/kdapi.config", "ClientUrl");//K/3 Cloud 涓氬姟绔欑偣鍦板潃
- var client = new RestSharp.RestClient(clientUrl);
+
+
+
+ var client = new RestSharp.RestClient(http);
//鏂板
var requestPost = new RestRequest("Gy_TaxMIXMain/SaveGy_TaxMIXMainListApi", Method.POST);
requestPost.AddParameter("application/json", JsonConvert.SerializeObject(jsonRoot), ParameterType.RequestBody);
@@ -91,7 +117,7 @@
if (!contentPost.Contains("鎴愬姛"))
{
LogService.Write("绋庣巼缁勫悎鍚屾寮傚父,POST鏂瑰紡鑾峰彇缁撴灉," + billObj["Id"] + "," + responsePost.ErrorMessage);
- LogService.Write("绋庣巼缁勫悎鍚屾寮傚父,POST," + clientUrl + "Gy_TaxMIXMain/SaveGy_TaxMIXMainListApi");
+ LogService.Write("绋庣巼缁勫悎鍚屾寮傚父,POST,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 efbb7a4..2318312 100644
--- a/zymes/OperationService/zymes_RealessTaxRate.cs
+++ b/zymes/OperationService/zymes_RealessTaxRate.cs
@@ -44,22 +44,19 @@
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 as HItemID,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,'' HHelpCode,'鏈娴�' as HUseFlag,a.FCREATEDATE as HMakeTime
-,'' HMakeEmp,'' HCheckEmp,a.FAPPROVEDATE HCheckTime,'' HModifyEmp,a.FMODIFYDATE HModifyTime,'' HStopEmp,a.FUSEORGID as HUSEORGID,a.FCREATEORGID as HCREATEORGID
-,o.FNUMBER as HOrganNumber
-from T_BD_TAXRATE a with(nolock)
-inner join T_BD_TAXRATE_L l with(nolock) on a.FID=l.FID and FLOCALEID=2052
-left join T_ORG_Organizations o with(nolock) on a.FUSEORGID=o.FORGID
-Where a.FID='{id}'";
+ /*dialect*/
+ select a.FID as HItemID,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,'' HHelpCode,'鏈娴�' as HUseFlag,a.FCREATEDATE as HMakeTime
+ ,'' HMakeEmp,'' HCheckEmp,a.FAPPROVEDATE HCheckTime,'' HModifyEmp,a.FMODIFYDATE HModifyTime,'' HStopEmp,a.FUSEORGID as HUSEORGID,a.FCREATEORGID as HCREATEORGID
+ ,o.FNUMBER as HOrganNumber
+ from T_BD_TAXRATE a with(nolock)
+ inner join T_BD_TAXRATE_L l with(nolock) on a.FID=l.FID and FLOCALEID=2052
+ left join T_ORG_Organizations o with(nolock) on a.FUSEORGID=o.FORGID
+ Where a.FID='{id}'";
DataTable dt = DBServiceHelper.ExecuteDataSet(Context, sql).Tables[0];
if (dt.Rows.Count == 0)
@@ -91,9 +88,6 @@
{
["model"] = model
};
- //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);
var requestPost = new RestRequest("Gy_TaxRate/SaveGy_TaxRateListApi", Method.POST);
requestPost.AddParameter("application/json", JsonConvert.SerializeObject(_jsonRoot), ParameterType.RequestBody);
diff --git a/zymes/OperationService/zymes_RealessUnit.cs b/zymes/OperationService/zymes_RealessUnit.cs
index c9c37d7..582995f 100644
--- a/zymes/OperationService/zymes_RealessUnit.cs
+++ b/zymes/OperationService/zymes_RealessUnit.cs
@@ -44,22 +44,18 @@
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_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,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}
-";
+ /*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,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}
+ ";
DataTable dt = DBServiceHelper.ExecuteDataSet(Context, sql).Tables[0];
if (dt.Rows.Count == 0)
{
@@ -67,12 +63,8 @@
continue;
}
- string HOrganNumber = Util.GetConfigKey(AppDomain.CurrentDomain.BaseDirectory + "/Config/kdapi.config", "HOrganNumber");
-
- LogService.Write("缁勭粐:" + HOrganNumber);
-
//鑾峰彇鍗曚綅鐨勪娇鐢ㄧ粍缁�
- DataTable dataTable = LogService.Get_DisPlayOrg(Context, HOrganNumber);
+ DataTable dataTable = LogService.Get_DisPlayOrg(Context, dt.Rows[0]["HUSEORGID"].ToString());
if (dataTable.Rows.Count == 0)
continue;
@@ -91,10 +83,7 @@
{
["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://47.96.97.237/API/");
+
var client = new RestSharp.RestClient(http);
var requestPost = new RestRequest("Gy_Unit/SaveGy_UnitListApi", Method.POST);
requestPost.AddParameter("application/json", JsonConvert.SerializeObject(_jsonRoot), ParameterType.RequestBody);
diff --git a/zymes/OperationService/zymes_RealessWork.cs b/zymes/OperationService/zymes_RealessWork.cs
index 23051af..06d92e9 100644
--- a/zymes/OperationService/zymes_RealessWork.cs
+++ b/zymes/OperationService/zymes_RealessWork.cs
@@ -52,15 +52,15 @@
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,o.FNUMBER as HOrganNumber
-from T_ENG_PROCESS a with(nolock)
-inner join T_ENG_PROCESS_L l with(nolock) on a.FID=l.FID and FLOCALEID=2052
-left join T_ORG_Organizations o with(nolock) on a.FUSEORGID=o.FORGID
-Where a.FID={id}
-";
+ /*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,o.FNUMBER as HOrganNumber
+ from T_ENG_PROCESS a with(nolock)
+ inner join T_ENG_PROCESS_L l with(nolock) on a.FID=l.FID and FLOCALEID=2052
+ left join T_ORG_Organizations o with(nolock) on a.FUSEORGID=o.FORGID
+ Where a.FID={id}
+ ";
DataTable dt = DBServiceHelper.ExecuteDataSet(Context, sql).Tables[0];
if (dt.Rows.Count == 0)
{
@@ -88,9 +88,7 @@
{
["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);
var requestPost = new RestRequest("Gy_Work/SaveGy_WorkListApi", Method.POST);
requestPost.AddParameter("application/json", JsonConvert.SerializeObject(_jsonRoot), ParameterType.RequestBody);
diff --git a/zymes/zymes_Project.csproj b/zymes/zymes_Project.csproj
index 92b3f13..a415740 100644
--- a/zymes/zymes_Project.csproj
+++ b/zymes/zymes_Project.csproj
@@ -8,7 +8,7 @@
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>zymes_Project</RootNamespace>
- <AssemblyName>zymes_Project_%28V1.0%29_9010_20240626_yangle</AssemblyName>
+ <AssemblyName>zymes_Project_%28V1.0%29_9010_20250812_zrg</AssemblyName>
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<Deterministic>true</Deterministic>
@@ -36,27 +36,27 @@
<ItemGroup>
<Reference Include="Kingdee.BOS, Version=7.5.1507.2, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\鍔炲叕\K3Cloud\WebSite\bin\Kingdee.BOS.dll</HintPath>
+ <HintPath>packages\ZD.Cloud.Common.7.5.1.7\lib\net452\Kingdee.BOS.dll</HintPath>
</Reference>
<Reference Include="Kingdee.BOS.App, Version=7.5.1507.2, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\鍔炲叕\K3Cloud\WebSite\bin\Kingdee.BOS.App.dll</HintPath>
+ <HintPath>packages\ZD.Cloud.Common.7.5.1.7\lib\net452\Kingdee.BOS.App.dll</HintPath>
</Reference>
<Reference Include="Kingdee.BOS.Contracts, Version=7.5.1507.2, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\鍔炲叕\K3Cloud\WebSite\bin\Kingdee.BOS.Contracts.dll</HintPath>
+ <HintPath>packages\ZD.Cloud.Common.7.5.1.7\lib\net452\Kingdee.BOS.Contracts.dll</HintPath>
</Reference>
<Reference Include="Kingdee.BOS.Core, Version=7.5.1507.2, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\鍔炲叕\K3Cloud\WebSite\bin\Kingdee.BOS.Core.dll</HintPath>
+ <HintPath>packages\ZD.Cloud.Common.7.5.1.7\lib\net452\Kingdee.BOS.Core.dll</HintPath>
</Reference>
<Reference Include="Kingdee.BOS.DataEntity, Version=7.5.1507.2, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\鍔炲叕\K3Cloud\WebSite\bin\Kingdee.BOS.DataEntity.dll</HintPath>
+ <HintPath>packages\ZD.Cloud.Common.7.5.1.7\lib\net452\Kingdee.BOS.DataEntity.dll</HintPath>
</Reference>
<Reference Include="Kingdee.BOS.ServiceHelper, Version=7.5.1507.2, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\鍔炲叕\K3Cloud\WebSite\bin\Kingdee.BOS.ServiceHelper.dll</HintPath>
+ <HintPath>packages\ZD.Cloud.Common.7.5.1.7\lib\net452\Kingdee.BOS.ServiceHelper.dll</HintPath>
</Reference>
<Reference Include="log4net, Version=1.2.10.0, Culture=neutral, PublicKeyToken=1b44e1d426115821, processorArchitecture=MSIL">
<HintPath>packages\log4net.1.2.10\lib\2.0\log4net.dll</HintPath>
diff --git a/zymes/zymes_Project.csproj.user b/zymes/zymes_Project.csproj.user
index 9b86104..c10e84b 100644
--- a/zymes/zymes_Project.csproj.user
+++ b/zymes/zymes_Project.csproj.user
@@ -1,6 +1,6 @@
锘�<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
- <ProjectView>ShowAllFiles</ProjectView>
+ <ProjectView>ProjectFiles</ProjectView>
</PropertyGroup>
</Project>
\ No newline at end of file
--
Gitblit v1.9.1