工单接口更新

Ben Lin

2024-07-12 f0e6c77bc79f332909bcc908bf2fc7b367e1c610

工单接口更新

 Tiger.Business.MES/Task/Jobs.U9C_ME_GetWo.cs

@@ -13,7 +13,7 @@
namespace Tiger.Business.MES
{
    /// <summary>
    /// 从U9C获取物料信息
    /// 从U9C获取工单信息
    /// </summary>
    public class U9C_MES_GetWo : TigerJobBase, ITigerJob
    {
@@ -30,22 +30,22 @@
                var LastRunTime = string.IsNullOrEmpty(_lastRunTime) ? DateTime.Now.AddMinutes(-30) : Convert.ToDateTime(_lastRunTime);
                if ((DateTime.Now - LastRunTime).TotalMinutes > 30)
                {
                    GetBasItemInput input = new GetBasItemInput
                    GetWoInput input = new GetWoInput
                    {
                        startTime = LastRunTime.ToString("yyyy-MM-dd HH:mm:ss"),
                        endTime = LastRunTime.AddMinutes(30).ToString("yyyy-MM-dd HH:mm:ss")
                    };
                    var result = await DI.Resolve<IU9C_MES>().GetBasItem(input);
                    var result = await DI.Resolve<IU9C_MES>().GetBasWo(input);
                    if (!result.IsSuccessed)
                    {
                        Logger.Scheduler.Error($"获取物料信息异常:{result.Message}");
                        Logger.Scheduler.Error($"获取工单信息异常:{result.Message}");
                    }
                }
                //SaveLog(context, "从U9C获取物料信息成功");
                //SaveLog(context, "从U9C获取工单信息成功");
            }
            catch (System.Exception ex)
            {
                Logger.Scheduler.Fatal(ex, "获取物料信息异常");
                Logger.Scheduler.Fatal(ex, "获取工单信息异常");
            }
            await Task.CompletedTask;
        }

 Tiger.Business.MES/iERP/U9C_MES.cs

