StandardPda/MES.Service/Dto/webApi/ErpCustomer.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
StandardPda/MES.Service/Modes/MesCustomer.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
StandardPda/MES.Service/Modes/MesLinkU9.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
StandardPda/MES.Service/service/BasicData/MesCustomerManager.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
StandardPda/MES.Service/util/GetSeqUtil.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
StandardPda/MESApplication/Controllers/BasicData/MesCustomerController.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
StandardPda/MESApplication/appsettings.json | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
StandardPda/MES.Service/Dto/webApi/ErpCustomer.cs
@@ -10,22 +10,15 @@ public string? FContact { get; set; } public string? FMobilephone { get; set; } public string? FSeller { get; set; } /// <summary> /// æ¥å£åæ®µè°æ´ï¼æ åçæ¥å£æ°å¢ ERPåæ®ç¶æ åæ®µã /// </summary> /// <remarks> /// ä¿®æ¹äººï¼<æ± åéª> /// ä¿®æ¹æ¥æï¼<2024-12-27> /// ä¿®æ¹è¯´æï¼ /// - å代ç ï¼ç©º /// - ä¿®æ¹åï¼ ///public string? FDocumentStatus { get; set; } /// </remarks> public string? FDocumentStatus { get; set; } public string? State { get; set; } public string? FForbidStatus { get; set; } public string? FCreateOrgId { get; set; } public string? FUseOrgId { get; set; } //public string? FDescription { get; set; } public string? fremarks { get; set; } public List<ErpDetail>? ErpDetails { get; set; } } public class ErpDetail { public string? FUseOrgId { get; set; } } StandardPda/MES.Service/Modes/MesCustomer.cs
@@ -172,11 +172,11 @@ [SugarColumn(ColumnName = "USE_ORG")] public decimal? UseOrg { get; set; } /// <summary> /// èªå®ä¹å段3 /// </summary> [SugarColumn(ColumnName = "REMARK3")] public string? Remark3 { get; set; } ///// <summary> ///// èªå®ä¹å段3 ///// </summary> //[SugarColumn(ColumnName = "REMARK3")] //public string? Remark3 { get; set; } /// <summary> /// èªå®ä¹å段4 @@ -190,5 +190,11 @@ [SugarColumn(ColumnName = "REMARK5")] public string? Remark5 { get; set; } /// <summary> /// 客æ·ç¶æ /// </summary> [SugarColumn(ColumnName = "CUSTOMER_STATE")] public string? CUSTOMER_STATE { get; set; } [SugarColumn(IsIgnore = true)] public string? Type { get; set; } } StandardPda/MES.Service/Modes/MesLinkU9.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,40 @@ using SqlSugar; namespace MES.Service.Modes; /// <summary> /// MESä¸U9ç³»ç»ç龿¥è¡¨ /// </summary> [SugarTable("MES_LINK_U9")] public class MesLinkU9 { /// <summary> /// MESç³»ç»çID /// </summary> [SugarColumn(ColumnName = "MES_ID")] public string? MesId { get; set; } /// <summary> /// U9ç³»ç»çID /// </summary> [SugarColumn(ColumnName = "U9_ID")] public string? U9Id { get; set; } /// <summary> /// ç»ç»ID /// </summary> [SugarColumn(ColumnName = "ORG_ID")] public string? OrgId { get; set; } /// <summary> /// 表类å /// </summary> [SugarColumn(ColumnName = "TABLE_TYPE")] public string? TableType { get; set; } /// <summary> /// åå»ºæ¥æ /// </summary> [SugarColumn(ColumnName = "CREATE_DATE")] public DateTime? CreateDate { get; set; } } StandardPda/MES.Service/service/BasicData/MesCustomerManager.cs
@@ -1,7 +1,9 @@ using MES.Service.DB; using MES.Service.Dto.webApi; using MES.Service.Modes; using MES.Service.util; using SqlSugar; using System.Collections.Generic; namespace MES.Service.service.BasicData; @@ -16,20 +18,20 @@ switch (customer.Type) { case "0": if (UpdateCustomerStatus(db, entity.Id, "A")) if (UpdateCustomerStatusBatch(db, entity, "A")) return 1; break; case "1": if (UpdateCustomerStatus(db, entity.Id, "B")) if (UpdateCustomerStatusBatch(db, entity, "B")) return 1; break; case "3": if (DeleteCustomer(db, entity.Id)) if (DeleteCustomerBatch(db, entity)) return 1; break; case "2": case "4": if (InsertOrUpdate(db, entity)) if (InsertOrUpdateBatch(db, entity)) return 1; break; default: @@ -43,8 +45,20 @@ public bool SaveList(List<ErpCustomer> customers) { var list = customers.Select(GetSysDepartment).ToList(); var groupBy = list.GroupBy(s => s.Type) //var list = customers.Select(GetSysDepartment).ToList(); //å 为U9çæ¨¡å¼ï¼ä¼å¯¼è´å¤ç»ç»çåºç¡æ°æ®è¢«å¤çæList<>,æä»¥éè¦ä¿®æ¹æ¹æ³ï¼SaveLitsä¸åºè¯¥æ¯æåæ¡å¤çåºæ¥çListæ°æ®å èµ·æ¥ï¼è䏿¯ä¹åçæ¹æ³å¤çã List<MesCustomer> mes_customers = new List<MesCustomer>(); foreach (ErpCustomer customer in customers) { var mesCustomerList = GetSysDepartment(customer); if (mesCustomerList != null) { mes_customers.AddRange(mesCustomerList); } } var groupBy = mes_customers.GroupBy(s => s.Type) .ToDictionary(g => g.Key, g => g.ToList()); return UseTransaction(db => @@ -110,39 +124,29 @@ throw new NotImplementedException("å é¤å¤±è´¥"); } private MesCustomer GetSysDepartment(ErpCustomer customer) private List<MesCustomer> GetSysDepartment(ErpCustomer customer) { return new MesCustomer //var db = SqlSugarHelper.GetInstance(); //var id = db.Insertable(insertObj).ExecuteReturnIdentity(); List<MesCustomer> customers = new List<MesCustomer>(); customers = customer.ErpDetails.Select(ErpDetails => new MesCustomer { Id = Convert.ToDecimal(customer.Id), Id = GetSeqUtil.GetSeq("U9_MES_ID"), CustNo = customer.FNumber, CustSname = customer.FShortName, CustName = customer.FName, Anred = customer.FContact, Telf1 = customer.FMobilephone, Fseller = customer.FSeller, /// <summary> /// æ¥å£åæ®µè°æ´ï¼æ åçæ¥å£æ°å¢ ERPåæ®ç¶æ åæ®µã /// </summary> /// <remarks> /// ä¿®æ¹äººï¼<æ± åéª> /// ä¿®æ¹æ¥æï¼<2024-12-27> /// ä¿®æ¹è¯´æï¼ /// - å代ç ï¼ç©º /// - ä¿®æ¹åï¼ ///FDOCUMENTSTATUS = customer.FDocumentStatus, /// </remarks> FDOCUMENTSTATUS = customer.FDocumentStatus, CUSTOMER_STATE = customer.State, Fforbidstatus = customer.FForbidStatus, Remark = customer.fremarks, CreateDate = DateTime.Now, CreateOrg= Convert.ToDecimal(customer.FCreateOrgId), UseOrg= Convert.ToDecimal(customer.FUseOrgId), Company = "1000", Factory = "1000" }; UseOrg = Convert.ToDecimal(ErpDetails.FUseOrgId), }).ToList(); return customers; } private bool UpdateCustomerStatusBatch(SqlSugarScope db, StandardPda/MES.Service/util/GetSeqUtil.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,26 @@ using MES.Service.DB; namespace MES.Service.util; public class GetSeqUtil { /** * 夿å符串æ¯å¦ä¸ºç©º * 为空æ¶è¿åtrue */ public static Decimal GetSeq(string? seqName) { var db = SqlSugarHelper.GetInstance(); string sequenceName = $"{seqName}.NEXTVAL"; // 注æè¿éç´æ¥ä½¿ç¨äºNEXTVALæ¥è·åä¸ä¸ä¸ªå¼ // ç±äºSQLSugarä¸ç´æ¥æ¯æåºåè°ç¨ä½ä¸ºåæ°ï¼æä»¬éè¦æé ä¸ä¸ªSQLè¯å¥ string sql = $"SELECT {sequenceName} FROM DUAL"; // DUALæ¯Oracleä¸çä¸ä¸ªèæè¡¨ï¼ç¨äºä»ä¸éè¦å®é 表ç彿°æè¡¨è¾¾å¼ä¸éæ©æ°æ® // æ§è¡åçSQLè¯å¥å¹¶è·åç»æ Decimal result = Convert.ToDecimal( db.Ado.GetScalar(sql)); return result; } } StandardPda/MESApplication/Controllers/BasicData/MesCustomerController.cs
@@ -1,4 +1,5 @@ using System.Dynamic; using Masuit.Tools; using MES.Service.Dto.webApi; using MES.Service.Modes; using MES.Service.service; @@ -32,6 +33,7 @@ entity.Data = JsonConvert.SerializeObject(unit); entity.Status = 1; entity.CreateBy = "PL017"; entity.Route = unit.FNumber; try { dynamic resultInfos = new ExpandoObject(); @@ -75,6 +77,7 @@ entity.Data = JsonConvert.SerializeObject(units); entity.Status = 1; entity.CreateBy = "PL017"; entity.Route = units.Select(it => it.FNumber).Join(","); try { dynamic resultInfos = new ExpandoObject(); StandardPda/MESApplication/appsettings.json
@@ -10,6 +10,6 @@ "AppSettings": { "TestErpUrl": "http://192.168.11.120:8098/WebService1.asmx/mesToErpinfo", "ProductionErpUrl": "http://192.168.11.120:8098/WebService1.asmx/mesToErpinfoFormal", "DataBaseConn": "Data Source = (DESCRIPTION = (ADDRESS = (PROTOCOL = TCP)(HOST = 192.168.1.104)(PORT = 1521))(CONNECT_DATA = (SERVICE_NAME = ORCL))); Persist Security Info=True;User ID = zmz_prd; Password=zmzprd" "DataBaseConn": "Data Source = (DESCRIPTION = (ADDRESS = (PROTOCOL = TCP)(HOST = 122.226.249.238 )(PORT = 5936))(CONNECT_DATA = (SERVICE_NAME = ORCL))); Persist Security Info=True;User ID = zmz_prd; Password=zmzprd" } }