From 07bb95e4e2fa1082048d9c50ba7e3c2563e91b00 Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期三, 04 十二月 2024 14:58:46 +0800
Subject: [PATCH] 入库单更新
---
Tiger.Business.MES/iERP/U9C_MES.cs | 126 ++++++++++++++++++-----------------------
1 files changed, 56 insertions(+), 70 deletions(-)
diff --git a/Tiger.Business.MES/iERP/U9C_MES.cs b/Tiger.Business.MES/iERP/U9C_MES.cs
index 1d5e8f1..c385d69 100644
--- a/Tiger.Business.MES/iERP/U9C_MES.cs
+++ b/Tiger.Business.MES/iERP/U9C_MES.cs
@@ -16,6 +16,7 @@
using Tiger.Model.Entitys.MES.Position;
using Apache.NMS.ActiveMQ.Commands;
using System.Security.Cryptography;
+using System.Diagnostics;
namespace Tiger.Business.MES
{
@@ -26,7 +27,7 @@
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
- public async Task<ApiAction> GetBasItem(GetBasItemInput input)
+ public ApiAction GetBasItem(U9C_MES_Input input)
{
var action = new ApiAction();
Logger.Scheduler.Info($"鐗╂枡淇℃伅寮�濮嬪悓姝ャ�傘�傘�傛暟鎹鏌ヨ繘琛屼腑銆傘�傘��");
@@ -77,6 +78,7 @@
Accuracy = (di["Accuracy"] ?? "").ToString(),
Remark = (di["Remark"] ?? "").ToString(),
Packaging = (di["Packaging"] ?? "").ToString(),
+ SapCode = (di["Code1"] ?? "").ToString(),
};
itemExts.Add(extInfo);
}
@@ -84,45 +86,41 @@
}
Logger.Scheduler.Info($"鐗╂枡淇℃伅瀛樺叆瀹炰綋涓紝鎬绘暟锛歔{items.Count}]");
db = Biz.Db;
- 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(() =>
{
- db.Storageable(LastRun, "U9C_MES_GetItem").ExecuteCommand();
if (items.Any())
{
- if (items.Count > 150)
+ if (items.Count > 100)
{
- db.Utilities.PageEach(items, 1000, pageList =>
+ db.Utilities.PageEach(items, 100, pageList =>
{
var y = db.Storageable(pageList, "U9C")
.WhereColumns(t => new { t.ID, t.GHOST_ROW })
.ToStorage();
- y.BulkCopy();
- y.BulkUpdate();
+ y.AsInsertable.ExecuteCommand();
+ y.AsUpdateable.ExecuteCommand();
});
}
- else
- {
- var s = db.Storageable(items, "U9C")
- .WhereColumns(t => new { t.ID, t.GHOST_ROW })
- .ToStorage();
- s.AsInsertable.ExecuteCommand();
- s.AsUpdateable.ExecuteCommand();
+ else {
+ var y = db.Storageable(items, "U9C")
+ .WhereColumns(t => new { t.ID, t.GHOST_ROW })
+ .ToStorage();
+ y.AsInsertable.ExecuteCommand();
+ y.AsUpdateable.ExecuteCommand();
}
}
if (itemExts.Any())
{
- if (itemExts.Count > 150)
+ if (itemExts.Count > 100)
{
- db.Utilities.PageEach(itemExts, 1000, pageList =>
- {
- var y = db.Storageable(pageList, "U9C")
- .WhereColumns(t => new { t.ITEM_ID, t.GHOST_ROW })
- .ToStorage();
- y.BulkCopy();
- y.BulkUpdate();
- });
+ db.Utilities.PageEach(itemExts, 100, pageList =>
+ {
+ var y = db.Storageable(pageList, "U9C")
+ .WhereColumns(t => new { t.ITEM_ID, t.GHOST_ROW })
+ .ToStorage();
+ y.AsInsertable.ExecuteCommand();
+ y.AsUpdateable.IgnoreColumns(x => x.ID).ExecuteCommand();
+ });
}
else
{
@@ -140,6 +138,7 @@
Logger.Scheduler.Error(action.Message);
}
Logger.Scheduler.Info($"鐗╂枡淇℃伅瀛樺叆鏁版嵁搴擄紝鎬绘暟锛歔{items.Count}]");
+ action.Message = $"鐗╂枡淇℃伅瀛樺叆鏁版嵁搴擄紝鎬绘暟锛歔{items.Count}]";
return action;
}
@@ -209,15 +208,15 @@
db.Storageable(LastRun, "U9C_MES_GetWo").ExecuteCommand();
if (items.Any())
{
- if (items.Count > 150)
+ if (items.Count > 100)
{
- db.Utilities.PageEach(items, 1000, pageList =>
+ db.Utilities.PageEach(items, 100, pageList =>
{
var y = db.Storageable(pageList, "U9C")
.WhereColumns(t => new { t.ORDER_NO, t.GHOST_ROW })
.ToStorage();
- y.BulkCopy();
- y.BulkUpdate();
+ y.AsInsertable.ExecuteCommand();
+ y.AsUpdateable.IgnoreColumns(x => x.ID).ExecuteCommand();
});
}
else
@@ -286,11 +285,7 @@
{
if (woList.Any())
{
- var s = _db.Storageable(woList, "U9C")
- .WhereColumns(t => new { t.ORDER_NO, t.GHOST_ROW })
- .ToStorage();
- s.AsInsertable.ExecuteCommand();
- s.AsUpdateable.IgnoreColumns(x => x.ID).UpdateColumns(x => new { x.ROUTE_STATUS}).ExecuteCommand();
+ _db.Updateable(woList, "U9C").UpdateColumns(x => new { x.ROUTE_STATUS }).ExecuteCommand();
}
});
@@ -309,14 +304,14 @@
/// <param name="input"></param>
/// <returns></returns>
/// <exception cref="NotImplementedException"></exception>
- public async Task<ApiAction> GetCustomer(GetCustomerInput input)
+ public ApiAction GetCustomer(U9C_MES_Input 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_Customer").Where("ModifiedOn > @startTime And ModifiedOn < @endTime", new { startTime = input.startTime, endTime = input.endTime }).ToList();
- var orgs = await Biz.Db.Queryable<SYS_ORGANIZATION>().ToListAsync();
+ var orgs = Biz.Db.Queryable<SYS_ORGANIZATION>().ToList();
List<BAS_CUSTOMER> items = new();
if (list != null && list.Count > 0)
{
@@ -345,22 +340,19 @@
}
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.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)
+ if (items.Count > 100)
{
- db.Utilities.PageEach(items, 1000, pageList =>
+ db.Utilities.PageEach(items, 100, pageList =>
{
var y = db.Storageable(pageList, "U9C")
.WhereColumns(t => new { t.CUST_CODE, t.GHOST_ROW })
.ToStorage();
- y.BulkCopy();
- y.BulkUpdate();
+ y.AsInsertable.ExecuteCommand();
+ y.AsUpdateable.IgnoreColumns(x => x.ID).ExecuteCommand();
});
}
else
@@ -380,6 +372,7 @@
Logger.Scheduler.Error(action.Message);
}
Logger.Scheduler.Info($"瀹㈡埛淇℃伅瀛樺叆鏁版嵁搴擄紝鎬绘暟锛歔{items.Count}]");
+ action.Message = $"瀹㈡埛淇℃伅瀛樺叆鏁版嵁搴擄紝鎬绘暟锛歔{items.Count}]";
return action;
}
@@ -388,14 +381,14 @@
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
- public async Task<ApiAction> GetSupplier(GetSupplierInput input)
+ public ApiAction GetSupplier(U9C_MES_Input 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_Supplier").Where("ModifiedOn > @startTime And ModifiedOn < @endTime", new { startTime = input.startTime, endTime = input.endTime }).ToList();
- var orgs = await Biz.Db.Queryable<SYS_ORGANIZATION>().ToListAsync();
+ var orgs = Biz.Db.Queryable<SYS_ORGANIZATION>().ToList();
List<BAS_SUPPLIER> items = new();
if (list != null && list.Count > 0)
{
@@ -421,22 +414,19 @@
}
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)
+ if (items.Count > 100)
{
- db.Utilities.PageEach(items, 1000, pageList =>
+ db.Utilities.PageEach(items, 100, pageList =>
{
var y = db.Storageable(pageList, "U9C")
.WhereColumns(t => new { t.SUPP_CODE, t.GHOST_ROW })
.ToStorage();
- y.BulkCopy();
- y.BulkUpdate();
+ y.AsInsertable.ExecuteCommand();
+ y.AsUpdateable.IgnoreColumns(x => x.ID).ExecuteCommand();
});
}
else
@@ -456,6 +446,7 @@
Logger.Scheduler.Error(action.Message);
}
Logger.Scheduler.Info($"渚涘簲鍟嗕俊鎭瓨鍏ユ暟鎹簱锛屾�绘暟锛歔{items.Count}]");
+ action.Message = $"渚涘簲鍟嗕俊鎭瓨鍏ユ暟鎹簱锛屾�绘暟锛歔{items.Count}]";
return action;
}
@@ -464,7 +455,7 @@
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
- public async Task<ApiAction> GetCustBarCode(GetCustBarcodeInput input)
+ public ApiAction GetCustBarCode(U9C_MES_Input input)
{
var action = new ApiAction();
Logger.Scheduler.Info($"瀹㈡埛鏉＄爜淇℃伅寮�濮嬪悓姝ャ�傘�傘�傛暟鎹鏌ヨ繘琛屼腑銆傘�傘��");
@@ -483,7 +474,7 @@
{
if (di["MoDoc"] != null)
{
- var _MES_WO = await Biz.Db.Queryable<BIZ_MES_WO>().Where(x => x.ORDER_NO == di["MoDoc"].ToString()).FirstAsync();
+ var _MES_WO = Biz.Db.Queryable<BIZ_MES_WO>().Where(x => x.ORDER_NO == di["MoDoc"].ToString()).First();
MES_CUST_SN snItem = new()
{
CUST_CODE = _MES_WO?.CUST_CODE ?? "",
@@ -502,22 +493,19 @@
}
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)
+ if (items.Count > 100)
{
- db.Utilities.PageEach(items, 1000, pageList =>
+ db.Utilities.PageEach(items, 100, pageList =>
{
var y = db.Storageable(pageList, "U9C")
.WhereColumns(t => new { t.CUST_SN, t.GHOST_ROW })
.ToStorage();
- y.BulkCopy();
- y.BulkUpdate();
+ y.AsInsertable.ExecuteCommand();
+ y.AsUpdateable.IgnoreColumns(x => x.ID).UpdateColumns(q => new { q.CUST_CODE,q.WORK_ORDER,q.CUST_SN,q.FLOW_SN,q.ITEM_CODE,q.CREATE_TIME,q.UPDATE_TIME,q.UPDATE_USER,q.AUTH_ORG}).ExecuteCommand();
});
}
else
@@ -526,7 +514,7 @@
.WhereColumns(t => new { t.CUST_SN, t.GHOST_ROW })
.ToStorage();
s.AsInsertable.ExecuteCommand();
- s.AsUpdateable.IgnoreColumns(x => x.ID).ExecuteCommand();
+ s.AsUpdateable.IgnoreColumns(x => x.ID).UpdateColumns(q => new { q.CUST_CODE, q.WORK_ORDER, q.CUST_SN, q.FLOW_SN, q.ITEM_CODE, q.CREATE_TIME, q.UPDATE_TIME, q.UPDATE_USER, q.AUTH_ORG }).ExecuteCommand();
}
}
@@ -537,10 +525,11 @@
Logger.Scheduler.Error(action.Message);
}
Logger.Scheduler.Info($"瀹㈡埛鏉＄爜淇℃伅瀛樺叆鏁版嵁搴擄紝鎬绘暟锛歔{items.Count}]");
+ action.Message = $"瀹㈡埛鏉＄爜淇℃伅瀛樺叆鏁版嵁搴擄紝鎬绘暟锛歔{items.Count}]";
return action;
}
- public ApiAction GetU9CBasWo(GetWoInput input)
+ public ApiAction GetU9CBasWo(U9C_MES_Input input)
{
var action = new ApiAction();
Logger.Scheduler.Info($"宸ュ崟淇℃伅寮�濮嬪悓姝ャ�傘�傘�傛暟鎹鏌ヨ繘琛屼腑銆傘�傘��");
@@ -580,7 +569,7 @@
CUST_PREFIX = di["OutBarHead"] == null ? "" : di["OutBarHead"].ToString(),
SALES_CONTRACT = di["Contracts"] == null ? "" : di["Contracts"].ToString(),
};
- if (!Biz.Db.Queryable<BIZ_MES_WO>().Any(x => x.ORDER_NO == woItem.ORDER_NO && (x.STATUS > BIZ_MES_WO.STATUSs.Init.GetValue() || x.ROUTE_STATUS > BIZ_MES_WO.ROUTE_STATUSs.WaitSet.GetValue())))
+ if (!Biz.Db.Queryable<BIZ_MES_WO>().Any(x => x.ORDER_NO == woItem.ORDER_NO && x.STATUS > BIZ_MES_WO.STATUSs.Imported.GetValue()))
{
items.Add(woItem);
}
@@ -594,22 +583,19 @@
}
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.ToDateTime() - DateTime.Now).TotalMinutes > 0 ? LastRun.PARAM_VALUE : input.endTime;
var dbTran = db.UseTran(() =>
{
- db.Storageable(LastRun, "U9C_MES_GetWo").ExecuteCommand();
if (items.Any())
{
- if (items.Count > 150)
+ if (items.Count > 100)
{
- db.Utilities.PageEach(items, 1000, pageList =>
+ db.Utilities.PageEach(items, 100, pageList =>
{
var y = db.Storageable(pageList, "U9C")
.WhereColumns(t => new { t.ORDER_NO, t.GHOST_ROW })
.ToStorage();
- y.BulkCopy();
- y.BulkUpdate();
+ y.AsInsertable.ExecuteCommand();
+ y.AsUpdateable.IgnoreColumns(x => x.ID).ExecuteCommand();
});
}
else
--
Gitblit v1.9.3