@@ -109,8 +109,8 @@
            Logger.Scheduler.Info(Biz.L($"工单信息开始同步。。。数据检查进行中。。。"));
            Logger.Scheduler.Info(Biz.L($"{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();
            List<BAS_ITEM> items = new();
            var list = db.Queryable<dynamic>().AS("mes_Mo").Where("ModifiedOn > @startTime And ModifiedOn < @endTime", new { startTime = input.startTime, endTime = input.endTime }).ToList();
            List<BIZ_MES_WO> items = new();
            foreach (var item in list)
            {
                var d = item as System.Dynamic.ExpandoObject;
@@ -118,32 +118,29 @@
                di = di?.ToDictionary(x => x.Key, x => x.Value);
                if (di != null)
                {
                    BAS_ITEM basItem = new()
                    BIZ_MES_WO woItem = new()
                    {
                        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(),
                        ORDER_NO = di["DocNo"] == null ? "" : di["DocNo"].ToString(),
                        ORDER_TYPE = di["DocTypeCode"] == null ? "" : di["DocTypeCode"].ToString(),
                        PLAN_QTY = di["ProductQty"] == null ? 0 : di["ProductQty"].ToInt32(),
                        CUST_CODE = di["CustomerCode"] == null ? "" : di["CustomerCode"].ToString(),
                        CREATE_TIME = di["CreatedOn"].ToDateTime(),
                        UPDATE_TIME = di["ModifiedOn"].ToDateTime(),
                        IS_ACTIVE = "Y",
                        IS_PROD = ((string)di["Code"]).StartsWith("2") ? "Y" : "N",
                        PLAN_START_TIME = di["CheckDate"].ToDateTime(),
                        STATUS = 0,
                    };
                    items.Add(basItem);
                    items.Add(woItem);
                }
            }

            Logger.Scheduler.Info(Biz.L($"工单信息存入实体中，总数：[{items.Count}]"));
            db = Biz.Db;
            var LastRun = db.Queryable<SYS_PARAM>().Where(q => q.PRMG_CODE == "Interface_LastRun" && q.PARAM_CODE == "GetItem_LastRun").Single();
            var LastRun = db.Queryable<SYS_PARAM>().Where(q => q.PRMG_CODE == "Interface_LastRun" && q.PARAM_CODE == "GetWo_LastRun").Single();
            LastRun.PARAM_VALUE = input.endTime;
            var dbTran = db.UseTran(() =>
            {
                db.Storageable(LastRun, "U9C_MES_GetItem").ExecuteCommand();
                db.Storageable(LastRun, "U9C_MES_GetWo").ExecuteCommand();
                if (items.Any())
                {
                    if (items.Count > 150)
@@ -151,7 +148,7 @@
                        db.Utilities.PageEach(items, 1000, pageList =>
                        {
                            var y = db.Storageable(pageList, "U9C")
                                   .WhereColumns(t => new { t.ITEM_CODE, t.GHOST_ROW })
                                   .WhereColumns(t => new { t.ORDER_NO, t.GHOST_ROW })
                                   .ToStorage();
                            y.BulkCopy();
                            y.BulkUpdate();
@@ -160,7 +157,7 @@
                    else
                    {
                        var s = db.Storageable(items, "U9C")
                               .WhereColumns(t => new { t.ITEM_CODE, t.GHOST_ROW })
                               .WhereColumns(t => new { t.ORDER_NO, t.GHOST_ROW })
                               .ToStorage();
                        s.AsInsertable.ExecuteCommand();
                        s.AsUpdateable.IgnoreColumns(x => x.ID).ExecuteCommand();

 Tiger.Business.WMS/AGV/Agv.cs

@@ -18,7 +18,7 @@
        /// <summary>
        /// AGV接口URL
        /// </summary>
        public static string agvurl { get; set; } = @$"{Biz.SysParamOld["agvUrl", "AgvApiAddress"].PARAM_VALUE}"; //@"http://10.12.16.249:10007/rcs/order/";
        public static string agvurl { get; set; } = @$"{Biz.SysParam["agvUrl", "AgvApiAddress"].PARAM_VALUE}"; //@"http://10.12.16.249:10007/rcs/order/";

        /// <summary>
        /// 备料完成通知

 Tiger.Business.WMS/iWMS/iWMS.cs

@@ -426,7 +426,7 @@
                                        MailTextBody = $"Hi All，<br/><br/>&nbsp;&nbsp;&nbsp;&nbsp;领料单[{entity_h.BILLCODE}]过账失败，<br/> T100返回消息：{ret.payload.std_data.execution.description}",
                                        MailBodyType = "Html",
                                        MailFilePath = null,
                                        Recipients = Biz.SysParamOld.Params.Where(q => q.PRMG_CODE == "PickingEmailGroup").Select(q => q.PARAM_VALUE).ToList(), // new List<string> { "ben.lin@tigerclouds.com", "dyfang@sharetronic.com", "dianzicang@sharetronic.com" },
                                        Recipients = Biz.SysParam.Params.Where(q => q.PRMG_CODE == "PickingEmailGroup").Select(q => q.PARAM_VALUE).ToList(), // new List<string> { "ben.lin@tigerclouds.com", "dyfang@sharetronic.com", "dianzicang@sharetronic.com" },
                                        Cc = new List<string>(),
                                        Sender = "WMS Email Admin",
                                        SenderAddress = "xcerp@sharetronic.com",

 Tiger.Business/DbCache/Biz.SysParam.cs

@@ -19,6 +19,6 @@
        /// 获取系统参数缓存
        /// </summary>
        public static SysParamCache SysParam => DbCacheBus.SysParamCache;
        public static SysParamCacheOld SysParamOld => DbCacheBus.SysParamCacheOld;
        //public static SysParamCacheOld SysParamOld => DbCacheBus.SysParamCacheOld;
    }//endClass
}

 Tiger.Business/DbCache/DbCacheBus.cs

@@ -16,7 +16,7 @@
    public class DbCacheBus : IDbCacheBus
    {
        public static SysParamCache SysParamCache = new();
        public static SysParamCacheOld SysParamCacheOld = new();
        //public static SysParamCacheOld SysParamCacheOld = new();
        public static CodeRuleCache CodeRuleCache = new();
        #region Functions
        public ISysParamCache GetSysParamCache() => SysParamCache;
@@ -27,7 +27,7 @@
            {
                //开启系统参数缓存
                SysParamCache.Start();
                SysParamCacheOld.Start();
                //SysParamCacheOld.Start();
                ConsoleExt.WriteLine("Start SysParam Cache Auto Update Thread..........", ConsoleColor.Yellow);
                //开启系统参数缓存
                CodeRuleCache.Start();
@@ -41,7 +41,7 @@
            {
                //关闭系统参数缓存
                SysParamCache.Stop();
                SysParamCacheOld.Stop();
                //SysParamCacheOld.Stop();
                //关闭系统参数缓存
                CodeRuleCache.Stop();
            }