From 29764a01914a42d5e743a7bf1c01546bfea0ee90 Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期四, 15 八月 2024 09:18:08 +0800
Subject: [PATCH] 一些更改
---
Tiger.Business.MES/iERP/U9C_MES.cs | 134 +++++++++++++++++++++++++++++++++++---------
1 files changed, 106 insertions(+), 28 deletions(-)
diff --git a/Tiger.Business.MES/iERP/U9C_MES.cs b/Tiger.Business.MES/iERP/U9C_MES.cs
index e4f98bc..b96b9a0 100644
--- a/Tiger.Business.MES/iERP/U9C_MES.cs
+++ b/Tiger.Business.MES/iERP/U9C_MES.cs
@@ -25,10 +25,11 @@
public async Task<ApiAction> GetBasItem(GetBasItemInput input)
{
var action = new ApiAction();
- Logger.Scheduler.Info(Biz.L($"鐗╂枡淇℃伅寮�濮嬪悓姝ャ�傘�傘�傛暟鎹鏌ヨ繘琛屼腑銆傘�傘��"));
- Logger.Scheduler.Info(Biz.L($"{input.triggerDetail}"));
+ Logger.Scheduler.Info($"鐗╂枡淇℃伅寮�濮嬪悓姝ャ�傘�傘�傛暟鎹鏌ヨ繘琛屼腑銆傘�傘��");
+ Logger.Scheduler.Info($"{input.triggerDetail}");
DbClient db = Biz.DataSource["YadaU9C"].Client;
var list = db.Queryable<dynamic>().AS("mes_ItemMaster").Where("ModifiedOn > @startTime And ModifiedOn < @endTime", new { startTime = input.startTime, endTime = input.endTime }).ToList();
+ var orgs = Biz.Db.Queryable<SYS_ORGANIZATION>().ToList();
List<BAS_ITEM> items = new();
foreach (var item in list)
{
@@ -37,6 +38,7 @@
di = di?.ToDictionary(x => x.Key, x => x.Value);
if (di != null)
{
+ var orgId = di["Org"] == null ? "" : di["Org"].ToString();
BAS_ITEM basItem = new()
{
ID = di["ID"].ToString(),
@@ -51,12 +53,13 @@
UPDATE_TIME = di["ModifiedOn"].ToDateTime(),
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(),
};
items.Add(basItem);
}
}
- Logger.Scheduler.Info(Biz.L($"鐗╂枡淇℃伅瀛樺叆瀹炰綋涓紝鎬绘暟锛歔{items.Count}]"));
+ 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();
LastRun.PARAM_VALUE = input.endTime;
@@ -93,7 +96,7 @@
Logger.Scheduler.Error(action.Message);
}
- Logger.Scheduler.Info(Biz.L($"鐗╂枡淇℃伅瀛樺叆鏁版嵁搴擄紝鎬绘暟锛歔{items.Count}]"));
+ Logger.Scheduler.Info($"鐗╂枡淇℃伅瀛樺叆鏁版嵁搴擄紝鎬绘暟锛歔{items.Count}]");
return action;
}
@@ -106,11 +109,12 @@
public async Task<ApiAction> GetBasWo(GetWoInput input)
{
var action = new ApiAction();
- Logger.Scheduler.Info(Biz.L($"宸ュ崟淇℃伅寮�濮嬪悓姝ャ�傘�傘�傛暟鎹鏌ヨ繘琛屼腑銆傘�傘��"));
- Logger.Scheduler.Info(Biz.L($"{input.triggerDetail}"));
+ Logger.Scheduler.Info($"宸ュ崟淇℃伅寮�濮嬪悓姝ャ�傘�傘�傛暟鎹鏌ヨ繘琛屼腑銆傘�傘��");
+ Logger.Scheduler.Info($"{input.triggerDetail}");
DbClient db = Biz.DataSource["YadaU9C"].Client;
- var list = db.Queryable<dynamic>().AS("mes_ItemMaster").Where("ModifiedOn > @startTime And ModifiedOn < @endTime", new { startTime = input.startTime, endTime = input.endTime }).ToList();
- List<BAS_ITEM> items = new();
+ var list = db.Queryable<dynamic>().AS("mes_Mo").Where("ModifiedOn > @startTime And ModifiedOn < @endTime", new { startTime = input.startTime, endTime = input.endTime }).ToList();
+ var orgs = Biz.Db.Queryable<SYS_ORGANIZATION>().ToList();
+ List<BIZ_MES_WO> items = new();
foreach (var item in list)
{
var d = item as System.Dynamic.ExpandoObject;
@@ -118,32 +122,34 @@
di = di?.ToDictionary(x => x.Key, x => x.Value);
if (di != null)
{
- BAS_ITEM basItem = new()
+ var orgId = di["Org"] == null ? "" : di["Org"].ToString();
+ var itemId = di["ItemMaster"] == null ? "" : di["ItemMaster"].ToString();
+ var basItem = Biz.Db.Queryable <BAS_ITEM>().Where(x=>x.ID == itemId).First();
+ BIZ_MES_WO woItem = new()
{
- ID = di["ID"].ToString(),
- ITEM_CODE = di["Code"] == null ? "" : di["Code"].ToString(),
- ITEM_NAME = di["Name"] == null ? "" : di["Name"].ToString(),
- ITEM_DESC = di["Description"] == null ? "" : di["Description"].ToString(),
- SPEC = di["SPECS"] == null ? "" : di["SPECS"].ToString(),
- ITEM_TYPE = di["CategoryCode"] == null ? "" : di["CategoryCode"].ToString(),
- UNIT = di["InventorySecondUOM"] == null ? "" : di["InventorySecondUOM"].ToString(),
- PROD_TYPE = di["ProductTypeCode"] == null ? "" : di["ProductTypeCode"].ToString(),
+ ORDER_NO = di["DocNo"] == null ? "" : di["DocNo"].ToString(),
+ ORDER_TYPE = di["DocTypeCode"] == null ? 0 : di["DocTypeCode"].ToInt32(),
+ PLAN_QTY = di["ProductQty"] == null ? 0 : di["ProductQty"].ToInt32(),
+ CUST_CODE = di["CustomerCode"] == null ? "" : di["CustomerCode"].ToString(),
+ ITEM_CODE = basItem != null? basItem.ITEM_CODE: "",
CREATE_TIME = di["CreatedOn"].ToDateTime(),
UPDATE_TIME = di["ModifiedOn"].ToDateTime(),
- IS_ACTIVE = "Y",
- IS_PROD = ((string)di["Code"]).StartsWith("2") ? "Y" : "N",
+ PLAN_START_TIME = di["CheckDate"].ToDateTime(),
+ 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(),
};
- items.Add(basItem);
+ items.Add(woItem);
}
}
- Logger.Scheduler.Info(Biz.L($"宸ュ崟淇℃伅瀛樺叆瀹炰綋涓紝鎬绘暟锛歔{items.Count}]"));
+ 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 = db.Queryable<SYS_PARAM>().Where(q => q.PRMG_CODE == "Interface_LastRun" && q.PARAM_CODE == "GetWo_LastRun").Single();
LastRun.PARAM_VALUE = input.endTime;
var dbTran = db.UseTran(() =>
{
- db.Storageable(LastRun, "U9C_MES_GetItem").ExecuteCommand();
+ db.Storageable(LastRun, "U9C_MES_GetWo").ExecuteCommand();
if (items.Any())
{
if (items.Count > 150)
@@ -151,7 +157,7 @@
db.Utilities.PageEach(items, 1000, pageList =>
{
var y = db.Storageable(pageList, "U9C")
- .WhereColumns(t => new { t.ITEM_CODE, t.GHOST_ROW })
+ .WhereColumns(t => new { t.ORDER_NO, t.GHOST_ROW })
.ToStorage();
y.BulkCopy();
y.BulkUpdate();
@@ -160,7 +166,7 @@
else
{
var s = db.Storageable(items, "U9C")
- .WhereColumns(t => new { t.ITEM_CODE, t.GHOST_ROW })
+ .WhereColumns(t => new { t.ORDER_NO, t.GHOST_ROW })
.ToStorage();
s.AsInsertable.ExecuteCommand();
s.AsUpdateable.IgnoreColumns(x => x.ID).ExecuteCommand();
@@ -174,13 +180,85 @@
Logger.Scheduler.Error(action.Message);
}
- Logger.Scheduler.Info(Biz.L($"宸ュ崟淇℃伅瀛樺叆鏁版嵁搴擄紝鎬绘暟锛歔{items.Count}]"));
+ Logger.Scheduler.Info($"宸ュ崟淇℃伅瀛樺叆鏁版嵁搴擄紝鎬绘暟锛歔{items.Count}]");
return action;
}
- public Task<ApiAction> GetCustomer(GetCustomerInput input)
+ /// <summary>
+ /// 鑾峰彇瀹㈡埛淇℃伅
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ /// <exception cref="NotImplementedException"></exception>
+ public async Task<ApiAction> GetCustomer(GetCustomerInput 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_Customer").Where("ModifiedOn > @startTime And ModifiedOn < @endTime", new { startTime = input.startTime, endTime = input.endTime }).ToList();
+ var orgs = Biz.Db.Queryable<SYS_ORGANIZATION>().ToList();
+ List<BAS_CUSTOMER> items = new();
+ 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_CUSTOMER custItem = new()
+ {
+ CUST_CODE = di["Code"] == null ? "" : di["Code"].ToString(),
+ CUST_NAME_CN = di["Name"] == null ? "" : di["Name"].ToString(),
+ CUST_TYPE = di["CustomerCategoryName"] == null ? "" : di["CustomerCategoryName"].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(custItem);
+ }
+ }
+
+ Logger.Scheduler.Info($"瀹㈡埛淇℃伅瀛樺叆瀹炰綋涓紝鎬绘暟锛歔{items.Count}]");
+ db = Biz.Db;
+ var LastRun = db.Queryable<SYS_PARAM>().Where(q => q.PRMG_CODE == "Interface_LastRun" && q.PARAM_CODE == "GetCust_LastRun").Single();
+ 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_CODE, t.GHOST_ROW })
+ .ToStorage();
+ y.BulkCopy();
+ y.BulkUpdate();
+ });
+ }
+ else
+ {
+ var s = db.Storageable(items, "U9C")
+ .WhereColumns(t => new { t.CUST_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;
}
public Task<ApiAction> GetSupplier(GetSupplierInput input)
--
Gitblit v1.9.3