From faf6facde340188539a94c93002684b4c8477b26 Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期二, 30 七月 2024 09:03:46 +0800
Subject: [PATCH] Merge branch 'master' of http://47.115.28.255:8110/r/TigerClouds-Tech/Server/TigerApi6_2024
---
Tiger.Business.MES/iERP/U9C_MES.cs | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/Tiger.Business.MES/iERP/U9C_MES.cs b/Tiger.Business.MES/iERP/U9C_MES.cs
index 1fc1636..ead57d8 100644
--- a/Tiger.Business.MES/iERP/U9C_MES.cs
+++ b/Tiger.Business.MES/iERP/U9C_MES.cs
@@ -29,6 +29,7 @@
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,6 +53,7 @@
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);
}
@@ -110,6 +113,7 @@
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();
+ var orgs = Biz.Db.Queryable<SYS_ORGANIZATION>().ToList();
List<BIZ_MES_WO> items = new();
foreach (var item in list)
{
@@ -118,17 +122,21 @@
di = di?.ToDictionary(x => x.Key, x => x.Value);
if (di != null)
{
+ 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()
{
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 = di["ItemMaster"] == null ? "" : di["ItemMaster"].ToString(),
+ ITEM_CODE = basItem != null? basItem.ITEM_CODE: "",
CREATE_TIME = di["CreatedOn"].ToDateTime(),
UPDATE_TIME = di["ModifiedOn"].ToDateTime(),
PLAN_START_TIME = di["CheckDate"].ToDateTime(),
STATUS = 0,
+ AUTH_ORG = orgs.Where(x => x.ID == orgId).Select(q=>q.ORG_CODE).FirstOrDefault(),
};
items.Add(woItem);
}
@@ -188,6 +196,7 @@
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)
{
@@ -196,6 +205,7 @@
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(),
@@ -203,6 +213,7 @@
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);
}
--
Gitblit v1.9.3