Tiger.Api/Controllers/Test/TestController.B.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
Tiger.Business.MES/Task/Jobs.U9C_ME_GetItem.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
Tiger.Business.MES/iERP/U9C_MES.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
Tiger.Business/BizSettings.json | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
Tiger.IBusiness/MES/iERP/IU9C_MES.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
Tiger.Model.Net/Entitys/BAS/BAS_ITEM.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
Tiger.Model.Net/Entitys/BAS/V_BAS_PKG_DTL.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
Tiger.Model.Net/Entitys/MES/ParameterEntity/U9C_MES_Input.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
Tiger.Model.Net/Tiger.Model.Net.csproj | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
Tiger.Api/Controllers/Test/TestController.B.cs
@@ -109,5 +109,20 @@ } return Ok(response); } [HttpPost] public async Task<IActionResult> GetU9CItem([FromBody] ApiAction<GetBasItemInput> action) { ApiAction response = new(); try { response = response.GetResponse(await DI.Resolve<IU9C_MES>().GetBasItem(action.Data)); } catch (System.Exception ex) { response = response.GetResponse().CatchExceptionWithLog(ex); } return Ok(response); } } } Tiger.Business.MES/Task/Jobs.U9C_ME_GetItem.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,53 @@ using Rhea.Common; using Sundial; using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading; using System.Threading.Tasks; using Tiger.IBusiness; using Tiger.Model; using Tiger.Model.Minsun; namespace Tiger.Business.MES { /// <summary> /// ä»U9Cè·åç©æä¿¡æ¯ /// </summary> public class U9C_MES_GetItem : TigerJobBase, ITigerJob { public string Id { get; set; } = Guid.NewGuid().ToString("N"); public string Tag { get; set; } = "U9C_MES_GetItem Interface Job"; public string Name { get; set; } = "U9C_MES_GetItem Interface Job"; public async Task ExecuteAsync(JobExecutingContext context, CancellationToken stoppingToken) { Logger.Scheduler.Info(context.Trigger.ConvertToMonitor()); try { var _lastRunTime = Biz.SysParam["GetItem_LastRun", "Interface_LastRun"].PARAM_VALUE; var LastRunTime = string.IsNullOrEmpty(_lastRunTime) ? DateTime.Now.AddDays(-1) : Convert.ToDateTime(_lastRunTime); if ((DateTime.Now - LastRunTime).TotalMinutes > 30) { GetBasItemInput input = new GetBasItemInput { startTime = LastRunTime.ToString("yyyy-MM-dd HH:mm:ss"), endTime = LastRunTime.AddDays(1).ToString("yyyy-MM-dd HH:mm:ss") }; var result = await DI.Resolve<IU9C_MES>().GetBasItem(input); if (!result.IsSuccessed) { Logger.Scheduler.Error($"è·åç©æä¿¡æ¯å¼å¸¸:{result.Message}"); } } //SaveLog(context, "ä»U9Cè·åç©æä¿¡æ¯æå"); } catch (System.Exception ex) { Logger.Scheduler.Fatal(ex, "è·åç©æä¿¡æ¯å¼å¸¸"); } await Task.CompletedTask; } } } Tiger.Business.MES/iERP/U9C_MES.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,111 @@ using Tiger.Model; using SqlSugar; using System; using System.Collections.Generic; using System.Linq.Expressions; using System.Text; using System.Threading.Tasks; using Rhea.Common; using System.Net; using System.Linq; using Newtonsoft.Json; using Tiger.IBusiness; using Microsoft.AspNetCore.Http; using Tiger.Model.Minsun; namespace Tiger.Business.MES { public partial class U9C_MES : IU9C_MES { /// <summary> /// ä»U9Cæåç©ææ°æ® /// </summary> /// <param name="input"></param> /// <returns></returns> public async Task<ApiAction> GetBasItem(GetBasItemInput input) { var action = new ApiAction(); 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(); 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) { BAS_ITEM basItem = 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(), CREATE_TIME = di["CreatedOn"].ToDateTime(), UPDATE_TIME = di["ModifiedOn"].ToDateTime(), IS_ACTIVE = "Y", IS_PROD = ((string)di["Code"]).StartsWith("2") ? "Y" : "N", }; items.Add(basItem); } } 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(); 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 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(); } } }); if (!dbTran.IsSuccess) { action.CatchExceptionWithLog(dbTran.ErrorException, $"æ°æ®å¤ç失败"); Logger.Scheduler.Error(action.Message); } Logger.Scheduler.Info(Biz.L($"ç©æä¿¡æ¯åå ¥æ°æ®åºï¼æ»æ°ï¼[{items.Count}]")); return action; } public Task<ApiAction> GetCustomer(GetCustomerInput input) { throw new NotImplementedException(); } public Task<ApiAction> GetSupplier(GetSupplierInput input) { throw new NotImplementedException(); } } } Tiger.Business/BizSettings.json
@@ -27,6 +27,7 @@ "DbType": "SqlServer", //"ConnectionString": "server=172.18.8.57;uid=sa;pwd=bmsEia9IS4VByWJr;database=SharetronicWmsDb_DGSC;", //"ConnectionString": "server=172.16.80.40;uid=sa;pwd=Yada@321654;database=MES;" //"ConnectionString": "server=localhost;uid=sa;pwd=p@ssw0rd;database=MES;" //"ConnectionString": "server=(localdb)\\ProjectsV13;uid=sa;pwd=p@ssw0rd;database=MES;", "ConnectionString": "server=47.115.28.255;uid=sa;pwd=p@ssw0rd;database=MES;" //"DbType": "Sqlite", @@ -41,6 +42,11 @@ //"ConnectionString": "server=47.115.28.255;port=3308;database=wms;uid=tiger;pwd=p@ssw0rd@t1ger;charset='utf8';SslMode=None;AllowLoadLocalInfile=true;" //"ConnectionString": "server=47.115.28.255;port=3308;database=tigerdb;uid=tiger;pwd=p@ssw0rd@t1ger;charset='utf8';SslMode=None;AllowLoadLocalInfile=true;" //"ConnectionString": "server=localhost;port=3306;database=mqdb;uid=benlin;pwd=benlin@123;charset='utf8';SslMode=None;AllowLoadLocalInfile=true;" }, "YadaU9C": { "DbType": "SqlServer", "ConnectionString": "server=172.16.80.20;uid=Mes_View;pwd=yd@123456;database=20240703;" //"ConnectionString": "server=172.18.8.55;database=wms;uid=root;pwd=Share@123;charset='utf8';SslMode=None;AllowLoadLocalInfile=true;" }, "Test": { //"DbType": "SqlServer", @@ -87,7 +93,7 @@ "CurrentProject": "MqBarcode", "JuDian": "XCSJ", "IsTestServer": false, "IsUseDbCache": false, "IsUseDbCache": true, "UploadAddress": "D:\\nginx-1.26.0\\html", "DownloadAddress": "http://47.115.28.255:8800/files" "DownloadAddress": "http://localhost:8800/files" } Tiger.IBusiness/MES/iERP/IU9C_MES.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,18 @@ using Rhea.Common; using System; using System.Collections.Generic; using System.Data; using System.Linq; using System.Text; using System.Threading.Tasks; using Tiger.Model; namespace Tiger.IBusiness { public interface IU9C_MES { public Task<ApiAction> GetBasItem(GetBasItemInput input); public Task<ApiAction> GetCustomer(GetCustomerInput input); public Task<ApiAction> GetSupplier(GetSupplierInput input); } } Tiger.Model.Net/Entitys/BAS/BAS_ITEM.cs
@@ -33,6 +33,10 @@ /// ç©æåç§° /// </summary> public string ITEM_NAME { get; set; } /// <summary> /// ç©ææè¿° /// </summary> public string ITEM_DESC { get; set; } /// <summary> /// ç©åå类代ç @@ -65,6 +69,15 @@ public string UNIT { get; set; } /// <summary> /// 产åç±»å /// </summary> public string PROD_TYPE { get; set; } /// <summary> /// æ¯å¦æå(Y/N) /// </summary> public string IS_PROD { get; set; } /// <summary> /// æ¯å¦å¯ç¨(Y/N) /// </summary> public string IS_ACTIVE { get; set; } Tiger.Model.Net/Entitys/BAS/V_BAS_PKG_DTL.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,93 @@ using System; using SqlSugar; using System.Linq; using System.ComponentModel; using System.Collections.Generic; namespace Tiger.Model { /// <summary> /// å®ä½ï¼å è£ æ°éæç» /// </summary> [Description("Primary:ID")] [Serializable] [SugarTable("V_BAS_PKG_DTL")] public class V_BAS_PKG_DTL : DbEntityWithAuth { #region æé 彿° /// <summary> /// å®ä½ï¼å è£ æ°éæç» /// </summary> public V_BAS_PKG_DTL() {} #endregion #region å ¬å ±å±æ§ /// <summary> /// å è£ è§åID /// </summary> public string PKG_RULE_ID { get; set; } /// <summary> /// å è£ /è½½å ·ç¼ç /// </summary> public string PKG_CODE { get; set; } /// <summary> /// å è£ å±çº§ /// </summary> public int PKG_LEVEL { get; set; } /// <summary> /// å è£ æ°é /// </summary> public int PKG_QTY { get; set; } /// <summary> /// æ ç¾æ¨¡æ¿ç¼ç /// </summary> public string LABEL_CODE { get; set; } /// <summary> /// å è£ /è½½å ·åç§° /// </summary> public string PKG_NAME { get; set; } /// <summary> /// 夿³¨ /// </summary> public string REMARK { get; set; } #endregion #region èæå±æ§ /*ä¾å [SugarColumn(IsIgnore = true)] public string FieldName { get; set; } */ #endregion #region å¤é®å±æ§ /*ä¾å //ä¸å¯¹ä¸å¤é®å¯¼èª [Navigate(NavigateType.OneToOne, nameof(ClassAId))]//ä¸å¯¹ä¸ ClassAIdæ¯V_BAS_PKG_DTLç±»éé¢çå¤é®IDåæ®µ public ClassA ClassA { get; set; } //注æç¦æ¢æå¨èµå¼ï¼åªè½æ¯null //ä¸å¯¹å¤å¤é®å¯¼èª [Navigate(NavigateType.OneToMany, nameof(ClassA.V_BAS_PKG_DTLId))]//ClassA表ä¸çV_BAS_PKG_DTLId public List<ClassA> ClassAList { get; set; }//注æç¦æ¢æå¨èµå¼ï¼åªè½æ¯null //å¤å¯¹å¤å¤é®å¯¼èª [Navigate(typeof(MappingClass), nameof(MappingClass.V_BAS_PKG_DTLId), nameof(MappingClass.ClassAId))]//注æé¡ºåº public List<ClassA> ClassAList { get; set; } //注æç¦æ¢æå¨èµå¼ï¼åªè½æ¯null */ #endregion #region æä¸¾åé /*ä¾å public enum FieldNames { [Description("æä¸¾æè¿°0")] Enum0, [Description("æä¸¾æè¿°1")] Enum1, } */ #endregion #region å ¬å ±æ¹æ³ #endregion }//endClass } Tiger.Model.Net/Entitys/MES/ParameterEntity/U9C_MES_Input.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,28 @@ using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; namespace Tiger.Model { public class U9C_MES_Input { public string startTime { get; set; } public string endTime { get; set; } public string triggerDetail { get; set; } } public class GetBasItemInput : U9C_MES_Input { public string isProd { get; set; } } public class GetCustomerInput : U9C_MES_Input { } public class GetSupplierInput : U9C_MES_Input { } } Tiger.Model.Net/Tiger.Model.Net.csproj
@@ -82,6 +82,7 @@ <Compile Include="Entitys\BAS\BAS_LABEL_PV.cs" /> <Compile Include="Entitys\BAS\BAS_LABEL_TEMP.cs" /> <Compile Include="Entitys\BAS\BAS_LABEL_VAR.cs" /> <Compile Include="Entitys\BAS\V_BAS_PKG_DTL.cs" /> <Compile Include="Entitys\BAS\BAS_PKG_DTL.cs" /> <Compile Include="Entitys\BAS\BAS_PKG_RULE.cs" /> <Compile Include="Entitys\BAS\BAS_PKG_SN.cs" /> @@ -126,6 +127,7 @@ <Compile Include="Entitys\MES\node.cs" /> <Compile Include="Entitys\MES\ParameterEntity\SmtLoadingReturn.cs" /> <Compile Include="Entitys\MES\ParameterEntity\SmtLoadingInput.cs" /> <Compile Include="Entitys\MES\ParameterEntity\U9C_MES_Input.cs" /> <Compile Include="Entitys\MES\R_Wip_Tracking_T.cs" /> <Compile Include="Entitys\MES\SMT_FEEDER.cs" /> <Compile Include="Entitys\MES\SMT_FEEDER_TYPE.cs" />