From fe4a8ec610b23d33c697dbb76c298ff3b2e31ef1 Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期二, 29 四月 2025 01:14:39 +0800
Subject: [PATCH] 来料打印更新
---
Tiger.Business.MES/iERP/U9C_MES.cs | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/Tiger.Business.MES/iERP/U9C_MES.cs b/Tiger.Business.MES/iERP/U9C_MES.cs
index 318ccf2..c10ace7 100644
--- a/Tiger.Business.MES/iERP/U9C_MES.cs
+++ b/Tiger.Business.MES/iERP/U9C_MES.cs
@@ -31,11 +31,11 @@
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)
@@ -65,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()
{
@@ -80,13 +88,14 @@
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())
--
Gitblit v1.9.3