StandardInterface/MES.Service/Dto/webApi/ERPCGTH.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,7 @@ namespace MES.Service.Dto.webApi; public class ERPCGTH { public ErpCGTHA ErpCgtha { get; set; } public List<ErpCGTHB> ErpCgthB { get; set; } } StandardInterface/MES.Service/Dto/webApi/ERPDBCK.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,47 @@ using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; namespace MES.Service.Dto.webApi { public class ERPDBCK { public ErpDBCKA erpDbcka { get; set; } public List<ErpDBCKB> erpDbckB { get; set; } } public class ErpDBCKA { public string billno { get; set; } public string dj_lx { get; set; } public string db_lx1 { get; set; } public string db_fx { get; set; } public string db_lx { get; set; } public string yw_lx { get; set; } public string dj_zt { get; set; } public string sq_bm { get; set; } public string sq_zz { get; set; } public string sq_time { get; set; } public string dc_hz { get; set; } public string bz { get; set; } public string type { get; set; } public string erpid { get; set; } } public class ErpDBCKB { public string itemid { get; set; } public string unit { get; set; } public string quantity { get; set; } public string dc_org { get; set; } public string dc_depot { get; set; } public string dr_org { get; set; } public string dr_depot { get; set; } public string dc_hz { get; set; } public string dr_hz { get; set; } public string bz { get; set; } public string erpid { get; set; } public string eid { get; set; } } } StandardInterface/MES.Service/Dto/webApi/ErpCGTHA.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,28 @@ namespace MES.Service.Dto.webApi; public class ErpCGTHA { public string? Type { get; set; } public string? BillNo { get; set; } //åæ®ç¼å· public string? Suppid { get; set; } //ä¾åºåID public string? SuppNo { get; set; } //ä¾åºåç¼ç public string? BillNo_type { get; set; } //åæ®ç±»å public string? Yw_lx { get; set; } //ä¸å¡ç±»å public string? th_fs { get; set; } //éè´§æ¹å¼ public string? th_yy { get; set; } //éè´§åå public string? is_ww { get; set; } //æ¯å¦å§å¤ public string? createby { get; set; } //å建人åç§° public string? cg_org { get; set; } //éè´ç»ç» public string? tl_org { get; set; } //éæç»ç» public string? xq_org { get; set; } //éæ±ç»ç» public string? cg_bm { get; set; } //éè´é¨é¨ public string? tl_bm { get; set; } //éæé¨é¨ public string? cgy { get; set; } //ä»ç®¡ååç§° public string? cg { get; set; } //éè´ååç§° public string? kc_dpot { get; set; } //åºåç»åç§° public string? cg_depot { get; set; } //éè´ç»åç§° public string? Ys_fs { get; set; } //éªæ¶æ¹å¼ public string? bz { get; set; } //夿³¨ public string? ERPID { get; set; } //忮头id } StandardInterface/MES.Service/Dto/webApi/ErpCGTHB.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,21 @@ namespace MES.Service.Dto.webApi; public class ErpCGTHB { public string? ebeln { get; set; } //éè´è®¢å public string? itemid { get; set; } //å¾ éç©æID public string? unit { get; set; } //åä½ public string? ebeln_id { get; set; } //éè´è®¢åid public string? line_id { get; set; } //éè´è®¢åè¡id public string? depot_id { get; set; } //ä»åºID public string? depot_code { get; set; } //ä»åºç¼ç public string? erpid { get; set; } //åæ®ä½id public string? eid { get; set; } //忮头id public string? flot { get; set; } //æ¹å· public string? fmoto { get; set; } //计åè·è¸ªå· public string? quantity { get; set; } //æ°é } StandardInterface/MES.Service/Dto/webApi/ErpProductionOrderDto.cs
@@ -51,12 +51,8 @@ //public string? FReqSrc { get; set; } public string? TypeA { get; set; } // public string? FSUPPLIERID { get; set; } // ä¾åºåID public string? FSUPPLIERID { get; set; } // ä¾åºåID //æ²å°èªå®ä¹å段 public string? F_WWDD_SCTZD { get; set; } public string? F_WWDD_XH { get; set; } public string? F_XIFG_Text_tzk { get; set; } public string? ppbombillno { get; set; } public string? WW_ZZ { get; set; } //å§å¤ç»ç» public string? CG_ZZ { get; set; } //éè´ç»ç» } StandardInterface/MES.Service/Dto/webApi/ErpProductionOrderSubDto.cs
@@ -41,6 +41,6 @@ public string? TypeB { get; set; } public string? F_XIFG_Base_re5 { get; set; } public string? F_XIFG_Base_apv { get; set; } /* public string? F_XIFG_Base_re5 { get; set; } public string? F_XIFG_Base_apv { get; set; }*/ } StandardInterface/MES.Service/Modes/CgthSq.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,164 @@ using System; using System.Collections.Generic; using System.Linq; using SqlSugar; namespace MES.Service.Modes { /// <summary> /// éè´éè´§ç³è¯·ä¸»è¡¨ ///</summary> [SugarTable("CGTH_SQ")] public class CgthSq { /// <summary> /// åæ®ç¼ç ///</summary> [SugarColumn(ColumnName="BILL_NO" )] public string BillNo { get; set; } /// <summary> /// å建æ¶é´ ///</summary> [SugarColumn(ColumnName="CREATE_DATE" )] public DateTime? CreateDate { get; set; } /// <summary> /// å建人 ///</summary> [SugarColumn(ColumnName="CREATE_BY" )] public string CreateBy { 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="STATUS" )] public decimal? Status { get; set; } /// <summary> /// ä»åºç¼ç ///</summary> [SugarColumn(ColumnName="DEPOT_CODE" )] public string DepotCode { get; set; } /// <summary> /// æ¯å¦å§å¤ ///</summary> [SugarColumn(ColumnName="F_TYPE" )] public decimal? FType { get; set; } /// <summary> /// ä¾åºåç¼ç ///</summary> [SugarColumn(ColumnName="SUPP_NO" )] public string SuppNo { get; set; } /// <summary> /// ç»ç»id ///</summary> [SugarColumn(ColumnName="ORG_ID" )] public decimal? OrgId { get; set; } /// <summary> /// éè´§æ¹å¼ ///</summary> [SugarColumn(ColumnName="TH_FS" )] public string ThFs { get; set; } /// <summary> /// éè´§åå ///</summary> [SugarColumn(ColumnName="TH_YY" )] public string ThYy { get; set; } /// <summary> /// 夿³¨ ///</summary> [SugarColumn(ColumnName="BZ" )] public string Bz { get; set; } /// <summary> /// ///</summary> [SugarColumn(ColumnName="ID", IsPrimaryKey = true, OracleSequenceName = "SEQ_CGTH_SQ")] public decimal? Id { get; set; } /// <summary> /// æ¯å¦å®æ ///</summary> [SugarColumn(ColumnName="IS_WC" )] public decimal? IsWc { get; set; } /// <summary> /// ä¾åºåID ///</summary> [SugarColumn(ColumnName="SUPP_ID" )] public string SuppId { get; set; } /// <summary> /// åæ®ç±»å ///</summary> [SugarColumn(ColumnName="DJ_LX" )] public string DjLx { get; set; } /// <summary> /// ä¸å¡ç±»å ///</summary> [SugarColumn(ColumnName="YW_FS" )] public string YwFs { get; set; } /// <summary> /// ERPå建人 ///</summary> [SugarColumn(ColumnName="ERP_CREATE_BY" )] public string ErpCreateBy { get; set; } /// <summary> /// éè´ç»ç» ///</summary> [SugarColumn(ColumnName="CG_ORG" )] public string CgOrg { get; set; } /// <summary> /// éæç»ç» ///</summary> [SugarColumn(ColumnName="TL_ORG" )] public string TlOrg { get; set; } /// <summary> /// éæ±ç»ç» ///</summary> [SugarColumn(ColumnName="XQ_ORG" )] public string XqOrg { get; set; } /// <summary> /// éè´é¨é¨ ///</summary> [SugarColumn(ColumnName="CG_BM" )] public string CgBm { get; set; } /// <summary> /// éæé¨é¨ ///</summary> [SugarColumn(ColumnName="TL_BM" )] public string TlBm { get; set; } /// <summary> /// ä»ç®¡ååç§° ///</summary> [SugarColumn(ColumnName="CGY_MC" )] public string CgyMc { get; set; } /// <summary> /// éè´ååç§° ///</summary> [SugarColumn(ColumnName="CG_MC" )] public string CgMc { get; set; } /// <summary> /// åºåç»åç§° ///</summary> [SugarColumn(ColumnName="KC_DEPOT" )] public string KcDepot { get; set; } /// <summary> /// éè´ç»åç§° ///</summary> [SugarColumn(ColumnName="CG_DEPOT" )] public string CgDepot { get; set; } /// <summary> /// éªæ¶æ¹å¼ ///</summary> [SugarColumn(ColumnName="YS_FS" )] public string YsFs { get; set; } /// <summary> /// ERPID ///</summary> [SugarColumn(ColumnName="ERPID" )] public string Erpid { get; set; } } } StandardInterface/MES.Service/Modes/CgthSqDetail.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,119 @@ using System; using System.Collections.Generic; using System.Linq; using SqlSugar; namespace MES.Service.Modes { /// <summary> /// éè´éè´§ç³è¯·æç» ///</summary> [SugarTable("CGTH_SQ_DETAIL")] public class CgthSqDetail { /// <summary> /// ///</summary> [SugarColumn(ColumnName="ID", IsPrimaryKey = true, OracleSequenceName = "SEQ_CGTH_SQ_DETAIL")] public decimal? Id { get; set; } /// <summary> /// ///</summary> [SugarColumn(ColumnName="PID" )] public decimal? Pid { get; set; } /// <summary> /// éè´åå· ///</summary> [SugarColumn(ColumnName="WORK_NO" )] public string WorkNo { get; set; } /// <summary> /// å ¥åºåå· ///</summary> [SugarColumn(ColumnName="RK_NO" )] public string RkNo { get; set; } /// <summary> /// å ¥åºæ° ///</summary> [SugarColumn(ColumnName="RK_QTY" )] public decimal RkQty { get; set; } /// <summary> /// ç³è¯·æ° ///</summary> [SugarColumn(ColumnName="QUANTITY" )] public decimal? Quantity { get; set; } /// <summary> /// å·²æ«æ° ///</summary> [SugarColumn(ColumnName="TL_QTY" )] public decimal? TlQty { get; set; } /// <summary> /// ç©æID ///</summary> [SugarColumn(ColumnName="ITEM_ID" )] public decimal? ItemId { get; set; } /// <summary> /// mesè¡id ///</summary> [SugarColumn(ColumnName="RK_LINE" )] public decimal? RkLine { get; set; } /// <summary> /// éè´å¤´id ///</summary> [SugarColumn(ColumnName="EBELN_K3ID" )] public decimal? EbelnK3id { get; set; } /// <summary> /// éè´è¡id ///</summary> [SugarColumn(ColumnName = "LINE_K3ID")] public decimal? LineK3id { get; set; } /// <summary> /// ERPID ///</summary> [SugarColumn(ColumnName = "ERPID")] public string? Erpid { get; set; } /// <summary> /// EID ///</summary> [SugarColumn(ColumnName= "EID")] public string? Eid { get; set; } /// <summary> /// è¡å· ///</summary> [SugarColumn(ColumnName="WORK_LINE" )] public decimal? WorkLine { get; set; } /// <summary> /// åä½ ///</summary> [SugarColumn(ColumnName="UNIT" )] public string Unit { get; set; } /// <summary> /// å°è´§åå· ///</summary> [SugarColumn(ColumnName="PBILL_NO" )] public string PbillNo { get; set; } /// <summary> /// 宿æ è¯ ///</summary> [SugarColumn(ColumnName="STATUS" )] public decimal? Status { get; set; } /// <summary> /// ä»åºid ///</summary> [SugarColumn(ColumnName="DEPOT_ID" )] public string DepotId { get; set; } /// <summary> /// ä»åºç¼ç ///</summary> [SugarColumn(ColumnName = "DEPOT_CODE")] public string DepotCode { get; set; } /// <summary> /// æ¹å· ///</summary> [SugarColumn(ColumnName="FLOT" )] public string Flot { get; set; } /// <summary> /// 计åè·è¸ªå· ///</summary> [SugarColumn(ColumnName="FMTO" )] public string Fmto { get; set; } } } StandardInterface/MES.Service/Modes/Dbcka.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,27 @@ using SqlSugar; using System; namespace MES.Service.Modes { [SugarTable("DBCKA")] public class Dbcka { [SugarColumn(IsPrimaryKey = true)] public decimal? Id { get; set; } public string Billno { get; set; } public string DjLx { get; set; } public string DbLx1 { get; set; } public string DbFx { get; set; } public string DbLx { get; set; } public string YwLx { get; set; } public string DjZt { get; set; } public string SqBm { get; set; } public string SqZz { get; set; } public DateTime? SqTime { get; set; } public string DcHz { get; set; } public string Bz { get; set; } public string Type { get; set; } public string Erpid { get; set; } public DateTime? CreateDate { get; set; } } } StandardInterface/MES.Service/Modes/Dbckb.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,24 @@ using SqlSugar; namespace MES.Service.Modes { [SugarTable("DBCKB")] public class Dbckb { [SugarColumn(IsPrimaryKey = true)] public decimal? Id { get; set; } public decimal? Pid { get; set; } public string Itemid { get; set; } public string Unit { get; set; } public decimal? Quantity { get; set; } public string DcOrg { get; set; } public string DcDepot { get; set; } public string DrOrg { get; set; } public string DrDepot { get; set; } public string DcHz { get; set; } public string DrHz { get; set; } public string Bz { get; set; } public string Erpid { get; set; } public string Eid { get; set; } } } StandardInterface/MES.Service/Modes/Womcaa.cs
@@ -425,5 +425,23 @@ ///</summary> [SugarColumn(ColumnName= "CG_LINE_ID")] public string Cglineid { get; set; } /// <summary> /// å§å¤ç»ç» ///</summary> [SugarColumn(ColumnName = "WW_ORG")] public string WwOrg { get; set; } /// <summary> /// éè´ç»ç» ///</summary> [SugarColumn(ColumnName = "CG_ORG")] public string CgOrg { get; set; } /// <summary> /// ä¾åºåid ///</summary> [SugarColumn(ColumnName = "SUPP_ID")] public string SuppId { get; set; } } } StandardInterface/MES.Service/service/BasicData/Production/ProductionOrderManager.cs
@@ -113,7 +113,7 @@ var entity = new Womcaa { Caa001 = erpDto.ppbombillno, /// åå· Caa001 = erpDto.FBillNo, /// åå· //Caa001 = erpDto.FBillNo, DepotCode = erpDto.FStockID, CreateDate = erpDto.FDate, // ParseDateTime(erpDto.FDate) ?? null, @@ -171,6 +171,10 @@ // F_WWDD_SCTZD = erpDto.F_WWDD_SCTZD, // F_WWDD_XH = erpDto.F_WWDD_XH, //F_XIFG_TEXT_TZK = erpDto.F_XIFG_Text_tzk WwOrg=erpDto.WW_ZZ, CgOrg=erpDto.CG_ZZ, SuppId=erpDto.FSUPPLIERID, }; var single = base.GetSingle(it => it.Erpid == entity.Erpid); StandardInterface/MES.Service/service/CgthSqDetailManager.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 CgthSqDetailManager : Repository<CgthSqDetail> { //å½å类已ç»ç»§æ¿äº Repository å¢ãå ãæ¥ãæ¹çæ¹æ³ //è¿éé¢åç代ç ä¸ä¼ç»è¦ç,妿è¦éæ°çæè¯·å é¤ CgthSqDetailManager.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(CgthSqDetail).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 CgthSqDetail() { };//æµè¯åæ° var insertArray = new CgthSqDetail[] { insertData }; base.Insert(insertData);//æå ¥ base.InsertRange(insertArray);//æ¹éæå ¥ var id = base.InsertReturnIdentity(insertData);//æå ¥è¿åèªå¢å base.AsInsertable(insertData).ExecuteCommand();//æä»¬å¯ä»¥è½¬æ Insertableå®ç°å¤ææå ¥ /*********æ´æ°*********/ var updateData = new CgthSqDetail() { };//æµè¯åæ° var updateArray = new CgthSqDetail[] { updateData };//æµè¯åæ° base.Update(updateData);//æ ¹æ®å®ä½æ´æ° base.UpdateRange(updateArray);//æ¹éæ´æ° //base.Update(it => new CgthSqDetail() { ClassName = "a", CreateTime = DateTime.Now }, it => it.id==1);// åªæ´æ°ClassNameååCreateTimeåï¼å ¶å®å䏿´æ°ï¼æ¡ä»¶id=1 base.AsUpdateable(updateData).ExecuteCommand(); //转æUpdateableå¯ä»¥å®ç°å¤æçæå ¥ /*********å é¤*********/ var deldata = new CgthSqDetail() { };//æµè¯åæ° 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 } } StandardInterface/MES.Service/service/CgthSqManager.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,220 @@ using SqlSugar; using System; using System.Collections.Generic; using MES.Service.DB; using MES.Service.Modes; using MES.Service.Dto.webApi; namespace MES.Service.service { public class CgthSqManager : Repository<CgthSq> { private readonly CgthSqDetailManager _CgthSqManager = new(); public bool SaveList(List<ERPCGTH> rohIns) { var result = rohIns.Select(Save).ToList(); return result.All(b => b); } public bool Save(ERPCGTH wom) { var ErpCgtha = wom.ErpCgtha; var mesWomCgth = MapErpCgthatoCGTHA(ErpCgtha); var mesWomcabs = MapErpCgthBtoCGTHA(wom.ErpCgthB); return UseTransaction(db => { switch (ErpCgtha.Type) { case "3": return UpdateData(db, mesWomCgth, mesWomcabs) ? 1 : 0; case "2": case "4": case "5": return SaveOrUpdateData(db, mesWomCgth, mesWomcabs) ? 1 : 0; default: throw new NotImplementedException( $"type没æ{ErpCgtha.Type}è¿ä¸ªç±»å"); } }) > 0; } private CgthSq MapErpCgthatoCGTHA(ErpCGTHA dto) { var entity = new CgthSq { BillNo = dto.BillNo, //åæ®ç¼å· SuppId = dto.Suppid, //ä¾åºåID SuppNo = dto.SuppNo, //ä¾åºåç¼ç DjLx = dto.BillNo_type, //åæ®ç±»å YwFs = dto.Yw_lx, //ä¸å¡ç±»å ThFs = dto.th_fs, //éè´§æ¹å¼ ThYy = dto.th_yy, //éè´§åå FType = decimal.TryParse(dto.is_ww, out var itemIdVal) ? itemIdVal : null, //æ¯å¦å§å¤ ErpCreateBy = dto.createby, //å建人åç§° CgOrg = dto.cg_org, //éè´ç»ç» TlOrg = dto.tl_org, //éæç»ç» XqOrg = dto.xq_org, //éæ±ç»ç» CgBm = dto.cg_bm, //éè´é¨é¨ TlBm = dto.tl_bm, //éæé¨é¨ CgMc = dto.cg, //ä»ç®¡ååç§° CgyMc = dto.cgy, //éè´ååç§° KcDepot = dto.kc_dpot, //åºåç»åç§° CgDepot = dto.cg_depot, //éè´ç»åç§° YsFs = dto.Ys_fs, //éªæ¶æ¹å¼ Bz = dto.bz, //夿³¨ Erpid = dto.ERPID, //忮头id CreateDate=DateTime.Now, }; var single = base.GetSingle(it => it.Erpid == entity.Erpid); if (single != null) entity.Id = single.Id; return entity; } private List<CgthSqDetail> MapErpCgthBtoCGTHA(List<ErpCGTHB> dtoList) { var CgthSqDetailList = new List<CgthSqDetail>(); foreach (var dto in dtoList) { var CgthSqDetail = new CgthSqDetail { WorkNo=dto.ebeln, //éè´è®¢å ItemId = decimal.TryParse(dto.itemid, out var itemIdVal) ? itemIdVal : null, //å¾ éç©æID Unit =dto.unit, //åä½ EbelnK3id = decimal.TryParse(dto.ebeln_id, out var ebelnIdVal) ? ebelnIdVal : null, //éè´è®¢åid LineK3id = decimal.TryParse(dto.line_id, out var lineIdVal) ? lineIdVal : null, //éè´è®¢åè¡id DepotId =dto.depot_id, //ä»åºID DepotCode=dto.depot_code, //ä»åºç¼ç Erpid=dto.erpid, //åæ®ä½id Eid = dto.eid, //忮头id Flot=dto.flot, //æ¹å· Fmto=dto.fmoto, //计åè·è¸ªå· Quantity = decimal.TryParse(dto.quantity, out var qtyVal) ? qtyVal : null, //æ°é }; var entity = Db.Queryable<CgthSqDetail>() .Where(s => s.Erpid == CgthSqDetail.Erpid).Single(); if (entity != null) { // å é¤å·²æç Erpid ç¸å ³ç Womcab æ°æ® // Db.Deleteable<Womcab>().Where(s => s.Erpid == womcab.Erpid).ExecuteCommand(); CgthSqDetail.Id = entity.Id; } CgthSqDetailList.Add(CgthSqDetail); } return CgthSqDetailList; } private bool UpdateData(SqlSugarScope db, CgthSq mesWomCgth, List<CgthSqDetail> mesWomcabs) { var decimals = mesWomcabs.Select(s => s.Id).ToArray(); var update = base.DeleteById(mesWomCgth.Id); var insertOrUpdate = db .Deleteable<CgthSqDetail>().In(decimals) .ExecuteCommand() > 0; if (update && insertOrUpdate) return true; throw new NotImplementedException("æ´æ°å¤±è´¥"); } private bool SaveOrUpdateData(SqlSugarScope db, CgthSq mesWomcaa, List<CgthSqDetail> mesWomcabs) { if (mesWomcaa.Id != null) base.DeleteById(mesWomcaa.Id); if (mesWomcabs.Count > 0) db.Deleteable<CgthSqDetail>() .Where(s => s.Eid == mesWomcaa.Erpid).ExecuteCommand(); //åæ¡æå ¥å¿½ç¥ç©ºå段 /* var orUpdate = db.Insertable(mesWomcaa) .IgnoreColumns(true).ExecuteCommand() > 0;*/ // æå ¥ä¸»è¡¨å¹¶è¿å宿´å®ä½ï¼å«ä¸»é® Idï¼ var insertedId = db.Insertable(mesWomcaa) .IgnoreColumns(true) .ExecuteReturnBigIdentity(); // è¿å decimal ç±»å ID mesWomcaa.Id = insertedId; // å¡«å ¥ä¸»è¡¨å®ä½ // èµå¼æ¯æ¡æç»ç Pid = 主表.Id foreach (var detail in mesWomcabs) { detail.Pid = insertedId; } //æ¹éæå ¥å¿½ç¥ç©ºå段 var baOrUpdate = db.Insertable(mesWomcabs).PageSize(10) .IgnoreColumnsNull() .ExecuteCommand() > 0; //if (orUpdate && baOrUpdate) return true; if (insertedId != null && baOrUpdate) return true; throw new NotImplementedException("æå ¥ææ´æ°å¤±è´¥"); } #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(CgthSq).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 CgthSq() { };//æµè¯åæ° var insertArray = new CgthSq[] { insertData }; base.Insert(insertData);//æå ¥ base.InsertRange(insertArray);//æ¹éæå ¥ var id = base.InsertReturnIdentity(insertData);//æå ¥è¿åèªå¢å base.AsInsertable(insertData).ExecuteCommand();//æä»¬å¯ä»¥è½¬æ Insertableå®ç°å¤ææå ¥ /*********æ´æ°*********/ var updateData = new CgthSq() { };//æµè¯åæ° var updateArray = new CgthSq[] { updateData };//æµè¯åæ° base.Update(updateData);//æ ¹æ®å®ä½æ´æ° base.UpdateRange(updateArray);//æ¹éæ´æ° //base.Update(it => new CgthSq() { ClassName = "a", CreateTime = DateTime.Now }, it => it.id==1);// åªæ´æ°ClassNameååCreateTimeåï¼å ¶å®å䏿´æ°ï¼æ¡ä»¶id=1 base.AsUpdateable(updateData).ExecuteCommand(); //转æUpdateableå¯ä»¥å®ç°å¤æçæå ¥ /*********å é¤*********/ var deldata = new CgthSq() { };//æµè¯åæ° 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 } } StandardInterface/MES.Service/service/DbckaManager.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,131 @@ using SqlSugar; using System; using System.Collections.Generic; using System.Linq; using MES.Service.DB; using MES.Service.Dto.webApi; using MES.Service.Modes; namespace MES.Service.service { public class DbckaManager : Repository<Dbcka> { public bool SaveList(List<ERPDBCK> list) { var result = list.Select(Save).ToList(); return result.All(b => b); } public bool Save(ERPDBCK data) { var head = MapErpDbckaToDbcka(data.erpDbcka); var details = MapErpDbckbToDbckb(data.erpDbckB); return UseTransaction(db => { switch (data.erpDbcka.type) { case "3": return UpdateData(db, head, details) ? 1 : 0; case "2": case "4": case "5": return SaveOrUpdateData(db, head, details) ? 1 : 0; default: throw new NotImplementedException($"type没æ {data.erpDbcka.type} è¿ä¸ªç±»å"); } }) > 0; } private Dbcka MapErpDbckaToDbcka(ErpDBCKA dto) { var entity = new Dbcka { Billno = dto.billno, DjLx = dto.dj_lx, DbLx1 = dto.db_lx1, DbFx = dto.db_fx, DbLx = dto.db_lx, YwLx = dto.yw_lx, DjZt = dto.dj_zt, SqBm = dto.sq_bm, SqZz = dto.sq_zz, SqTime = DateTime.TryParse(dto.sq_time, out var d) ? d : null, DcHz = dto.dc_hz, Bz = dto.bz, Type = dto.type, Erpid = dto.erpid, CreateDate = DateTime.Now }; var single = base.GetSingle(it => it.Erpid == entity.Erpid); if (single != null) entity.Id = single.Id; return entity; } private List<Dbckb> MapErpDbckbToDbckb(List<ErpDBCKB> list) { var result = new List<Dbckb>(); foreach (var dto in list) { var item = new Dbckb { Itemid = dto.itemid, Unit = dto.unit, Quantity = decimal.TryParse(dto.quantity, out var qty) ? qty : null, DcOrg = dto.dc_org, DcDepot = dto.dc_depot, DrOrg = dto.dr_org, DrDepot = dto.dr_depot, DcHz = dto.dc_hz, DrHz = dto.dr_hz, Bz = dto.bz, Erpid = dto.erpid, Eid = dto.eid }; var existing = Db.Queryable<Dbckb>().Where(s => s.Erpid == item.Erpid).Single(); if (existing != null) item.Id = existing.Id; result.Add(item); } return result; } private bool SaveOrUpdateData(SqlSugarScope db, Dbcka head, List<Dbckb> details) { if (head.Id != null) base.DeleteById(head.Id); db.Deleteable<Dbckb>() .Where(d => d.Eid == head.Erpid) .ExecuteCommand(); var insertedHead = db.Insertable(head) .IgnoreColumns(true) .ExecuteReturnEntity(); foreach (var item in details) item.Pid = Convert.ToDecimal(insertedHead.Id); var success = db.Insertable(details) .PageSize(10) .IgnoreColumnsNull() .ExecuteCommand() > 0; return insertedHead.Id != null && success; } private bool UpdateData(SqlSugarScope db, Dbcka head, List<Dbckb> details) { var ids = details.Select(d => d.Id).ToArray(); var deletedHead = base.DeleteById(head.Id); var deletedDetails = db.Deleteable<Dbckb>().In(ids).ExecuteCommand() > 0; return deletedHead && deletedDetails; } } } StandardInterface/MESApplication/Controllers/CgthSqController.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,266 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Logging; using SqlSugar; using System; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; using System.Dynamic; using MES.Service.Modes; using MES.Service.service; using MES.Service.util; using MES.Service.Dto.webApi; using Newtonsoft.Json; namespace MESApplication.Controllers { [ApiController] [Route("api/[controller]")] public class CgthSqController : ControllerBase { private CgthSqManager m = new CgthSqManager(); private readonly MessageCenterManager _manager = new(); private readonly CgthSqManager Tz = new(); private readonly string METHOD = "POST"; private readonly string TableName = "CgthSq"; private readonly string URL = "http://localhost:10054/api/CgthSq/"; [HttpPost("Save")] public ResponseResult Save(ERPCGTH CGTH) { var entity = new MessageCenter(); entity.TableName = TableName; entity.Url = URL + "Save"; entity.Method = METHOD; entity.Data = JsonConvert.SerializeObject(CGTH); entity.Status = 1; entity.CreateBy = "PL017"; entity.Route = CGTH.ErpCgtha.BillNo; try { dynamic resultInfos = new ExpandoObject(); var save = m.Save(CGTH); 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); } } [HttpPost("SaveList")] public ResponseResult SaveList(List<ERPCGTH> 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] CgthSq 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] CgthSq 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] CgthSq 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); } } } } StandardInterface/MESApplication/Controllers/CgthSqDetailController.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,169 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Logging; using SqlSugar; using System; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; using System.Dynamic; using MES.Service.Modes; using MES.Service.service; using MES.Service.util; namespace MESApplication.Controllers { [ApiController] [Route("api/[controller]")] public class CgthSqDetailController : ControllerBase { private CgthSqDetailManager m = new CgthSqDetailManager(); /***è¿å ¥æ¨¡ç管çå¯ä»¥ä¿®æ¹æ¨¡ç***/ /// <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] CgthSqDetail 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] CgthSqDetail 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] CgthSqDetail 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); } } } } StandardInterface/MESApplication/Controllers/DbckaController.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,97 @@ using Microsoft.AspNetCore.Mvc; using System; using System.Collections.Generic; using System.Dynamic; using MES.Service.service; using MES.Service.Dto.webApi; using MES.Service.util; using Newtonsoft.Json; using MES.Service.Modes; namespace MESApplication.Controllers { [ApiController] [Route("api/[controller]")] public class DbckaController : ControllerBase { private readonly DbckaManager _manager = new(); private readonly MessageCenterManager _messageManager = new(); private const string METHOD = "POST"; private const string TableName = "Dbcka"; private const string URL = "http://localhost:10054/api/Dbcka/"; [HttpPost("Save")] public ResponseResult Save([FromBody] ERPDBCK data) { var msg = new MessageCenter { TableName = TableName, Url = URL + "Save", Method = METHOD, Data = JsonConvert.SerializeObject(data), Status = 1, CreateBy = "PL017", Route = data.erpDbcka.billno }; try { dynamic resultInfos = new ExpandoObject(); var success = _manager.Save(data); resultInfos.tbBillList = success; msg.Result = success ? (short?)1 : (short?)0; msg.DealWith = 1; _messageManager.save(msg); return new ResponseResult { status = 0, message = "OK", data = resultInfos }; } catch (Exception ex) { msg.Result = 0; msg.DealWith = 0; msg.ResultData = ex.Message; _messageManager.save(msg); return ResponseResult.ResponseError(ex); } } [HttpPost("SaveList")] public ResponseResult SaveList([FromBody] List<ERPDBCK> dataList) { var msg = new MessageCenter { TableName = TableName, Url = URL + "SaveList", Method = METHOD, Data = JsonConvert.SerializeObject(dataList), Status = 1, CreateBy = "PL017" }; try { dynamic resultInfos = new ExpandoObject(); var success = _manager.SaveList(dataList); resultInfos.tbBillList = success; msg.Result = success ? (short?)1 : (short?)0; msg.DealWith = 1; _messageManager.save(msg); return new ResponseResult { status = 0, message = "OK", data = resultInfos }; } catch (Exception ex) { msg.Result = 0; msg.DealWith = 0; msg.ResultData = ex.Message; _messageManager.save(msg); return ResponseResult.ResponseError(ex); } } } }