From d2b092a11c4effc30c7e6ae6fcf8f0f450dee865 Mon Sep 17 00:00:00 2001
From: llj <132905093+newwwwwwtree@users.noreply.github.com>
Date: 星期二, 21 十月 2025 16:42:58 +0800
Subject: [PATCH] 辅助属性值,供应商
---
zymes/OperationService/zymes_RealessSupplier.cs | 27 ++++++++++++++++++++++++---
zymes/OperationService/zymes_RealessProperty.cs | 30 +++++++++++++++++++++++-------
2 files changed, 47 insertions(+), 10 deletions(-)
diff --git a/zymes/OperationService/zymes_RealessProperty.cs b/zymes/OperationService/zymes_RealessProperty.cs
index 2c97063..ce9cf34 100644
--- a/zymes/OperationService/zymes_RealessProperty.cs
+++ b/zymes/OperationService/zymes_RealessProperty.cs
@@ -62,18 +62,21 @@
inner join (select distinct min(FID) FID,FF100002 from T_BD_FLEXSITEMDETAILV with(nolock) group by FF100002) as f on a.FENTRYID=f.FF100002
left join T_ORG_Organizations oo on oo.FORGID='100038'
left JOIN T_BD_FLEXAUXPROPERTYENTITY tb on tb.FID=f.FID
+ INNER JOIN T_BD_AUXPTYVALUE pp on pp.FMATERIALAUXPROPERTYID=p.FID
where b.FLOCALEID=2052
- and a.FFORBIDSTATUS='A' and tb.FENTRYID={id}
- select DISTINCT b.FENTRYID HItemID ,b.FENTRYID HERPItemID, f.FID HAuxpuID,a.FMATERIALID HMaterID,b.FISDEFAULT HISDefault,b.FISDISABLE HStopflag,b.FDISPLAYSEQ HSno
+ and a.FFORBIDSTATUS='A'
+
+
+ select DISTINCT b.FENTRYID HItemID ,b.FENTRYID HERPItemID, f.FID HAuxpuID,a.FMATERIALID HMaterID,b.FISDEFAULT HISDefault,'false' HStopflag,b.FDISPLAYSEQ HSno
from T_BD_AUXPTYVALUE a with(nolock)
inner join T_BD_AUXPTYVALUEENTITY b with(nolock) on a.FAUXPTYVALUEID=b.FAUXPTYVALUEID
inner join T_BD_FLEXSITEMDETAILV f with(nolock) on b.FAUXPTYID=f.FF100002
left JOIN T_BD_FLEXAUXPROPERTYENTITY tb on tb.FID=f.FID
- where tb.FENTRYID={id}
+ where a.FAUXPTYVALUEID={id}
";
- // Where f.FID = {id} Where f.FID = {id}
- DataTable dt = DBServiceHelper.ExecuteDataSet(Context, sql).Tables[0];
- DataTable dtDetail = DBServiceHelper.ExecuteDataSet(Context, sql).Tables[1];
+ // Where f.FID = {id} Where f.FID = {id} left JOIN T_BD_FLEXAUXPROPERTY p on p.FID=a.FMATERIALAUXPROPERTYID
+ DataTable dtDetail = DBServiceHelper.ExecuteDataSet(Context, sql).Tables[0];
+ DataTable dt = DBServiceHelper.ExecuteDataSet(Context, sql).Tables[1];
if (dt.Rows.Count == 0)
{
@@ -96,22 +99,35 @@
continue;
}
string http = dataTable.Rows[0]["F_RCZU_MesIp"].ToString();
+ if (!http.EndsWith("/"))
+ http += "/";
LogService.Write($"MES IP鍦板潃閰嶇疆: {http}");
LogService.Write("缁勭粐杩囨护宸茶繃");
+ JArray array = new JArray();//
+ foreach (DataRow dr1 in dtDetail.Rows)
+ {
+ JObject fentrymodel = new JObject();
+ foreach (DataColumn column in dtDetail.Columns)
+ {
+ fentrymodel.Add(column.ColumnName, dr1[column.ColumnName].ToString());
+ }
+ array.Add(fentrymodel);
+ }
DataRow dr = dt.Rows[0];
JObject model = new JObject();
foreach (DataColumn column in dt.Columns)
{
model.Add(column.ColumnName, dr[column.ColumnName].ToString());
}
+ model.Add("HENTRY", array);
JObject _jsonRoot = new JObject()
{
["model"] = model
};
-
var client = new RestSharp.RestClient(http);
LogService.Write("杩涘叆api");
var requestPost = new RestRequest("Gy_Property/SaveGy_PropertyListApi", Method.POST);
+ LogService.Write(requestPost);
requestPost.AddParameter("application/json", JsonConvert.SerializeObject(_jsonRoot), ParameterType.RequestBody);
IRestResponse responsePost = client.Execute(requestPost);
var contentPost = responsePost.Content;
diff --git a/zymes/OperationService/zymes_RealessSupplier.cs b/zymes/OperationService/zymes_RealessSupplier.cs
index cd81ba0..d6b7db7 100644
--- a/zymes/OperationService/zymes_RealessSupplier.cs
+++ b/zymes/OperationService/zymes_RealessSupplier.cs
@@ -60,14 +60,25 @@
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}
+
+ select a.FCONTACTID HItemID ,a.FCONTACTNUMBER HNumber,a.FCONTACT HName,a.FCONTACTNUMBER HShortNumber,0 HParentID,1 HLevel
+ ,'true' HEndFlag,'false' HStopflag,'CLD-ERP瀵煎叆' HRemark,'宸蹭娇鐢�' HUseFlag,a.FISDEFAULT HIsDefault,0 HUSEORGID,0 HCREATEORGID
+ from T_BD_SUPPLIERCONTACT a with(nolock)
+ INNER JOIN AIS20210811135644..T_BD_SUPPLIER b on a.FSUPPLIERID=b.FSUPPLIERID
+ where b.FSUPPLIERID = {id}
";
- DataTable dt = DBServiceHelper.ExecuteDataSet(Context, sql).Tables[0];
+ LogService.Write(sql);
+ DataSet ds = DBServiceHelper.ExecuteDataSet(Context, sql);
+
+ DataTable dt = ds.Tables[0];
+ DataTable dtDetail = ds.Tables[1];
+
if (dt.Rows.Count == 0)
{
LogService.Write("渚涘簲鍟嗗悓姝ュ紓甯革細" + sql);
continue;
}
-
+ LogService.Write($"渚涘簲鍟嗚仈绯讳汉sql鏁伴噺{dtDetail.Rows.Count}");
//鑾峰彇渚涘簲鍟嗙殑浣跨敤缁勭粐
DataTable dataTable = LogService.Get_DisPlayOrg(Context, dt.Rows[0]["HOrganNumber"].ToString());
if (dataTable.Rows.Count == 0)
@@ -77,13 +88,23 @@
continue;
string http = dataTable.Rows[0]["F_RCZU_MesIp"].ToString();
-
+ JArray array = new JArray();//
+ foreach (DataRow dr1 in dtDetail.Rows)
+ {
+ JObject fentrymodel = new JObject();
+ foreach (DataColumn column in dtDetail.Columns)
+ {
+ fentrymodel.Add(column.ColumnName, dr1[column.ColumnName].ToString());
+ }
+ array.Add(fentrymodel);
+ }
DataRow dr = dt.Rows[0];
JObject model = new JObject();
foreach (DataColumn column in dt.Columns)
{
model.Add(column.ColumnName, dr[column.ColumnName].ToString());
}
+ model.Add("HENTRY", array);
JObject _jsonRoot = new JObject()
{
["model"] = model
--
Gitblit v1.9.1