From 37fc700892a509346d5be0a1af2d3de1fe8d3a9e Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期二, 20 八月 2024 18:38:10 +0800
Subject: [PATCH] 一些更改
---
Tiger.Business.MES/iERP/U9C_MES.cs | 180 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 173 insertions(+), 7 deletions(-)
diff --git a/Tiger.Business.MES/iERP/U9C_MES.cs b/Tiger.Business.MES/iERP/U9C_MES.cs
index cbea335..a422654 100644
--- a/Tiger.Business.MES/iERP/U9C_MES.cs
+++ b/Tiger.Business.MES/iERP/U9C_MES.cs
@@ -56,6 +56,8 @@
IS_ACTIVE = "Y",
IS_PROD = ((string)di["Code"]).StartsWith("2") ? "Y" : "N",
AUTH_ORG = orgs.Where(x => x.ID == orgId).Select(q => q.ORG_CODE).FirstOrDefault(),
+ CUST_PROD_CODE = di["CustomerItem"] == null ? "" : di["CustomerItem"].ToString(),
+ RULE_CODE = di["BarRule"] == null ? "" : di["BarRule"].ToString(),
};
items.Add(basItem);
}
@@ -63,7 +65,7 @@
}
Logger.Scheduler.Info($"鐗╂枡淇℃伅瀛樺叆瀹炰綋涓紝鎬绘暟锛歔{items.Count}]");
db = Biz.Db;
- var LastRun = db.Queryable<SYS_PARAM>().Where(q => q.PRMG_CODE == "Interface_LastRun" && q.PARAM_CODE == "GetItem_LastRun").Single();
+ var LastRun = await db.Queryable<SYS_PARAM>().Where(q => q.PRMG_CODE == "Interface_LastRun" && q.PARAM_CODE == "GetItem_LastRun").SingleAsync();
LastRun.PARAM_VALUE = (input.endTime.ToDateTime() - DateTime.Now).TotalMinutes > 0 ? LastRun.PARAM_VALUE : input.endTime;
var dbTran = db.UseTran(() =>
{
@@ -102,7 +104,7 @@
}
/// <summary>
- /// 鑾峰彇宸ュ崟淇℃伅
+ /// 鍚屾宸ュ崟淇℃伅
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
@@ -140,8 +142,19 @@
STATUS = 0,
AUTH_ORG = orgs.Where(x => x.ID == orgId).Select(q => q.ORG_CODE).FirstOrDefault(),
SALES_ORDER = di["SrcDoc_SrcDocNo"] == null ? "" : di["SrcDoc_SrcDocNo"].ToString(),
+ SERIAL_NO = di["MoSerial"] == null ? "" : di["MoSerial"].ToString(),
+ SN_PREFIX = di["InBarHead"] == null ? "" : di["InBarHead"].ToString(),
+ CUST_PREFIX = di["OutBarHead"] == null ? "" : di["OutBarHead"].ToString(),
};
- items.Add(woItem);
+ if (!Biz.Db.Queryable<BIZ_MES_WO>().Any(x => x.ORDER_NO == woItem.ORDER_NO && (x.STATUS > 0 || x.ROUTE_STATUS > 0)))
+ {
+ items.Add(woItem);
+ }
+ else
+ {
+ var _wo = await Biz.Db.Queryable<BIZ_MES_WO>().Where(x => x.ORDER_NO == woItem.ORDER_NO).FirstAsync();
+ Logger.Scheduler.Info($"宸ュ崟[{woItem.ORDER_NO}]淇℃伅瀛樺湪骞朵笖鐘舵�佷笉鏄垵濮嬪寲锛屾垨鑰呭伐鑹哄凡缁忛厤缃�傜姸鎬乕{EnumHelper.GetDesc(EnumHelper.GetEnum<BIZ_MES_WO.STATUSs>(_wo.STATUS))}]锛屽伐鑹洪厤缃姸鎬乕{EnumHelper.GetDesc(EnumHelper.GetEnum<BIZ_MES_WO.ROUTE_STATUSs>(_wo.ROUTE_STATUS))}]");
+ }
}
}
}
@@ -186,7 +199,7 @@
}
/// <summary>
- /// 鑾峰彇瀹㈡埛淇℃伅
+ /// 鍚屾瀹㈡埛淇℃伅
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
@@ -198,7 +211,7 @@
Logger.Scheduler.Info($"{input.triggerDetail}");
DbClient db = Biz.DataSource["YadaU9C"].Client;
var list = db.Queryable<dynamic>().AS("mes_Customer").Where("ModifiedOn > @startTime And ModifiedOn < @endTime", new { startTime = input.startTime, endTime = input.endTime }).ToList();
- var orgs = Biz.Db.Queryable<SYS_ORGANIZATION>().ToList();
+ var orgs = await Biz.Db.Queryable<SYS_ORGANIZATION>().ToListAsync();
List<BAS_CUSTOMER> items = new();
if (list != null && list.Count > 0)
{
@@ -218,6 +231,8 @@
CREATE_TIME = di["CreatedOn"].ToDateTime(),
UPDATE_TIME = di["ModifiedOn"].ToDateTime(),
AUTH_ORG = orgs.Where(x => x.ID == orgId).Select(q => q.ORG_CODE).FirstOrDefault(),
+ SEARCH_CODE = di["SearchCode"] == null ? "" : di["SearchCode"].ToString(),
+ SHORT_NAME = di["ShortName"] == null ? "" : di["ShortName"].ToString(),
};
items.Add(custItem);
}
@@ -263,9 +278,160 @@
return action;
}
- public Task<ApiAction> GetSupplier(GetSupplierInput input)
+ /// <summary>
+ /// 鍚屾渚涘簲鍟�
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ public async Task<ApiAction> GetSupplier(GetSupplierInput input)
{
- throw new NotImplementedException();
+ var action = new ApiAction();
+ Logger.Scheduler.Info($"渚涘簲鍟嗕俊鎭紑濮嬪悓姝ャ�傘�傘�傛暟鎹鏌ヨ繘琛屼腑銆傘�傘��");
+ Logger.Scheduler.Info($"{input.triggerDetail}");
+ DbClient db = Biz.DataSource["YadaU9C"].Client;
+ var list = db.Queryable<dynamic>().AS("mes_Supplier").Where("ModifiedOn > @startTime And ModifiedOn < @endTime", new { startTime = input.startTime, endTime = input.endTime }).ToList();
+ var orgs = await Biz.Db.Queryable<SYS_ORGANIZATION>().ToListAsync();
+ List<BAS_SUPPLIER> items = new();
+ if (list != null && list.Count > 0)
+ {
+ foreach (var item in list)
+ {
+ var d = item as System.Dynamic.ExpandoObject;
+ var di = d as IDictionary<string, object>;
+ di = di?.ToDictionary(x => x.Key, x => x.Value);
+ if (di != null)
+ {
+ var orgId = di["Org"] == null ? "" : di["Org"].ToString();
+ BAS_SUPPLIER suppItem = new()
+ {
+ SUPP_CODE = di["Code"] == null ? "" : di["Code"].ToString(),
+ SUPP_NAME_CN = di["Name"] == null ? "" : di["Name"].ToString(),
+ CREATE_TIME = di["CreatedOn"].ToDateTime(),
+ UPDATE_TIME = di["ModifiedOn"].ToDateTime(),
+ AUTH_ORG = orgs.Where(x => x.ID == orgId).Select(q => q.ORG_CODE).FirstOrDefault(),
+ };
+ items.Add(suppItem);
+ }
+ }
+ }
+ Logger.Scheduler.Info($"渚涘簲鍟嗕俊鎭瓨鍏ュ疄浣撲腑锛屾�绘暟锛歔{items.Count}]");
+ db = Biz.Db;
+ var LastRun = db.Queryable<SYS_PARAM>().Where(q => q.PRMG_CODE == "Interface_LastRun" && q.PARAM_CODE == "Vender_LastTime").Single();
+ LastRun.PARAM_VALUE = (input.endTime.ToDateTime() - DateTime.Now).TotalMinutes > 0 ? LastRun.PARAM_VALUE : input.endTime;
+ var dbTran = db.UseTran(() =>
+ {
+ db.Storageable(LastRun, "U9C_MES_GetCustomer").ExecuteCommand();
+ if (items.Any())
+ {
+ if (items.Count > 150)
+ {
+ db.Utilities.PageEach(items, 1000, pageList =>
+ {
+ var y = db.Storageable(pageList, "U9C")
+ .WhereColumns(t => new { t.SUPP_CODE, t.GHOST_ROW })
+ .ToStorage();
+ y.BulkCopy();
+ y.BulkUpdate();
+ });
+ }
+ else
+ {
+ var s = db.Storageable(items, "U9C")
+ .WhereColumns(t => new { t.SUPP_CODE, t.GHOST_ROW })
+ .ToStorage();
+ s.AsInsertable.ExecuteCommand();
+ s.AsUpdateable.IgnoreColumns(x => x.ID).ExecuteCommand();
+ }
+ }
+
+ });
+ if (!dbTran.IsSuccess)
+ {
+ action.CatchExceptionWithLog(dbTran.ErrorException, $"鏁版嵁澶勭悊澶辫触");
+ Logger.Scheduler.Error(action.Message);
+ }
+ Logger.Scheduler.Info($"渚涘簲鍟嗕俊鎭瓨鍏ユ暟鎹簱锛屾�绘暟锛歔{items.Count}]");
+ return action;
+ }
+
+ /// <summary>
+ /// 鍚屾瀹㈡埛鏉＄爜
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ public async Task<ApiAction> GetCustBarCode(GetCustBarcodeInput input)
+ {
+ var action = new ApiAction();
+ Logger.Scheduler.Info($"瀹㈡埛鏉＄爜淇℃伅寮�濮嬪悓姝ャ�傘�傘�傛暟鎹鏌ヨ繘琛屼腑銆傘�傘��");
+ Logger.Scheduler.Info($"{input.triggerDetail}");
+ DbClient db = Biz.DataSource["YadaU9C"].Client;
+ var list = db.Queryable<dynamic>().AS("mes_MoBarCode").Where("ModifiedOn > @startTime And ModifiedOn < @endTime", new { startTime = input.startTime, endTime = input.endTime }).ToList();
+ List<MES_CUST_SN> items = new();
+ if (list != null && list.Count > 0)
+ {
+ foreach (var item in list)
+ {
+ var d = item as System.Dynamic.ExpandoObject;
+ var di = d as IDictionary<string, object>;
+ di = di?.ToDictionary(x => x.Key, x => x.Value);
+ if (di != null)
+ {
+ if (di["MoDoc"] != null)
+ {
+ var _MES_WO = await Biz.Db.Queryable<BIZ_MES_WO>().Where(x => x.ORDER_NO == di["MoDoc"].ToString()).FirstAsync();
+ MES_CUST_SN snItem = new()
+ {
+ CUST_CODE = _MES_WO?.CUST_CODE ?? "",
+ WORK_ORDER = di["MoDoc"].ToString(),
+ CUST_SN = di["OutBarCode"] == null ? "" : di["OutBarCode"].ToString(),
+ FLOW_SN = di["InBarCode"] == null ? "" : di["InBarCode"].ToString(),
+ CREATE_TIME = di["CreatedOn"].ToDateTime(),
+ UPDATE_TIME = di["ModifiedOn"].ToDateTime(),
+ AUTH_ORG = _MES_WO?.AUTH_ORG,
+ };
+ items.Add(snItem);
+ }
+ }
+ }
+ }
+ Logger.Scheduler.Info($"瀹㈡埛鏉＄爜淇℃伅瀛樺叆瀹炰綋涓紝鎬绘暟锛歔{items.Count}]");
+ db = Biz.Db;
+ var LastRun = db.Queryable<SYS_PARAM>().Where(q => q.PRMG_CODE == "Interface_LastRun" && q.PARAM_CODE == "GetCustBar_LastTime").Single();
+ LastRun.PARAM_VALUE = (input.endTime.ToDateTime() - DateTime.Now).TotalMinutes > 0 ? LastRun.PARAM_VALUE : input.endTime;
+ var dbTran = db.UseTran(() =>
+ {
+ db.Storageable(LastRun, "U9C_MES_GetCustomer").ExecuteCommand();
+ if (items.Any())
+ {
+ if (items.Count > 150)
+ {
+ db.Utilities.PageEach(items, 1000, pageList =>
+ {
+ var y = db.Storageable(pageList, "U9C")
+ .WhereColumns(t => new { t.CUST_SN, t.GHOST_ROW })
+ .ToStorage();
+ y.BulkCopy();
+ y.BulkUpdate();
+ });
+ }
+ else
+ {
+ var s = db.Storageable(items, "U9C")
+ .WhereColumns(t => new { t.CUST_SN, t.GHOST_ROW })
+ .ToStorage();
+ s.AsInsertable.ExecuteCommand();
+ s.AsUpdateable.IgnoreColumns(x => x.ID).ExecuteCommand();
+ }
+ }
+
+ });
+ if (!dbTran.IsSuccess)
+ {
+ action.CatchExceptionWithLog(dbTran.ErrorException, $"鏁版嵁澶勭悊澶辫触");
+ Logger.Scheduler.Error(action.Message);
+ }
+ Logger.Scheduler.Info($"瀹㈡埛鏉＄爜淇℃伅瀛樺叆鏁版嵁搴擄紝鎬绘暟锛歔{items.Count}]");
+ return action;
}
}
}
--
Gitblit v1.9.3