MES.Service/Dto/webApi/ErpCAA.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
MES.Service/Dto/webApi/ErpCAB.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
MES.Service/Modes/Womcaa.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
MES.Service/Modes/Womcab.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
MES.Service/service/WomcaaManager.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
MES.Service/service/WomcabManager.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
MES.Service/util/StringUtil.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
MESApplication/Controllers/WomcaaController.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
MES.Service/Dto/webApi/ErpCAA.cs
@@ -14,7 +14,6 @@ public string? FDate { get; set; } // public string? FBillType { get; set; } public string? FStatus { get; set; } public string? FMaterialId { get; set; } public string? FUnitId { get; set; } @@ -29,7 +28,6 @@ public string? FMTONO { get; set; } public string? FLot { get; set; } public string? FBomId { get; set; } public string? F_UNW_Text_xsddh { get; set; } public string? FCreateType { get; set; } public string? FSrcBillType { get; set; } public string? FSrcBillNo { get; set; } @@ -43,13 +41,6 @@ public string? PLAN_ID { get; set; } public string? PLAN_SEQ { get; set; } public string? PLAN_NUM { get; set; } public string? F_XIFG_Integer_tzk { get; set; } public string? erP_SCZZ { get; set; } public string? erP_WTZZ { get; set; } public string? F_XIFG_Base_w5c { get; set; } public string? F_XIFG_Qty_yrr { get; set; } public string? F_XIFG_Text_fg2 { get; set; } public string? F_XIFG_Text_yrr { get; set; } public string? F_XIFG_Text_qtr1 { get; set; } public string? F_XIFG_Base_83g1 { get; set; } public string? FPrdOrgId { get; set; } public string? FEnTrustOrgId { get; set; } } MES.Service/Dto/webApi/ErpCAB.cs
@@ -13,8 +13,7 @@ public string? FMTONO { get; set; } public string? FLot { get; set; } public string? FStockID { get; set; } public string? FIssueType { get; set; } public string? F_UNW_Text_tpgy { get; set; } public string? FIssueType { get; set; } public string? FUnitID { get; set; } public string? FSupplyType { get; set; } public string? FStdQty { get; set; } @@ -22,20 +21,14 @@ public string? FNumerator { get; set; } public string? FDenominator { get; set; } public string? FENTRYID { get; set; } public string? FID { get; set; } public string? PID { get; set; } public string Id { get; set; } public string? FSeq { get; set; } public string? FFixScrapQty { get; set; } public string? FScrapRate { get; set; } public string? FSALEORDERNO { get; set; } //å©ç¹èèªå®ä¹å段 public string? F_XIFG_Text_re5 { get; set; } public string? F_XIFG_Text_apv { get; set; } public string? F_XIFG_Base_re5 { get; set; } public decimal? F_XIFG_Qty_apv { get; set; } public string? F_XIFG_Base_apv { get; set; } } MES.Service/Modes/Womcaa.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,412 @@ using SqlSugar; namespace MES.Service.Modes; /// <summary> /// å·¥å表 /// </summary> [SugarTable("WOMCAA")] public class Womcaa { /// <summary> /// é»è®¤å¼: (newid()) /// </summary> [SugarColumn(ColumnName = "guid", IsPrimaryKey = true)] public Guid Guid { get; set; } /// <summary> /// ERPID /// </summary> [SugarColumn(ColumnName = "ERPID")] public int? Erpid { get; set; } /// <summary> /// åæ®ç¼å· /// </summary> [SugarColumn(ColumnName = "CAA001")] public string? Caa001 { get; set; } /// <summary> /// åæ®ç±»å("1ãç´æ¥å ¥åº-æ®éç产 2ãç´æ¥å ¥åº-è¿å·¥ç产 3ãå·¥åºæ±æ¥-æ®éç产 4ãå·¥åºæ±æ¥-è¿å·¥ç产") /// </summary> [SugarColumn(ColumnName = "CAA004")] public string? Caa004 { get; set; } /// <summary> /// 计åä¸è¾¾æ¥æ /// </summary> [SugarColumn(ColumnName = "CAA005")] public string? Caa005 { get; set; } /// <summary> /// 产åç¼ç /// </summary> [SugarColumn(ColumnName = "CAA006")] public string? Caa006 { get; set; } /// <summary> /// åä½ /// </summary> [SugarColumn(ColumnName = "CAA009")] public string? Caa009 { get; set; } /// <summary> /// é¢è®¡å¼å·¥æ¶é´ /// </summary> [SugarColumn(ColumnName = "CAA010")] public string? Caa010 { get; set; } /// <summary> /// é¢è®¡å®å·¥æ¶é´ /// </summary> [SugarColumn(ColumnName = "CAA011")] public string? Caa011 { get; set; } /// <summary> /// 工忰é /// </summary> [SugarColumn(ColumnName = "CAA012")] public int? Caa012 { get; set; } /// <summary> /// BOMçæ¬¡ /// </summary> [SugarColumn(ColumnName = "CAA013")] public string? Caa013 { get; set; } // /// <summary> // /// éå®è®¢åå· // /// </summary> // [SugarColumn(ColumnName = "CAA015")] // public string? Caa015 { get; set; } /// <summary> /// 夿³¨ /// </summary> [SugarColumn(ColumnName = "CAA016")] public string? Caa016 { get; set; } /// <summary> /// å·²ææ°éï¼å¼ç¨ï¼ /// </summary> [SugarColumn(ColumnName = "CAA017")] public int? Caa017 { get; set; } /// <summary> /// ERPç产订åID /// </summary> [SugarColumn(ColumnName = "CAA018")] public int? Caa018 { get; set; } /// <summary> /// ERPç产订ååºå· /// </summary> [SugarColumn(ColumnName = "CAA019")] public int? Caa019 { get; set; } /// <summary> /// ERPç产订ååå· /// </summary> [SugarColumn(ColumnName = "CAA020")] public string? Caa020 { get; set; } /// <summary> /// çäº§è½¦é´ /// </summary> [SugarColumn(ColumnName = "CAA021")] public string? Caa021 { get; set; } /// <summary> /// å®¡æ ¸ç /// </summary> [SugarColumn(ColumnName = "FSTATUS")] public int? Fstatus { get; set; } /// <summary> /// å®¡æ ¸æ¥æ /// </summary> [SugarColumn(ColumnName = "CHECK_DATE")] public DateTime? CheckDate { get; set; } /// <summary> /// å®¡æ ¸äºº /// </summary> [SugarColumn(ColumnName = "CHECK_USER")] public string? CheckUser { get; set; } /// <summary> /// æªææ°éï¼å¼ç¨ï¼ /// </summary> [SugarColumn(ColumnName = "CAA022")] public int? Caa022 { get; set; } /// <summary> /// ä¸å¡ç¶æ("1ï¼è®¡åï¼2ã计å确认 2ãä¸è¾¾ 4ãå¼å·¥ 5ãå®å·¥ 6ãç»æ¡ï¼7ãç»ç®") /// </summary> [SugarColumn(ColumnName = "CAA023")] public string? Caa023 { get; set; } /// <summary> /// å·²å ¥åºæ°é /// </summary> [SugarColumn(ColumnName = "CAA024")] public int? Caa024 { get; set; } /// <summary> /// å·¥èºè·¯çº¿ /// </summary> [SugarColumn(ColumnName = "ROUTING_ID")] public string? RoutingId { get; set; } /// <summary> /// 产线 /// </summary> [SugarColumn(ColumnName = "WORK_SHOP_ID")] public string? WorkShopId { get; set; } /// <summary> /// ä»åº /// </summary> [SugarColumn(ColumnName = "DEPOT_CODE")] public string? DepotCode { get; set; } /// <summary> /// åæ®æ¥æ /// </summary> [SugarColumn(ColumnName = "CREATE_DATE")] public string? CreateDate { get; set; } /// <summary> /// 计åç» /// </summary> [SugarColumn(ColumnName = "WORK_GROUP_ID")] public string? WorkGroupId { get; set; } /// <summary> /// 计åå /// </summary> [SugarColumn(ColumnName = "PLAN_ID")] public string? PlanId { get; set; } /// <summary> /// å ¥åºä¸é /// </summary> [SugarColumn(ColumnName = "STOCK_INLIMITH")] public string? StockInlimith { get; set; } /// <summary> /// å ¥åºä¸é /// </summary> [SugarColumn(ColumnName = "STOCK_INLIMITL")] public string? StockInlimitl { get; set; } /// <summary> /// 主车é´è°åº¦å /// </summary> [SugarColumn(ColumnName = "MTONO")] public string? Mtono { get; set; } /// <summary> /// æ¹æ¬¡ /// </summary> [SugarColumn(ColumnName = "LOT")] public string? Lot { get; set; } // /// <summary> // /// å¼ç¨åå· // /// </summary> // [SugarColumn(ColumnName = "CAA015_HEAD")] // public string? Caa015Head { get; set; } /// <summary> /// å¶åç±»å /// </summary> [SugarColumn(ColumnName = "CREATE_TYPE")] public string? CreateType { get; set; } /// <summary> /// æ¥æºåæ®ç±»å /// </summary> [SugarColumn(ColumnName = "SRC_BILL_TYPE")] public string? SrcBillType { get; set; } /// <summary> /// æ¥æºåå· /// </summary> [SugarColumn(ColumnName = "SRC_BILL_NO")] public string? SrcBillNo { get; set; } /// <summary> /// æ¥æºè¡å· /// </summary> [SugarColumn(ColumnName = "SRC_BILLENTRYSEQ")] public string? SrcBillentryseq { get; set; } /// <summary> /// éå®è®¢åå· /// </summary> [SugarColumn(ColumnName = "SALE_ORDER_NO")] public string? SaleOrderNo { get; set; } /// <summary> /// éå®è®¢åè¡å· /// </summary> [SugarColumn(ColumnName = "SALE_ORDER_ENTRYSEQ")] public string? SaleOrderEntryseq { get; set; } /// <summary> /// 强å¶å ³é人 /// </summary> [SugarColumn(ColumnName = "FORCE_CLOSERID")] public string? ForceCloserid { get; set; } /// <summary> /// å ³éç±»å /// </summary> [SugarColumn(ColumnName = "CLOSE_TYPE")] public string? CloseType { get; set; } /// <summary> /// ååå· /// </summary> [SugarColumn(ColumnName = "SRC_SPLIT_BILLNO")] public string? SrcSplitBillno { get; set; } /// <summary> /// æ¯å¦ç®¡æ§ /// </summary> [SugarColumn(ColumnName = "ERP_SCZZ")] public int? ErpSczz { get; set; } /// <summary> /// æ¯å¦å§æ /// </summary> [SugarColumn(ColumnName = "ERP_WTZZ")] public int? ErpWtzz { get; set; } // /// <summary> // /// </summary> // [SugarColumn(ColumnName = "MAIN_PRODUCT_NO")] // public string? MainProductNo { get; set; } // /// <summary> // /// </summary> // [SugarColumn(ColumnName = "MAIN_PRODUCT_QTY")] // public int? MainProductQty { get; set; } // /// <summary> // /// </summary> // [SugarColumn(ColumnName = "CUSTOMER_ITEM_NUMBER")] // public string? CustomerItemNumber { get; set; } // /// <summary> // /// </summary> // [SugarColumn(ColumnName = "PACKING_LIST_NUMBER")] // public string? PackingListNumber { get; set; } // /// <summary> // /// </summary> // [SugarColumn(ColumnName = "CUSTOMER_NAME")] // public string? CustomerName { get; set; } // /// <summary> // /// </summary> // [SugarColumn(ColumnName = "CUSTOMER")] // public string? Customer { get; set; } /// <summary> /// </summary> [SugarColumn(ColumnName = "TYPE")] public string? Type { get; set; } /// <summary> /// </summary> [SugarColumn(ColumnName = "JA_BS")] public string? JaBs { get; set; } /// <summary> /// </summary> [SugarColumn(ColumnName = "JA_TIME")] public DateTime? JaTime { get; set; } /// <summary> /// </summary> [SugarColumn(ColumnName = "YP_NUM")] public int? YpNum { get; set; } /// <summary> /// é¢è®¡å®å·¥æ¶é´å¤ä»½ /// </summary> [SugarColumn(ColumnName = "CAA011_1")] public string? Caa0111 { get; set; } /// <summary> /// </summary> [SugarColumn(ColumnName = "ERP_GYZZ")] public int? ErpGyzz { get; set; } /// <summary> /// </summary> [SugarColumn(ColumnName = "ERP_FLZZ")] public int? ErpFlzz { get; set; } /// <summary> /// æ¯å¦å ¥åº /// </summary> [SugarColumn(ColumnName = "ERP_SLZZ")] public int? ErpSlzz { get; set; } /// <summary> /// æ¯å¦éåº /// </summary> [SugarColumn(ColumnName = "ERP_RKZZ")] public int? ErpRkzz { get; set; } /// <summary> /// æ¯å¦æ¢è´§ /// </summary> [SugarColumn(ColumnName = "ERP_RKHZ")] public int? ErpRkhz { get; set; } /// <summary> /// æ¯å¦å¯å® /// </summary> [SugarColumn(ColumnName = "ERP_JJDS")] public int? ErpJjds { get; set; } /// <summary> /// æ¯å¦ææ¬¾ /// </summary> [SugarColumn(ColumnName = "ERP_BZDS")] public int? ErpBzds { get; set; } /// <summary> /// æ¯å¦æ°å»º /// </summary> [SugarColumn(ColumnName = "CAA025")] public int? Caa025 { get; set; } /// <summary> /// éè´è®¢åå· /// </summary> [SugarColumn(ColumnName = "FPURORDERNO")] public string? Fpurorderno { get; set; } /// <summary> /// éè´è®¢åè¡å· /// </summary> [SugarColumn(ColumnName = "FPURORDERENTRYSEQ")] public string? Fpurorderentryseq { get; set; } /// <summary> /// çµæ°äº§ååå· /// </summary> [SugarColumn(ColumnName = "ELECTRICAL_PRODUCT_MODEL")] public string? ElectricalProductModel { get; set; } /// <summary> /// çµæ°äº§ååç§° /// </summary> [SugarColumn(ColumnName = "ELECTRICAL_PRODUCT_NAME")] public string? ElectricalProductName { get; set; } } MES.Service/Modes/Womcab.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,231 @@ using SqlSugar; namespace MES.Service.Modes; /// <summary> /// ä»»å¡åç©æè¡¨ /// </summary> [SugarTable("WOMCAB")] public class Womcab { /// <summary> /// é»è®¤å¼: (newid()) /// </summary> [SugarColumn(ColumnName = "guid", IsPrimaryKey = true)] public Guid Guid { get; set; } /// <summary> /// ERPID /// </summary> [SugarColumn(ColumnName = "ERPID")] public int? Erpid { get; set; } /// <summary> /// å·¥ååå· /// </summary> [SugarColumn(ColumnName = "CAB001")] public string? Cab001 { get; set; } /// <summary> /// åºå· /// </summary> [SugarColumn(ColumnName = "CAB002")] public string? Cab002 { get; set; } /// <summary> /// ææç¼ç /// </summary> [SugarColumn(ColumnName = "CAB003")] public string? Cab003 { get; set; } /// <summary> /// éé¢ç¨é /// </summary> [SugarColumn(ColumnName = "CAB006")] public int? Cab006 { get; set; } /// <summary> /// å·²é¢ç¨é /// </summary> [SugarColumn(ColumnName = "CAB007")] public int? Cab007 { get; set; } /// <summary> /// å·¥èº /// </summary> [SugarColumn(ColumnName = "CAB008")] public string? Cab008 { get; set; } /// <summary> /// åä½ /// </summary> [SugarColumn(ColumnName = "CAB009")] public string? Cab009 { get; set; } /// <summary> /// ç»æç¨é /// </summary> [SugarColumn(ColumnName = "CAB012")] public int? Cab012 { get; set; } /// <summary> /// æ¯å¦æ¿æ /// </summary> [SugarColumn(ColumnName = "CAB014")] public string? Cab014 { get; set; } /// <summary> /// PID /// </summary> [SugarColumn(ColumnName = "PID")] public int? Pid { get; set; } /// <summary> /// ERP头ID /// </summary> [SugarColumn(ColumnName = "EID")] public int? Eid { get; set; } /// <summary> /// ä½ç½®å· /// </summary> [SugarColumn(ColumnName = "POSITION_NO")] public string? PositionNo { get; set; } /// <summary> /// åæç»ç» /// </summary> [SugarColumn(ColumnName = "ISSUING_ORGANIZATION")] public string? IssuingOrganization { get; set; } /// <summary> /// ä¾åºç»ç» /// </summary> [SugarColumn(ColumnName = "SUPPLY_ORGANIZATION")] public string? SupplyOrganization { get; set; } /// <summary> /// 货主 /// </summary> [SugarColumn(ColumnName = "OWNER_ID")] public string? OwnerId { get; set; } /// <summary> /// 计åè·è¸ªå· /// </summary> [SugarColumn(ColumnName = "MTONO")] public string? Mtono { get; set; } /// <summary> /// æ¹å· /// </summary> [SugarColumn(ColumnName = "LOT")] public string? Lot { get; set; } /// <summary> /// ä»åº /// </summary> [SugarColumn(ColumnName = "DEPOT_CODE")] public string? DepotCode { get; set; } /// <summary> /// åææ¹å¼ /// </summary> [SugarColumn(ColumnName = "ISSUE_TYPE")] public string? IssueType { get; set; } /// <summary> /// ä¾åºç±»å(Céè´ Zèªå¶ Wå§å¤) /// </summary> [SugarColumn(ColumnName = "SUPPLY_TYPE")] public string? SupplyType { get; set; } /// <summary> /// åå /// </summary> [SugarColumn(ColumnName = "NUMERATOR")] public string? Numerator { get; set; } /// <summary> /// 忝 /// </summary> [SugarColumn(ColumnName = "DENOMINATOR")] public string? Denominator { get; set; } /// <summary> /// åºå®æè /// </summary> [SugarColumn(ColumnName = "SCRAPQTY")] public string? Scrapqty { get; set; } /// <summary> /// å卿èç /// </summary> [SugarColumn(ColumnName = "SCRAPRATE")] public string? Scraprate { get; set; } // /// <summary> // /// 客æ·è´§å· // /// </summary> // [SugarColumn(ColumnName = "CUSTOMER_ITEM_NUMBER")] // public string? CustomerItemNumber { get; set; } // /// <summary> // /// å è£ åå· // /// </summary> // [SugarColumn(ColumnName = "PACKING_LIST_NUMBER")] // public string? PackingListNumber { get; set; } // /// <summary> // /// 主产å // /// </summary> // [SugarColumn(ColumnName = "MAIN_PRODUCT")] // public string? MainProduct { get; set; } // /// <summary> // /// ä¸»äº§åæ°é // /// </summary> // [SugarColumn(ColumnName = "MAIN_PRODUCT_QTY")] // public int? MainProductQty { get; set; } // /// <summary> // /// ç¶é¡¹ç©æåç§° // /// </summary> // [SugarColumn(ColumnName = "PARENT_ITEM_NAME")] // public string? ParentItemName { get; set; } // /// <summary> // /// éå®è®¢å // /// </summary> // [SugarColumn(ColumnName = "FSALEORDERNO")] // public string? Fsaleorderno { get; set; } /// <summary> /// 货主类å /// </summary> [SugarColumn(ColumnName = "FOWNERTYPEID")] public string? Fownertypeid { get; set; } /// <summary> /// é¡¹æ¬¡å· /// </summary> [SugarColumn(ColumnName = "FREPLACEGROUP")] public string? Freplacegroup { get; set; } /// <summary> /// éå®è®¢åå· /// </summary> [SugarColumn(ColumnName = "ERP_XSDDH")] public string? ErpXsddh { get; set; } /// <summary> /// å项类å /// </summary> [SugarColumn(ColumnName = "FMATERIALTYPE")] public string? Fmaterialtype { get; set; } /// <summary> /// </summary> [SugarColumn(ColumnName = "FUNITID")] public string? Funitid { get; set; } } MES.Service/service/WomcaaManager.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,206 @@ using MES.Service.DB; using MES.Service.Dto.webApi; using MES.Service.Modes; using MES.Service.util; using SqlSugar; namespace MES.Service.service; public class WomcaaManager : Repository<Womcaa> { //å½å类已ç»ç»§æ¿äº Repository å¢ãå ãæ¥ãæ¹çæ¹æ³ //è¿éé¢åç代ç ä¸ä¼ç»è¦ç,妿è¦éæ°çæè¯·å é¤ WomcaaManager.cs private readonly WomcabManager _womcabManager = new(); public bool SaveList(List<ErpWOM> rohIns) { var result = rohIns.Select(Save).ToList(); return result.All(b => b); } public bool Save(ErpWOM wom) { var womErpCaa = wom.ErpCaa; var mesWomcaa = MapErpCAAtoWomcaa(womErpCaa); var mesWomcabs = MapErpCABtoWomcab(wom.ErpCabs); return UseTransaction(db => { switch (womErpCaa.Type) { case "3": return UpdateData(db, mesWomcaa, mesWomcabs) ? 1 : 0; case "2": case "4": //kyy 2024-09-13 åæ´ case "5": return SaveOrUpdateData(db, mesWomcaa, mesWomcabs) ? 1 : 0; default: throw new NotImplementedException( $"type没æ{womErpCaa.Type}è¿ä¸ªç±»å"); } }) > 0; } private bool SaveOrUpdateData(SqlSugarScope db, Womcaa mesWomcaa, List<Womcab> mesWomcabs) { if (StringUtil.CheckGuid(mesWomcaa.Guid)) base.DeleteById(mesWomcaa.Guid); if (mesWomcabs.Count > 0) db.Deleteable<Womcab>() .Where(s => s.Pid == mesWomcaa.Erpid).ExecuteCommand(); var orUpdate = base.Insert(mesWomcaa); var baOrUpdate = _womcabManager.InsertRange(mesWomcabs); if (orUpdate && baOrUpdate) return true; throw new NotImplementedException("æå ¥ææ´æ°å¤±è´¥"); } private bool UpdateData(SqlSugarScope db, Womcaa mesWomcaa, List<Womcab> mesWomcabs) { var decimals = mesWomcabs.Select(s => s.Guid).ToArray(); var update = base.DeleteById(mesWomcaa.Guid); var insertOrUpdate = db .Deleteable<Womcab>().In(decimals) .ExecuteCommand() > 0; if (update && insertOrUpdate) return true; throw new NotImplementedException("æ´æ°å¤±è´¥"); } private Womcaa MapErpCAAtoWomcaa(ErpCAA dto) { var entity = new Womcaa { Erpid = Convert.ToInt32(dto.Id), /// ERPID Caa001 = dto.FBillNo, /// åå· Caa021 = dto.FWorkShopID, /// å·¥ä½è½¦é´ RoutingId = dto.FRoutingId, /// å·¥èºè·¯çº¿ WorkShopId = dto.FREMWorkShopId, /// 产线 DepotCode = dto.FStockId, /// ä»åº CreateDate = dto.FDate, /// åæ®æ¥æ Caa004 = dto.FBILLTYPE, /// åæ®ç±»å Caa023 = dto.FStatus, /// ç¶æ å®å·¥ï¼æªå®å·¥ Caa006 = dto.FMaterialId, /// 产åç¼ç Caa009 = dto.FUnitId, /// åä½ Caa012 = !string.IsNullOrEmpty(dto.FQty) ? Convert.ToInt32(dto.FQty) : null, /// æ°é WorkGroupId = dto.FWorkGroupId, /// 计åç» PlanId = dto.FPlannerID, /// 计åå Caa010 = dto.FPlanStartDate, /// é¢è®¡å¼å·¥æ¶é´ Caa011 = dto.FPlanFinishDate, /// é¢è®¡å®å·¥æ¶é´ Caa005 = dto.FConveyDate, /// å¼åæ¥æ StockInlimith = dto.FStockInLimitH, /// å ¥åºä¸é StockInlimitl = dto.FStockInLimitL, /// å ¥åºä¸é Mtono = dto.FMTONO, /// 计åè·è¸ªå· Lot = dto.FLot, /// æ¹å· Caa013 = dto.FBomId, /// BOMçæ¬¡ CreateType = dto.FCreateType, /// çææ¹å¼ SrcBillType = dto.FSrcBillType, /// æºåç±»å SrcBillNo = dto.FSrcBillNo, /// æºåç¼å· SrcBillentryseq = dto.FSrcBillEntrySeq, /// æºååå½è¡å· SaleOrderNo = dto.FSaleOrderNo, /// éæ±åæ®å· SaleOrderEntryseq = dto.FSaleOrderEntrySeq, /// 鿱忮è¡å· ForceCloserid = dto.FForceCloserId, /// ç»æ¡äºº CloseType = dto.FCloseType, /// ç»æ¡ç±»å SrcSplitBillno = dto.FSrcSplitBillNo, /// æºæå订åç¼å· Caa016 = dto.FDESCRIPTION, /// 夿³¨ Caa018 = !string.IsNullOrEmpty(dto.PLAN_ID) ? Convert.ToInt32(dto.PLAN_ID) : null, /// ERPæºåID Caa019 = !string.IsNullOrEmpty(dto.PLAN_SEQ) ? Convert.ToInt32(dto.PLAN_SEQ) : null, /// ERPæºåè¡å· Caa020 = dto.PLAN_NUM, /// ERPæºååå·(ä»»å¡åå·) //Caa015 = dto.F_UNW_Text_xsddh, /// éå®è®¢åå· ErpSczz = Convert.ToInt32(dto.FPrdOrgId), /// ç产ç»ç»ID ErpWtzz = Convert.ToInt32(dto.FEnTrustOrgId), /// å§æç»ç»ID //Caa015Head = dto.F_XIFG_Integer_tzk, /// éå®è®¢åè¡å· //MainProductNo = dto.F_XIFG_Base_w5c, /// 主产åç¼ç // MainProductQty = // Convert.ToInt32(dto.F_XIFG_Qty_yrr), /// 主产åç产æ°é // CustomerItemNumber = dto.F_XIFG_Text_fg2, /// 客æ·è´§å· // PackingListNumber = dto.F_XIFG_Text_yrr, /// å è£ åå· // CustomerName = dto.F_XIFG_Text_qtr1, /// 客æ·åç§° // Customer = dto.F_XIFG_Base_83g1, /// å®¢æ· Caa0111 = dto.FPlanFinishDate /// é¢è®¡å®å·¥æ¶é´å¤ä»½ }; var single = base.GetSingle(it => it.Erpid == entity.Erpid); if (single != null) entity.Guid = single.Guid; return entity; } private List<Womcab> MapErpCABtoWomcab(List<ErpCAB> dtoList) { var womcabList = new List<Womcab>(); foreach (var dto in dtoList) { var womcab = new Womcab { Erpid = Convert.ToInt32(dto.FENTRYID), /// ERPID Cab001 = dto.FBillNo, /// å·¥ååå· Cab002 = dto.FSeq, /// åºå· Cab003 = dto.FMaterialID, /// ææç¼ç Cab006 = !string.IsNullOrEmpty(dto.FNeedQty) ? Convert.ToInt32(dto.FNeedQty) : null, /// éé¢ç¨é Cab007 = !string.IsNullOrEmpty(dto.FPickedQty) ? Convert.ToInt32(dto.FPickedQty) : null, /// å·²é¢ç¨é PositionNo = dto.FPositionNO, /// ä½ç½®å· SupplyOrganization = dto.FChildSupplyOrgId, /// ä¾åºç»ç» IssuingOrganization = dto.FSUPPLYORG, /// åæç»ç» OwnerId = dto.FOwnerID, /// 货主 Mtono = dto.FMTONO, /// 计åè·è¸ªå· Lot = dto.FLot, /// æ¹å· DepotCode = dto.FStockID, /// ä»åº IssueType = dto.FIssueType, /// åææ¹å¼ // Cab008 = dto.F_UNW_Text_tpgy, /// å·¥èº Cab009 = dto.FUnitID, /// åä½ SupplyType = dto.FSupplyType, /// ä¾åºç±»å(Céè´ Zèªå¶ Wå§å¤) Cab012 = !string.IsNullOrEmpty(dto.FStdQty) ? Convert.ToInt32(dto.FStdQty) : null, /// ç»æç¨é Cab014 = dto.FIsKeyItem, /// æ¯å¦æ¿æ Numerator = dto.FNumerator, /// åå Denominator = dto.FDenominator, /// 忝 Pid = Convert.ToInt32(dto.PID), /// ERP头ID Eid = Convert.ToInt32(dto.Id), /// ERP ID Scrapqty = dto.FFixScrapQty, /// åºå®æè Scraprate = dto.FScrapRate, /// å卿èç // Fsaleorderno = dto.FSALEORDERNO, /// éå®è®¢å // // CustomerItemNumber = dto.F_XIFG_Text_re5, /// 客æ·è´§å· // PackingListNumber = dto.F_XIFG_Text_apv, /// å è£ åå· // MainProduct = dto.F_XIFG_Base_re5, /// 主产å // MainProductQty = // Convert.ToInt32(dto.F_XIFG_Qty_apv), /// ä¸»äº§åæ°é // ParentItemName = dto.F_XIFG_Base_apv /// ç¶é¡¹ç©æåç§° }; var entity = Db.Queryable<Womcab>() .Where(s => s.Erpid == womcab.Erpid).Single(); if (entity != null) womcab.Guid = entity.Guid; womcabList.Add(womcab); } return womcabList; } } MES.Service/service/WomcabManager.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,78 @@ using SqlSugar; using System; using System.Collections.Generic; using MES.Service.DB; using MES.Service.Modes; namespace MES.Service.service { public class WomcabManager : Repository<Womcab> { //å½å类已ç»ç»§æ¿äº Repository å¢ãå ãæ¥ãæ¹çæ¹æ³ //è¿éé¢åç代ç ä¸ä¼ç»è¦ç,妿è¦éæ°çæè¯·å é¤ WomcabManager.cs #region æå¦æ¹æ³ /// <summary> /// ä»å¨æ¹æ³æ»¡è¶³ä¸äºå¤æä¸å¡éæ±ï¼ä¸å¡ä»£ç 请å¨è¿éé¢å®ä¹æ¹æ³ /// </summary> public void Study() { /*********æ¥è¯¢*********/ var data1 = base.GetById(1);//æ ¹æ®IDæ¥è¯¢ var data2 = base.GetList();//æ¥è¯¢ææ var data3 = base.GetList(it => 1 == 1); //æ ¹æ®æ¡ä»¶æ¥è¯¢ //var data4 = base.GetSingle(it => 1 == 1);//æ ¹æ®æ¡ä»¶æ¥è¯¢ä¸æ¡,å¦æè¶ è¿ä¸æ¡ä¼æ¥é var p = new PageModel() { PageIndex = 1, PageSize = 2 };// å页æ¥è¯¢ var data5 = base.GetPageList(it => 1 == 1, p); Console.Write(p.TotalCount);//è¿åæ»æ° var data6 = base.GetPageList(it => 1 == 1, p, it => SqlFunc.GetRandom(), OrderByType.Asc);// å页æ¥è¯¢å æåº Console.Write(p.TotalCount);//è¿åæ»æ° List<IConditionalModel> conModels = new List<IConditionalModel>(); //ç»è£ æ¡ä»¶æ¥è¯¢ä½ä¸ºæ¡ä»¶å®ç° å页æ¥è¯¢å æåº conModels.Add(new ConditionalModel() { FieldName= typeof(Womcab).GetProperties()[0].Name, ConditionalType = ConditionalType.Equal, FieldValue = "1" });//id=1 var data7 = base.GetPageList(conModels, p, it => SqlFunc.GetRandom(), OrderByType.Asc); base.AsQueryable().Where(x => 1 == 1).ToList();//æ¯æäºè½¬æ¢æqueryable,æä»¬å¯ä»¥ç¨queryableå®ç°å¤æåè½ /*********æå ¥*********/ var insertData = new Womcab() { };//æµè¯åæ° var insertArray = new Womcab[] { insertData }; base.Insert(insertData);//æå ¥ base.InsertRange(insertArray);//æ¹éæå ¥ var id = base.InsertReturnIdentity(insertData);//æå ¥è¿åèªå¢å base.AsInsertable(insertData).ExecuteCommand();//æä»¬å¯ä»¥è½¬æ Insertableå®ç°å¤ææå ¥ /*********æ´æ°*********/ var updateData = new Womcab() { };//æµè¯åæ° var updateArray = new Womcab[] { updateData };//æµè¯åæ° base.Update(updateData);//æ ¹æ®å®ä½æ´æ° base.UpdateRange(updateArray);//æ¹éæ´æ° //base.Update(it => new Womcab() { ClassName = "a", CreateTime = DateTime.Now }, it => it.id==1);// åªæ´æ°ClassNameååCreateTimeåï¼å ¶å®å䏿´æ°ï¼æ¡ä»¶id=1 base.AsUpdateable(updateData).ExecuteCommand(); //转æUpdateableå¯ä»¥å®ç°å¤æçæå ¥ /*********å é¤*********/ var deldata = new Womcab() { };//æµè¯åæ° base.Delete(deldata);//æ ¹æ®å®ä½å é¤ base.DeleteById(1);//æ ¹æ®ä¸»é®å é¤ base.DeleteById(new int[] { 1,2});//æ ¹æ®ä¸»é®æ°ç»å é¤ base.Delete(it=>1==2);//æ ¹æ®æ¡ä»¶å é¤ base.AsDeleteable().Where(it=>1==2).ExecuteCommand();//转æDeleteableå®ç°å¤æçæä½ } #endregion } } MES.Service/util/StringUtil.cs
@@ -19,4 +19,11 @@ { return !string.IsNullOrEmpty(value); } public static bool CheckGuid(Guid? guid) { if (guid == Guid.Empty) return false; return guid != null; } } MESApplication/Controllers/WomcaaController.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,260 @@ using System.Dynamic; using MES.Service.Dto.webApi; using MES.Service.Modes; using MES.Service.service; using MES.Service.util; using Microsoft.AspNetCore.Mvc; using Newtonsoft.Json; namespace MESApplication.Controllers; [ApiController] [Route("api/[controller]")] public class WomcaaController : ControllerBase { private readonly MessageCenterManager _manager = new(); private readonly WomcaaManager m = new(); private readonly string METHOD = "POST"; private readonly string TableName = "WOMCAA"; private readonly string URL = "http://localhost:10054/api/Womcaa/"; // [HttpPost("Save")] public ResponseResult Save(ErpWOM rohIn) { var entity = new MessageCenter(); entity.TableName = TableName; entity.Url = URL + "Save"; entity.Method = METHOD; entity.Data = JsonConvert.SerializeObject(rohIn); entity.Status = 1; entity.CreateBy = "PL017"; try { dynamic resultInfos = new ExpandoObject(); var save = m.Save(rohIn); resultInfos.tbBillList = save; entity.Result = 0; entity.DealWith = 0; if (save) { entity.Result = 1; entity.DealWith = 1; } _manager.save(entity); return new ResponseResult { status = 0, message = "OK", data = resultInfos }; } catch (Exception ex) { entity.Result = 0; entity.DealWith = 0; entity.ResultData = ex.Message; _manager.save(entity); return ResponseResult.ResponseError(ex); } } [HttpPost("SaveList")] public ResponseResult SaveList(List<ErpWOM> units) { var entity = new MessageCenter(); entity.TableName = TableName; entity.Url = URL + "SaveList"; entity.Method = METHOD; entity.Data = JsonConvert.SerializeObject(units); entity.Status = 1; entity.CreateBy = "PL017"; try { dynamic resultInfos = new ExpandoObject(); var save = m.SaveList(units); resultInfos.tbBillList = save; entity.Result = 0; if (save) entity.Result = 1; entity.DealWith = 1; _manager.save(entity); return new ResponseResult { status = 0, message = "OK", data = resultInfos }; } catch (Exception ex) { entity.Result = 0; entity.DealWith = 0; entity.ResultData = ex.Message; _manager.save(entity); return ResponseResult.ResponseError(ex); } } /// <summary> /// è·åææ /// </summary> /// <returns></returns> [HttpPost("GetList")] public ResponseResult GetList() { try { dynamic resultInfos = new ExpandoObject(); resultInfos.tbBillList = m.GetList(); return new ResponseResult { status = 0, message = "OK", data = resultInfos }; } catch (Exception ex) { return ResponseResult.ResponseError(ex); } } /// <summary> /// æ ¹æ®ä¸»é®è·å /// </summary> /// <returns></returns> [HttpPost("GetById")] public ResponseResult GetById(int id) { try { dynamic resultInfos = new ExpandoObject(); resultInfos.tbBillList = m.GetById(id); return new ResponseResult { status = 0, message = "OK", data = resultInfos }; } catch (Exception ex) { return ResponseResult.ResponseError(ex); } } /// <summary> /// æ ¹æ®ä¸»é®å é¤ /// </summary> /// <returns></returns> [HttpPost("DeleteByIds")] public ResponseResult DeleteByIds([FromBody] object[] ids) { try { dynamic resultInfos = new ExpandoObject(); resultInfos.tbBillList = m.DeleteByIds(ids); return new ResponseResult { status = 0, message = "OK", data = resultInfos }; } catch (Exception ex) { return ResponseResult.ResponseError(ex); } } /// <summary> /// æ·»å /// </summary> /// <returns></returns> [HttpPost("Insert")] public ResponseResult Add([FromBody] Womcaa data) { try { dynamic resultInfos = new ExpandoObject(); resultInfos.tbBillList = m.Insert(data); return new ResponseResult { status = 0, message = "OK", data = resultInfos }; } catch (Exception ex) { return ResponseResult.ResponseError(ex); } } /// <summary> /// æ·»å è¿åèªå¢ /// </summary> /// <returns></returns> [HttpPost("InsertReturnIdentity")] public ResponseResult InsertReturnIdentity([FromBody] Womcaa data) { try { dynamic resultInfos = new ExpandoObject(); resultInfos.tbBillList = m.InsertReturnIdentity(data); return new ResponseResult { status = 0, message = "OK", data = resultInfos }; } catch (Exception ex) { return ResponseResult.ResponseError(ex); } } /// <summary> /// ä¿®æ¹ /// </summary> /// <returns></returns> [HttpPost("Update")] public ResponseResult Update([FromBody] Womcaa data) { try { dynamic resultInfos = new ExpandoObject(); resultInfos.tbBillList = m.Update(data); return new ResponseResult { status = 0, message = "OK", data = resultInfos }; } catch (Exception ex) { return ResponseResult.ResponseError(ex); } } }