From 7e73e5df14dce74742abf50383bb8ac37b38012e Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期一, 21 四月 2025 12:04:12 +0800
Subject: [PATCH] 优化了一些已知问题
---
Tiger.Business.MES/iERP/U9C_MES.cs | 177 ++++++++++++++++++----------------------------------------
1 files changed, 56 insertions(+), 121 deletions(-)
diff --git a/Tiger.Business.MES/iERP/U9C_MES.cs b/Tiger.Business.MES/iERP/U9C_MES.cs
index dfe8d48..c10ace7 100644
--- a/Tiger.Business.MES/iERP/U9C_MES.cs
+++ b/Tiger.Business.MES/iERP/U9C_MES.cs
@@ -17,6 +17,7 @@
using Apache.NMS.ActiveMQ.Commands;
using System.Security.Cryptography;
using System.Diagnostics;
+using Tiger.Model.MES.Yada;
namespace Tiger.Business.MES
{
@@ -27,14 +28,14 @@
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
- public ApiAction GetBasItem(U9C_MES_Input input)
+ public ApiAction GetBasItem(U9C_Base_Input input)
{
var action = new ApiAction();
+ var db = Biz.Db;
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();
+ var list = Biz.DataSource["YadaU9C"].Client.Queryable<dynamic>().AS("mes_ItemMaster").Where("ModifiedOn > @startTime And ModifiedOn < @endTime", new { startTime = input.startTime, endTime = input.endTime }).ToList();
+ var orgs = db.Queryable<SYS_ORGANIZATION>().ToList();
List<BAS_ITEM> items = new();
var itemExts = new List<BAS_ITEM_EXT>();
if (list != null && list.Count > 0)
@@ -64,7 +65,15 @@
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(),
+ DEFAULT_LOCATION = di["BinCode"] == null ? "" : di["BinCode"].ToString(),
};
+ var whUnit = db.Queryable<V_WH_UNIT>().Where(t => t.LOCATION_CODE == basItem.DEFAULT_LOCATION && t.AUTH_ORG == basItem.AUTH_ORG).First();
+ if (!whUnit.IsNullOrEmpty())
+ {
+ basItem.DEFAULT_WH = whUnit.WH_CODE;
+ basItem.DEFAULT_REGION = whUnit.REGION_CODE;
+ basItem.DEFAULT_SHELF = whUnit.SHELF_CODE;
+ }
items.Add(basItem);
var extInfo = new BAS_ITEM_EXT()
{
@@ -79,58 +88,37 @@
Remark = (di["Remark"] ?? "").ToString(),
Packaging = (di["Packaging"] ?? "").ToString(),
SapCode = (di["Code1"] ?? "").ToString(),
+ ReceiptMode = (di["ReceiptMode"] ?? "").ToInt32(),
};
itemExts.Add(extInfo);
}
}
}
Logger.Scheduler.Info($"鐗╂枡淇℃伅瀛樺叆瀹炰綋涓紝鎬绘暟锛歔{items.Count}]");
- db = Biz.Db;
+
//var dbTran = db.UseTran(() =>
//{
if (items.Any())
{
- if (items.Count > 100)
+ db.Utilities.PageEach(items, 100, pageList =>
{
- db.Utilities.PageEach(items, 100, pageList =>
- {
- var y = db.Storageable(pageList, "U9C")
- .WhereColumns(t => new { t.ID, t.GHOST_ROW })
- .ToStorage();
- y.AsInsertable.ExecuteCommand();
- y.AsUpdateable.ExecuteCommand();
- });
- }
- else
- {
- var y = db.Storageable(items, "U9C")
- .WhereColumns(t => new { t.ID, t.GHOST_ROW })
- .ToStorage();
+ var y = db.Storageable(pageList, "U9C")
+ .WhereColumns(t => new { t.ID, t.GHOST_ROW })
+ .ToStorage();
y.AsInsertable.ExecuteCommand();
y.AsUpdateable.ExecuteCommand();
- }
+ });
}
if (itemExts.Any())
{
- if (itemExts.Count > 100)
+ db.Utilities.PageEach(itemExts, 100, pageList =>
{
- 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
- {
- var s = db.Storageable(itemExts, "U9C")
+ var y = db.Storageable(pageList, "U9C")
.WhereColumns(t => new { t.ITEM_ID, t.GHOST_ROW })
.ToStorage();
- s.AsInsertable.ExecuteCommand();
- s.AsUpdateable.IgnoreColumns(x => x.ID).ExecuteCommand();
- }
+ y.AsInsertable.ExecuteCommand();
+ y.AsUpdateable.IgnoreColumns(x => x.ID).ExecuteCommand();
+ });
}
//});
//if (!dbTran.IsSuccess)
@@ -209,25 +197,14 @@
db.Storageable(LastRun, "U9C_MES_GetWo").ExecuteCommand();
if (items.Any())
{
- if (items.Count > 100)
+ db.Utilities.PageEach(items, 100, pageList =>
{
- db.Utilities.PageEach(items, 100, pageList =>
- {
- var y = db.Storageable(pageList, "U9C")
- .WhereColumns(t => new { t.ORDER_NO, t.GHOST_ROW })
- .ToStorage();
- y.AsInsertable.ExecuteCommand();
- y.AsUpdateable.IgnoreColumns(x => x.ID).ExecuteCommand();
- });
- }
- else
- {
- var s = db.Storageable(items, "U9C")
+ var y = db.Storageable(pageList, "U9C")
.WhereColumns(t => new { t.ORDER_NO, t.GHOST_ROW })
.ToStorage();
- s.AsInsertable.ExecuteCommand();
- s.AsUpdateable.IgnoreColumns(x => x.ID).ExecuteCommand();
- }
+ y.AsInsertable.ExecuteCommand();
+ y.AsUpdateable.IgnoreColumns(x => x.ID).ExecuteCommand();
+ });
}
});
@@ -308,7 +285,7 @@
/// <param name="input"></param>
/// <returns></returns>
/// <exception cref="NotImplementedException"></exception>
- public ApiAction GetCustomer(U9C_MES_Input input)
+ public ApiAction GetCustomer(U9C_Base_Input input)
{
var action = new ApiAction();
Logger.Scheduler.Info($"瀹㈡埛淇℃伅寮�濮嬪悓姝ャ�傘�傘�傛暟鎹鏌ヨ繘琛屼腑銆傘�傘��");
@@ -348,25 +325,14 @@
// {
if (items.Any())
{
- if (items.Count > 100)
+ db.Utilities.PageEach(items, 100, pageList =>
{
- db.Utilities.PageEach(items, 100, pageList =>
- {
- var y = db.Storageable(pageList, "U9C")
- .WhereColumns(t => new { t.CUST_CODE, t.GHOST_ROW })
- .ToStorage();
- y.AsInsertable.ExecuteCommand();
- y.AsUpdateable.IgnoreColumns(x => x.ID).ExecuteCommand();
- });
- }
- else
- {
- var s = db.Storageable(items, "U9C")
+ var y = db.Storageable(pageList, "U9C")
.WhereColumns(t => new { t.CUST_CODE, t.GHOST_ROW })
.ToStorage();
- s.AsInsertable.ExecuteCommand();
- s.AsUpdateable.IgnoreColumns(x => x.ID).ExecuteCommand();
- }
+ y.AsInsertable.ExecuteCommand();
+ y.AsUpdateable.IgnoreColumns(x => x.ID).ExecuteCommand();
+ });
}
// });
@@ -385,7 +351,7 @@
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
- public ApiAction GetSupplier(U9C_MES_Input input)
+ public ApiAction GetSupplier(U9C_Base_Input input)
{
var action = new ApiAction();
Logger.Scheduler.Info($"渚涘簲鍟嗕俊鎭紑濮嬪悓姝ャ�傘�傘�傛暟鎹鏌ヨ繘琛屼腑銆傘�傘��");
@@ -422,25 +388,14 @@
// {
if (items.Any())
{
- if (items.Count > 100)
+ db.Utilities.PageEach(items, 100, pageList =>
{
- db.Utilities.PageEach(items, 100, pageList =>
- {
- var y = db.Storageable(pageList, "U9C")
- .WhereColumns(t => new { t.SUPP_CODE, t.GHOST_ROW })
- .ToStorage();
- y.AsInsertable.ExecuteCommand();
- y.AsUpdateable.IgnoreColumns(x => x.ID).ExecuteCommand();
- });
- }
- else
- {
- var s = db.Storageable(items, "U9C")
+ var y = db.Storageable(pageList, "U9C")
.WhereColumns(t => new { t.SUPP_CODE, t.GHOST_ROW })
.ToStorage();
- s.AsInsertable.ExecuteCommand();
- s.AsUpdateable.IgnoreColumns(x => x.ID).ExecuteCommand();
- }
+ y.AsInsertable.ExecuteCommand();
+ y.AsUpdateable.IgnoreColumns(x => x.ID).ExecuteCommand();
+ });
}
//});
@@ -459,7 +414,7 @@
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
- public ApiAction GetCustBarCode(U9C_MES_Input input)
+ public ApiAction GetCustBarCode(U9C_Base_Input input)
{
var action = new ApiAction();
Logger.Scheduler.Info($"瀹㈡埛鏉＄爜淇℃伅寮�濮嬪悓姝ャ�傘�傘�傛暟鎹鏌ヨ繘琛屼腑銆傘�傘��");
@@ -469,6 +424,7 @@
List<MES_CUST_SN> items = new();
if (list != null && list.Count > 0)
{
+ Logger.Scheduler.Info($"鑾峰彇瀹㈡埛鏉＄爜淇℃伅锛歔{list.ToJson()}]");
foreach (var item in list)
{
var d = item as System.Dynamic.ExpandoObject;
@@ -489,6 +445,7 @@
CREATE_TIME = di["CreatedOn"].ToDateTime(),
UPDATE_TIME = di["ModifiedOn"].ToDateTime(),
AUTH_ORG = _MES_WO?.AUTH_ORG,
+ CREATE_USER = "U9C" //鍚屾椂缁機REATE_USER鍜孋REATE_TIME璧嬪�硷紝鍒欎笉浼氳鏇存柊锛屼繚鐣欐墍璧嬬殑鍊�
};
items.Add(snItem);
}
@@ -501,25 +458,14 @@
//{
if (items.Any())
{
- if (items.Count > 100)
+ db.Utilities.PageEach(items, 100, pageList =>
{
- db.Utilities.PageEach(items, 100, pageList =>
- {
- var y = db.Storageable(pageList, "U9C")
- .WhereColumns(t => new { t.CUST_SN, t.GHOST_ROW })
- .ToStorage();
- 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
- {
- var s = db.Storageable(items, "U9C")
+ var y = db.Storageable(pageList, "U9C")
.WhereColumns(t => new { t.CUST_SN, t.GHOST_ROW })
.ToStorage();
- s.AsInsertable.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();
- }
+ 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.UPDATE_TIME, q.UPDATE_USER, q.AUTH_ORG }).ExecuteCommand();
+ });
}
//});
@@ -533,7 +479,7 @@
return action;
}
- public ApiAction GetU9CBasWo(U9C_MES_Input input)
+ public ApiAction GetU9CBasWo(U9C_Base_Input input)
{
var action = new ApiAction();
Logger.Scheduler.Info($"宸ュ崟淇℃伅寮�濮嬪悓姝ャ�傘�傘�傛暟鎹鏌ヨ繘琛屼腑銆傘�傘��");
@@ -592,25 +538,14 @@
//{
if (items.Any())
{
- if (items.Count > 100)
+ db.Utilities.PageEach(items, 100, pageList =>
{
- db.Utilities.PageEach(items, 100, pageList =>
- {
- var y = db.Storageable(pageList, "U9C")
- .WhereColumns(t => new { t.ORDER_NO, t.GHOST_ROW })
- .ToStorage();
- y.AsInsertable.ExecuteCommand();
- y.AsUpdateable.IgnoreColumns(x => x.ID).UpdateColumns(q => new { q.ORDER_NO, q.ORDER_TYPE, q.PLAN_QTY, q.CUST_CODE, q.ITEM_CODE, q.CREATE_TIME, q.UPDATE_TIME, q.PLAN_START_TIME, q.STATUS, q.WS_CODE, q.AUTH_ORG, q.SALES_ORDER, q.SALES_REMARK, q.SERIAL_NO, q.SN_PREFIX, q.CUST_PREFIX, q.SALES_CONTRACT }).ExecuteCommand();
- });
- }
- else
- {
- var s = db.Storageable(items, "U9C")
+ var y = db.Storageable(pageList, "U9C")
.WhereColumns(t => new { t.ORDER_NO, t.GHOST_ROW })
.ToStorage();
- s.AsInsertable.ExecuteCommand();
- s.AsUpdateable.IgnoreColumns(x => x.ID).ExecuteCommand();
- }
+ y.AsInsertable.ExecuteCommand();
+ y.AsUpdateable.IgnoreColumns(x => x.ID).UpdateColumns(q => new { q.ORDER_NO, q.ORDER_TYPE, q.PLAN_QTY, q.CUST_CODE, q.ITEM_CODE, q.CREATE_TIME, q.UPDATE_TIME, q.PLAN_START_TIME, q.STATUS, q.WS_CODE, q.AUTH_ORG, q.SALES_ORDER, q.SALES_REMARK, q.SERIAL_NO, q.SN_PREFIX, q.CUST_PREFIX, q.SALES_CONTRACT }).ExecuteCommand();
+ });
}
//});
--
Gitblit v1.9.3