From 296957b1b212eb7ce5b1362f1eaa5143e8d4ca41 Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期五, 12 七月 2024 17:04:08 +0800
Subject: [PATCH] 客户接口
---
Tiger.Business.MES/iERP/U9C_MES.cs | 93 +++++++++++++++++++++++++++----
Tiger.Business.MES/Task/Jobs.U9C_ME_GetCustomer.cs | 53 +++++++++++++++++
2 files changed, 134 insertions(+), 12 deletions(-)
diff --git a/Tiger.Business.MES/Task/Jobs.U9C_ME_GetCustomer.cs b/Tiger.Business.MES/Task/Jobs.U9C_ME_GetCustomer.cs
new file mode 100644
index 0000000..e89efd5
--- /dev/null
+++ b/Tiger.Business.MES/Task/Jobs.U9C_ME_GetCustomer.cs
@@ -0,0 +1,53 @@
+锘縰sing Rhea.Common;
+using Sundial;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using Tiger.IBusiness;
+using Tiger.Model;
+using Tiger.Model.Minsun;
+
+namespace Tiger.Business.MES
+{
+ /// <summary>
+ /// 浠嶶9C鑾峰彇宸ュ崟淇℃伅
+ /// </summary>
+ public class U9C_MES_GetCustomer : TigerJobBase, ITigerJob
+ {
+ public string Id { get; set; } = Guid.NewGuid().ToString("N");
+ public string Tag { get; set; } = "U9C_MES_GetCustomer Interface Job";
+ public string Name { get; set; } = "U9C_MES_GetCustomer Interface Job";
+
+ public async Task ExecuteAsync(JobExecutingContext context, CancellationToken stoppingToken)
+ {
+ Logger.Scheduler.Info(context.Trigger.ConvertToMonitor());
+ try
+ {
+ var _lastRunTime = Biz.SysParam["GetCust_LastRun", "Interface_LastRun"].PARAM_VALUE;
+ var LastRunTime = string.IsNullOrEmpty(_lastRunTime) ? DateTime.Now.AddMinutes(-30) : Convert.ToDateTime(_lastRunTime);
+ if ((DateTime.Now - LastRunTime).TotalMinutes > 30)
+ {
+ GetCustomerInput input = new GetCustomerInput
+ {
+ startTime = LastRunTime.ToString("yyyy-MM-dd HH:mm:ss"),
+ endTime = LastRunTime.AddMinutes(30).ToString("yyyy-MM-dd HH:mm:ss")
+ };
+ var result = await DI.Resolve<IU9C_MES>().GetCustomer(input);
+ if (!result.IsSuccessed)
+ {
+ Logger.Scheduler.Error($"鑾峰彇宸ュ崟淇℃伅寮傚父:{result.Message}");
+ }
+ }
+ //SaveLog(context, "浠嶶9C鑾峰彇宸ュ崟淇℃伅鎴愬姛");
+ }
+ catch (System.Exception ex)
+ {
+ Logger.Scheduler.Fatal(ex, "鑾峰彇宸ュ崟淇℃伅寮傚父");
+ }
+ await Task.CompletedTask;
+ }
+ }
+}
diff --git a/Tiger.Business.MES/iERP/U9C_MES.cs b/Tiger.Business.MES/iERP/U9C_MES.cs
index ca47d69..1fc1636 100644
--- a/Tiger.Business.MES/iERP/U9C_MES.cs
+++ b/Tiger.Business.MES/iERP/U9C_MES.cs
@@ -25,8 +25,8 @@
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();
List<BAS_ITEM> items = new();
@@ -56,7 +56,7 @@
}
}
- 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 +93,7 @@
Logger.Scheduler.Error(action.Message);
}
- Logger.Scheduler.Info(Biz.L($"鐗╂枡淇℃伅瀛樺叆鏁版嵁搴擄紝鎬绘暟锛歔{items.Count}]"));
+ Logger.Scheduler.Info($"鐗╂枡淇℃伅瀛樺叆鏁版嵁搴擄紝鎬绘暟锛歔{items.Count}]");
return action;
}
@@ -106,8 +106,8 @@
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_Mo").Where("ModifiedOn > @startTime And ModifiedOn < @endTime", new { startTime = input.startTime, endTime = input.endTime }).ToList();
List<BIZ_MES_WO> items = new();
@@ -120,11 +120,11 @@
{
BIZ_MES_WO woItem = new()
{
- ID = di["ID"].ToString(),
ORDER_NO = di["DocNo"] == null ? "" : di["DocNo"].ToString(),
- ORDER_TYPE = di["DocTypeCode"] == null ? "" : di["DocTypeCode"].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 = di["ItemMaster"] == null ? "" : di["ItemMaster"].ToString(),
CREATE_TIME = di["CreatedOn"].ToDateTime(),
UPDATE_TIME = di["ModifiedOn"].ToDateTime(),
PLAN_START_TIME = di["CheckDate"].ToDateTime(),
@@ -134,7 +134,7 @@
}
}
- 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 == "GetWo_LastRun").Single();
LastRun.PARAM_VALUE = input.endTime;
@@ -171,13 +171,82 @@
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();
+ 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)
+ {
+ 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(),
+ };
+ 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