From 531f16f2f15bf792e3e719e00abb57a95356dedd Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期一, 21 四月 2025 12:04:15 +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 | 668 ++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 513 insertions(+), 155 deletions(-)
diff --git a/Tiger.Business.MES/iERP/U9C_MES.cs b/Tiger.Business.MES/iERP/U9C_MES.cs
index b96b9a0..c10ace7 100644
--- a/Tiger.Business.MES/iERP/U9C_MES.cs
+++ b/Tiger.Business.MES/iERP/U9C_MES.cs
@@ -12,6 +12,12 @@
using Tiger.IBusiness;
using Microsoft.AspNetCore.Http;
using Tiger.Model.Minsun;
+using Org.BouncyCastle.Asn1.Tsp;
+using Tiger.Model.Entitys.MES.Position;
+using Apache.NMS.ActiveMQ.Commands;
+using System.Security.Cryptography;
+using System.Diagnostics;
+using Tiger.Model.MES.Yada;
namespace Tiger.Business.MES
{
@@ -22,87 +28,111 @@
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
- public async Task<ApiAction> GetBasItem(GetBasItemInput 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();
- foreach (var item in list)
+ var itemExts = new List<BAS_ITEM_EXT>();
+ if (list != null && list.Count > 0)
{
- 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)
+ foreach (var item in list)
{
- var orgId = di["Org"] == null ? "" : di["Org"].ToString();
- BAS_ITEM basItem = new()
+ 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)
{
- ID = di["ID"].ToString(),
- ITEM_CODE = di["Code"] == null ? "" : di["Code"].ToString(),
- ITEM_NAME = di["Name"] == null ? "" : di["Name"].ToString(),
- ITEM_DESC = di["Description"] == null ?"":di["Description"].ToString(),
- SPEC = di["SPECS"] == null ? "" : di["SPECS"].ToString(),
- ITEM_TYPE = di["CategoryCode"] == null ? "" : di["CategoryCode"].ToString(),
- UNIT = di["InventorySecondUOM"] == null ? "" : di["InventorySecondUOM"].ToString(),
- PROD_TYPE = di["ProductTypeCode"] == null ? "" : di["ProductTypeCode"].ToString(),
- CREATE_TIME = di["CreatedOn"].ToDateTime(),
- 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);
- }
- }
-
- 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;
- var dbTran = db.UseTran(() =>
- {
- db.Storageable(LastRun, "U9C_MES_GetItem").ExecuteCommand();
- if (items.Any())
- {
- if (items.Count > 150)
- {
- db.Utilities.PageEach(items, 1000, pageList =>
+ var orgId = di["Org"] == null ? "" : di["Org"].ToString();
+ BAS_ITEM basItem = new()
{
- var y = db.Storageable(pageList, "U9C")
- .WhereColumns(t => new { t.ITEM_CODE, t.GHOST_ROW })
- .ToStorage();
- y.BulkCopy();
- y.BulkUpdate();
- });
- }
- else
- {
- var s = db.Storageable(items, "U9C")
- .WhereColumns(t => new { t.ITEM_CODE, t.GHOST_ROW })
- .ToStorage();
- s.AsInsertable.ExecuteCommand();
- s.AsUpdateable.IgnoreColumns(x => x.ID).ExecuteCommand();
+ ID = di["ID"].ToString(),
+ ITEM_CODE = di["Code"] == null ? "" : di["Code"].ToString(),
+ ITEM_NAME = di["Name"] == null ? "" : di["Name"].ToString(),
+ ITEM_DESC = di["Description"] == null ? "" : di["Description"].ToString(),
+ SPEC = di["SPECS"] == null ? "" : di["SPECS"].ToString(),
+ ITEM_TYPE = di["CategoryCode"] == null ? "" : di["CategoryCode"].ToString(),
+ UNIT = di["InventorySecondUOM"] == null ? "" : di["InventorySecondUOM"].ToString(),
+ PROD_TYPE = di["ProductTypeCode"] == null ? "" : di["ProductTypeCode"].ToString(),
+ CREATE_TIME = di["CreatedOn"].ToDateTime(),
+ 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(),
+ 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()
+ {
+ ITEM_ID = basItem.ID,
+ ITEM_CODE = (di["Code"] ?? "").ToString(),
+ Model = (di["Model"] ?? "").ToString(),
+ Input = (di["Input"] ?? "").ToString(),
+ Display = (di["Display"] ?? "").ToString(),
+ OutPut = (di["OutPut"] ?? "").ToString(),
+ Power = (di["Power"] ?? "").ToString(),
+ Accuracy = (di["Accuracy"] ?? "").ToString(),
+ Remark = (di["Remark"] ?? "").ToString(),
+ Packaging = (di["Packaging"] ?? "").ToString(),
+ SapCode = (di["Code1"] ?? "").ToString(),
+ ReceiptMode = (di["ReceiptMode"] ?? "").ToInt32(),
+ };
+ itemExts.Add(extInfo);
}
}
-
- });
- if (!dbTran.IsSuccess)
- {
- action.CatchExceptionWithLog(dbTran.ErrorException, $"鏁版嵁澶勭悊澶辫触");
- Logger.Scheduler.Error(action.Message);
}
+ Logger.Scheduler.Info($"鐗╂枡淇℃伅瀛樺叆瀹炰綋涓紝鎬绘暟锛歔{items.Count}]");
+ //var dbTran = db.UseTran(() =>
+ //{
+ if (items.Any())
+ {
+ 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();
+ });
+ }
+ if (itemExts.Any())
+ {
+ 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();
+ });
+ }
+ //});
+ //if (!dbTran.IsSuccess)
+ //{
+ // action.CatchExceptionWithLog(dbTran.ErrorException, $"鏁版嵁澶勭悊澶辫触");
+ // Logger.Scheduler.Error(action.Message);
+ //}
Logger.Scheduler.Info($"鐗╂枡淇℃伅瀛樺叆鏁版嵁搴擄紝鎬绘暟锛歔{items.Count}]");
+ action.Message = $"鐗╂枡淇℃伅瀛樺叆鏁版嵁搴擄紝鎬绘暟锛歔{items.Count}]";
return action;
-
}
/// <summary>
- /// 鑾峰彇宸ュ崟淇℃伅
+ /// 鍚屾宸ュ崟淇℃伅
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
@@ -115,62 +145,66 @@
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)
+ if (list != null && list.Count > 0)
{
- 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)
+ foreach (var item in list)
{
- 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()
+ 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)
{
- 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 = 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(),
- SALES_ORDER = di["SrcDoc_SrcDocNo"] == null ? "" : di["SrcDoc_SrcDocNo"].ToString(),
- };
- items.Add(woItem);
+ 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 = basItem != null ? basItem.ITEM_CODE : "",
+ CREATE_TIME = di["CreatedOn"].ToDateTime(),
+ UPDATE_TIME = di["ModifiedOn"].ToDateTime(),
+ PLAN_START_TIME = di["CreatedOn"].ToDateTime(),
+ STATUS = 0,
+ AUTH_ORG = orgs.Where(x => x.ID == orgId).Select(q => q.ORG_CODE).FirstOrDefault(),
+ SALES_ORDER = di["SrcDoc_SrcDocNo"] == null ? "" : di["SrcDoc_SrcDocNo"].ToString(),
+ SALES_REMARK = di["SoLineMemo"] == null ? "" : di["SoLineMemo"].ToString(),
+ SERIAL_NO = di["MoSerial"] == null ? "" : di["MoSerial"].ToString(),
+ SN_PREFIX = di["InBarHead"] == null ? "" : di["InBarHead"].ToString(),
+ 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())))
+ {
+ items.Add(woItem);
+ }
+ else
+ {
+ var _wo = await Biz.Db.Queryable<BIZ_MES_WO>().Where(x => x.ORDER_NO == woItem.ORDER_NO).FirstAsync();
+ Logger.Scheduler.Info($"宸ュ崟[{woItem.ORDER_NO}]淇℃伅瀛樺湪骞朵笖鐘舵�佷笉鏄垵濮嬪寲锛屾垨鑰呭伐鑹哄凡缁忛厤缃�傜姸鎬乕{EnumHelper.GetDesc(EnumHelper.GetEnum<BIZ_MES_WO.STATUSs>(_wo.STATUS))}]锛屽伐鑹洪厤缃姸鎬乕{EnumHelper.GetDesc(EnumHelper.GetEnum<BIZ_MES_WO.ROUTE_STATUSs>(_wo.ROUTE_STATUS))}]");
+ }
+ }
}
}
-
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;
+ 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)
+ db.Utilities.PageEach(items, 100, pageList =>
{
- db.Utilities.PageEach(items, 1000, pageList =>
- {
- var y = db.Storageable(pageList, "U9C")
- .WhereColumns(t => new { t.ORDER_NO, t.GHOST_ROW })
- .ToStorage();
- y.BulkCopy();
- y.BulkUpdate();
- });
- }
- 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();
+ });
}
});
@@ -179,18 +213,79 @@
action.CatchExceptionWithLog(dbTran.ErrorException, $"鏁版嵁澶勭悊澶辫触");
Logger.Scheduler.Error(action.Message);
}
-
Logger.Scheduler.Info($"宸ュ崟淇℃伅瀛樺叆鏁版嵁搴擄紝鎬绘暟锛歔{items.Count}]");
+
+ if (action.IsSuccessed && items.Count > 0)
+ {
+ //寮傛璺戠粦瀹氬伐鑹鸿矾绾�
+ Work.DoAsync(() =>
+ {
+ List<BIZ_MES_WO> woList = new();
+ foreach (var wo in items)
+ {
+ //鍙湁宸ュ崟鐘舵�佷负鍒濆鍖栧拰宸ヨ壓鐘舵�佷负寰呴厤缃墠鑷姩缁戝畾宸ヨ壓璺嚎
+ if (wo.STATUS == BIZ_MES_WO.STATUSs.Init.GetValue() && wo.ROUTE_STATUS == BIZ_MES_WO.ROUTE_STATUSs.WaitSet.GetValue())
+ {
+ try
+ {
+ var rot = Biz.Db.Queryable<MES_PROD_OPER>()
+ .GroupBy(x => new { x.PROD_CODE, x.ROT_ID })
+ .Where(q => q.PROD_CODE == wo.ITEM_CODE)
+ .Select(it => new
+ {
+ PROD_CODE = it.PROD_CODE,
+ ROT_ID = it.ROT_ID
+ })
+ .First();
+ if (rot != null)
+ {
+ SugarParameter[] pars = Biz.Db.Ado.GetParameters(new { ROT_ID = rot.ROT_ID, WO = wo.ORDER_NO, ERR_CODE = 0, ERR_MSG = "" });
+ pars[2].Direction = System.Data.ParameterDirection.Output;
+ pars[3].Direction = System.Data.ParameterDirection.Output;
+ Biz.Db.Ado.UseStoredProcedure().ExecuteCommand("SP_MES_PROD2WO", pars);
+ if (pars[2].Value.ToInt32() == 0)
+ {
+ Logger.Scheduler.Info($"宸ュ崟[{wo.ORDER_NO}]缁戝畾宸ヨ壓璺嚎[{rot.ROT_ID}]鎴愬姛,{pars[3].Value.ToString()}");
+ wo.ROUTE_STATUS = BIZ_MES_WO.ROUTE_STATUSs.Finish.GetValue();
+ woList.Add(wo);
+ }
+ else
+ {
+ Logger.Scheduler.Error(pars[3].Value.ToString());
+ }
+ }
+ }
+ catch (System.Exception ex)
+ {
+ Logger.Scheduler.Error(ex.Message);
+ }
+ }
+ }
+ var _db = Biz.Db;
+ var dbTran = _db.UseTran(() =>
+ {
+ if (woList.Any())
+ {
+ _db.Updateable(woList, "U9C").UpdateColumns(x => new { x.ROUTE_STATUS }).ExecuteCommand();
+ }
+
+ });
+ if (!dbTran.IsSuccess)
+ {
+ Logger.Scheduler.Error(dbTran.ErrorException.Message);
+ }
+ });
+ }
return action;
}
/// <summary>
- /// 鑾峰彇瀹㈡埛淇℃伅
+ /// 鍚屾瀹㈡埛淇℃伅
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
/// <exception cref="NotImplementedException"></exception>
- public async Task<ApiAction> GetCustomer(GetCustomerInput input)
+ public ApiAction GetCustomer(U9C_Base_Input input)
{
var action = new ApiAction();
Logger.Scheduler.Info($"瀹㈡埛淇℃伅寮�濮嬪悓姝ャ�傘�傘�傛暟鎹鏌ヨ繘琛屼腑銆傘�傘��");
@@ -199,71 +294,334 @@
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)
+ if (list != null && list.Count > 0)
{
- 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)
+ foreach (var item in list)
{
- var orgId = di["Org"] == null ? "" : di["Org"].ToString();
- BAS_CUSTOMER custItem = new()
+ 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)
{
- 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(),
- AUTH_ORG = orgs.Where(x => x.ID == orgId).Select(q => q.ORG_CODE).FirstOrDefault(),
- };
- items.Add(custItem);
+ var orgId = di["Org"] == null ? "" : di["Org"].ToString();
+ 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(),
+ AUTH_ORG = orgs.Where(x => x.ID == orgId).Select(q => q.ORG_CODE).FirstOrDefault(),
+ SEARCH_CODE = di["SearchCode"] == null ? "" : di["SearchCode"].ToString(),
+ SHORT_NAME = di["ShortName"] == null ? "" : di["ShortName"].ToString(),
+ };
+ 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(() =>
+ //var dbTran = db.UseTran(() =>
+ // {
+ if (items.Any())
{
- db.Storageable(LastRun, "U9C_MES_GetCustomer").ExecuteCommand();
- if (items.Any())
+ db.Utilities.PageEach(items, 100, pageList =>
{
- 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);
+ 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();
+ });
}
+ // });
+ //if (!dbTran.IsSuccess)
+ //{
+ // action.CatchExceptionWithLog(dbTran.ErrorException, $"鏁版嵁澶勭悊澶辫触");
+ // Logger.Scheduler.Error(action.Message);
+ //}
Logger.Scheduler.Info($"瀹㈡埛淇℃伅瀛樺叆鏁版嵁搴擄紝鎬绘暟锛歔{items.Count}]");
+ action.Message = $"瀹㈡埛淇℃伅瀛樺叆鏁版嵁搴擄紝鎬绘暟锛歔{items.Count}]";
return action;
}
- public Task<ApiAction> GetSupplier(GetSupplierInput input)
+ /// <summary>
+ /// 鍚屾渚涘簲鍟�
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ public ApiAction GetSupplier(U9C_Base_Input 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_Supplier").Where("ModifiedOn > @startTime And ModifiedOn < @endTime", new { startTime = input.startTime, endTime = input.endTime }).ToList();
+ var orgs = Biz.Db.Queryable<SYS_ORGANIZATION>().ToList();
+ List<BAS_SUPPLIER> items = new();
+ if (list != null && list.Count > 0)
+ {
+ 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)
+ {
+ var orgId = di["Org"] == null ? "" : di["Org"].ToString();
+ BAS_SUPPLIER suppItem = new()
+ {
+ SUPP_CODE = di["Code"] == null ? "" : di["Code"].ToString(),
+ SUPP_NAME_CN = di["Name"] == null ? "" : di["Name"].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(suppItem);
+ }
+ }
+ }
+ Logger.Scheduler.Info($"渚涘簲鍟嗕俊鎭瓨鍏ュ疄浣撲腑锛屾�绘暟锛歔{items.Count}]");
+ db = Biz.Db;
+ //var dbTran = db.UseTran(() =>
+ // {
+ if (items.Any())
+ {
+ 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();
+ });
+ }
+
+ //});
+ //if (!dbTran.IsSuccess)
+ //{
+ // action.CatchExceptionWithLog(dbTran.ErrorException, $"鏁版嵁澶勭悊澶辫触");
+ // Logger.Scheduler.Error(action.Message);
+ //}
+ Logger.Scheduler.Info($"渚涘簲鍟嗕俊鎭瓨鍏ユ暟鎹簱锛屾�绘暟锛歔{items.Count}]");
+ action.Message = $"渚涘簲鍟嗕俊鎭瓨鍏ユ暟鎹簱锛屾�绘暟锛歔{items.Count}]";
+ return action;
+ }
+
+ /// <summary>
+ /// 鍚屾瀹㈡埛鏉＄爜
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ public ApiAction GetCustBarCode(U9C_Base_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_MoBarCode").Where("ModifiedOn > @startTime And ModifiedOn < @endTime", new { startTime = input.startTime, endTime = input.endTime }).ToList();
+ 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;
+ var di = d as IDictionary<string, object>;
+ di = di?.ToDictionary(x => x.Key, x => x.Value);
+ if (di != null)
+ {
+ if (di["MoDoc"] != null)
+ {
+ 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 ?? "",
+ WORK_ORDER = di["MoDoc"].ToString(),
+ CUST_SN = di["OutBarCode"] == null ? "" : di["OutBarCode"].ToString(),
+ FLOW_SN = di["InBarCode"] == null ? "" : di["InBarCode"].ToString(),
+ ITEM_CODE = di["ItemCode"] == null ? "" : di["ItemCode"].ToString(),
+ 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);
+ }
+ }
+ }
+ }
+ Logger.Scheduler.Info($"瀹㈡埛鏉＄爜淇℃伅瀛樺叆瀹炰綋涓紝鎬绘暟锛歔{items.Count}]");
+ db = Biz.Db;
+ //var dbTran = db.UseTran(() =>
+ //{
+ if (items.Any())
+ {
+ 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.UPDATE_TIME, q.UPDATE_USER, q.AUTH_ORG }).ExecuteCommand();
+ });
+ }
+
+ //});
+ //if (!dbTran.IsSuccess)
+ //{
+ // action.CatchExceptionWithLog(dbTran.ErrorException, $"鏁版嵁澶勭悊澶辫触");
+ // Logger.Scheduler.Error(action.Message);
+ //}
+ Logger.Scheduler.Info($"瀹㈡埛鏉＄爜淇℃伅瀛樺叆鏁版嵁搴擄紝鎬绘暟锛歔{items.Count}]");
+ action.Message = $"瀹㈡埛鏉＄爜淇℃伅瀛樺叆鏁版嵁搴擄紝鎬绘暟锛歔{items.Count}]";
+ return action;
+ }
+
+ public ApiAction GetU9CBasWo(U9C_Base_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_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();
+ if (list != null && list.Count > 0)
+ {
+ 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)
+ {
+ 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 = basItem != null ? basItem.ITEM_CODE : "",
+ CREATE_TIME = di["CreatedOn"].ToDateTime(),
+ UPDATE_TIME = di["ModifiedOn"].ToDateTime(),
+ PLAN_START_TIME = di["CreatedOn"].ToDateTime(),
+ STATUS = 0,
+ WS_CODE = di["Department"] == null ? "" : di["Department"].ToString(),
+ AUTH_ORG = orgs.Where(x => x.ID == orgId).Select(q => q.ORG_CODE).FirstOrDefault(),
+ SALES_ORDER = di["SrcDoc_SrcDocNo"] == null ? "" : di["SrcDoc_SrcDocNo"].ToString(),
+ SALES_REMARK = di["SoLineMemo"] == null ? "" : di["SoLineMemo"].ToString(),
+ SERIAL_NO = di["MoSerial"] == null ? "" : di["MoSerial"].ToString(),
+ SN_PREFIX = di["InBarHead"] == null ? "" : di["InBarHead"].ToString(),
+ 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.Imported.GetValue()))
+ {
+ items.Add(woItem);
+ }
+ else
+ {
+ var _wo = Biz.Db.Queryable<BIZ_MES_WO>().Where(x => x.ORDER_NO == woItem.ORDER_NO).First();
+ Logger.Scheduler.Info($"宸ュ崟[{woItem.ORDER_NO}]淇℃伅瀛樺湪骞朵笖鐘舵�佷笉鏄垵濮嬪寲锛屾垨鑰呭伐鑹哄凡缁忛厤缃�傜姸鎬乕{EnumHelper.GetDesc(EnumHelper.GetEnum<BIZ_MES_WO.STATUSs>(_wo.STATUS))}]锛屽伐鑹洪厤缃姸鎬乕{EnumHelper.GetDesc(EnumHelper.GetEnum<BIZ_MES_WO.ROUTE_STATUSs>(_wo.ROUTE_STATUS))}]");
+ }
+ }
+ }
+ }
+ Logger.Scheduler.Info($"宸ュ崟淇℃伅瀛樺叆瀹炰綋涓紝鎬绘暟锛歔{items.Count}]");
+ db = Biz.Db;
+ //var dbTran = db.UseTran(() =>
+ //{
+ if (items.Any())
+ {
+ 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();
+ });
+ }
+
+ //});
+ //if (!dbTran.IsSuccess)
+ //{
+ // action.CatchExceptionWithLog(dbTran.ErrorException, $"鏁版嵁澶勭悊澶辫触");
+ // Logger.Scheduler.Error(action.Message);
+ //}
+ action.Message = $"宸ュ崟淇℃伅瀛樺叆鏁版嵁搴擄紝鎬绘暟锛歔{items.Count}]";
+ Logger.Scheduler.Info($"{action.Message}");
+ if (action.IsSuccessed && items.Count > 0)
+ {
+ //寮傛璺戠粦瀹氬伐鑹鸿矾绾�
+ Work.DoAsync(() =>
+ {
+ List<BIZ_MES_WO> woList = new();
+ foreach (var wo in items)
+ {
+ //鍙湁宸ュ崟鐘舵�佷负鍒濆鍖栧拰宸ヨ壓鐘舵�佷负寰呴厤缃墠鑷姩缁戝畾宸ヨ壓璺嚎
+ if (wo.STATUS == BIZ_MES_WO.STATUSs.Init.GetValue() && wo.ROUTE_STATUS == BIZ_MES_WO.ROUTE_STATUSs.WaitSet.GetValue())
+ {
+ try
+ {
+ var rot = Biz.Db.Queryable<MES_PROD_OPER>()
+ .GroupBy(x => new { x.PROD_CODE, x.ROT_ID })
+ .Where(q => q.PROD_CODE == wo.ITEM_CODE)
+ .Select(it => new
+ {
+ PROD_CODE = it.PROD_CODE,
+ ROT_ID = it.ROT_ID
+ })
+ .First();
+ if (rot != null)
+ {
+ SugarParameter[] pars = Biz.Db.Ado.GetParameters(new { ROT_ID = rot.ROT_ID, WO = wo.ORDER_NO, ERR_CODE = 0, ERR_MSG = "" });
+ pars[2].Direction = System.Data.ParameterDirection.Output;
+ pars[3].Direction = System.Data.ParameterDirection.Output;
+ Biz.Db.Ado.UseStoredProcedure().ExecuteCommand("SP_MES_PROD2WO", pars);
+ if (pars[2].Value.ToInt32() == 0)
+ {
+ Logger.Scheduler.Info($"宸ュ崟[{wo.ORDER_NO}]缁戝畾宸ヨ壓璺嚎[{rot.ROT_ID}]鎴愬姛,{pars[3].Value.ToString()}");
+ wo.ROUTE_STATUS = BIZ_MES_WO.ROUTE_STATUSs.Finish.GetValue();
+ woList.Add(wo);
+ }
+ else
+ {
+ Logger.Scheduler.Error(pars[3].Value.ToString());
+ }
+ }
+ }
+ catch (System.Exception ex)
+ {
+ Logger.Scheduler.Error(ex.Message);
+ }
+ }
+ }
+ var _db = Biz.Db;
+ var dbTran = _db.UseTran(() =>
+ {
+ 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();
+ }
+
+ });
+ if (!dbTran.IsSuccess)
+ {
+ Logger.Scheduler.Error(dbTran.ErrorException.Message);
+ }
+ });
+ }
+ return action;
}
}
}
--
Gitblit v1.9.3