| StandardInterface/MES.Service/Modes/MesInvItemDbsq2.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| StandardInterface/MES.Service/Modes/MesInvItemDbsqItems2.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| StandardInterface/MES.Service/service/BasicData/Organization/MesStaffManager.cs | 补丁 | 查看 | 原始文档 | blame | 历史 | |
| StandardInterface/MES.Service/service/DbckaManager.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
StandardInterface/MES.Service/Modes/MesInvItemDbsq2.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,258 @@ using System; using System.Collections.Generic; using System.Linq; using SqlSugar; namespace MES.Service.Modes { /// <summary> /// è°æ¨ç³è¯·å ///</summary> [SugarTable("MES_INV_ITEM_DBSQ2")] public class MesInvItemDbsq2 { /// <summary> /// SEQ_INV_ID ///</summary> [SugarColumn(ColumnName = "ID", IsPrimaryKey = true, OracleSequenceName = "SEQ_DBSQ2")] //[SugarColumn(ColumnName = "ID", IsPrimaryKey = true)] public decimal Id { get; set; } /// <summary> /// è°æ¨ç³è¯·åå· ///</summary> [SugarColumn(ColumnName = "BILL_NO")] public string? BillNo { get; set; } /// <summary> /// ç§»å ¥ååºid ///</summary> [SugarColumn(ColumnName = "INV_DEPOTS_ID")] public decimal? InvDepotsId { get; set; } /// <summary> /// ç§»å ¥è´§ä½id ///</summary> [SugarColumn(ColumnName = "INV_DEPOT_SECTIONS_ID")] public decimal? InvDepotSectionsId { get; set; } /// <summary> /// å建人 ///</summary> [SugarColumn(ColumnName = "CREATE_BY")] public string? CreateBy { get; set; } /// <summary> /// å建æ¶é´ ///</summary> [SugarColumn(ColumnName = "CREATE_DATE")] public DateTime? CreateDate { get; set; } /// <summary> /// æåæ´æ°äºº ///</summary> [SugarColumn(ColumnName = "LASTUPDATE_BY")] public string? LastupdateBy { get; set; } /// <summary> /// æåæ´æ°æ¶é´ ///</summary> [SugarColumn(ColumnName = "LASTUPDATE_DATE")] public DateTime? LastupdateDate { get; set; } /// <summary> /// ç¶æ|0-å¶å1-å®¡æ ¸2-è¿è´¦ ///</summary> [SugarColumn(ColumnName = "STATUS")] public decimal? Status { get; set; } /// <summary> /// 夿³¨ ///</summary> [SugarColumn(ColumnName = "REMARK")] public string? Remark { get; set; } /// <summary> /// åæ®ç±»åID ///</summary> [SugarColumn(ColumnName = "BILL_TYPE_ID")] public decimal? BillTypeId { get; set; } /// <summary> /// äºå¡ç±»åID ///</summary> [SugarColumn(ColumnName = "TRANSACTION_ID")] public decimal? TransactionId { get; set; } /// <summary> /// å®¡æ ¸äºº ///</summary> [SugarColumn(ColumnName = "CHECKUSER")] public string? Checkuser { get; set; } /// <summary> /// å®¡æ ¸æ¥æ ///</summary> [SugarColumn(ColumnName = "CHECKDATE")] public DateTime? Checkdate { get; set; } /// <summary> /// ç§»å ¥ååºcode ///</summary> [SugarColumn(ColumnName = "INV_DEPOTS_CODE")] public string? InvDepotsCode { get; set; } /// <summary> /// ç§»å ¥è´§ä½code ///</summary> [SugarColumn(ColumnName = "INV_DEPOT_SECTIONS_CODE")] public string? InvDepotSectionsCode { get; set; } /// <summary> /// äºå¡ç±»åç¼ç ///</summary> [SugarColumn(ColumnName = "TRANSACTION_NO")] public decimal? TransactionNo { get; set; } /// <summary> /// ç§»åºååºcode ///</summary> [SugarColumn(ColumnName = "FROM_DEPOTS_CODE")] public string? FromDepotsCode { get; set; } /// <summary> /// å·¥åç¼ç ///</summary> [SugarColumn(ColumnName = "FACTORY_CODE")] public string? FactoryCode { get; set; } /// <summary> /// SAPè¿ååæ® ///</summary> [SugarColumn(ColumnName = "SAPNO")] public string? Sapno { get; set; } /// <summary> /// å·²ååSAP ///</summary> [SugarColumn(ColumnName = "SAPSTATUS")] public short? Sapstatus { get; set; } /// <summary> /// SAPè¿å年份 ///</summary> [SugarColumn(ColumnName = "SAPYEAR")] public short? Sapyear { get; set; } /// <summary> /// SAPè¿åä¿¡æ¯ ///</summary> [SugarColumn(ColumnName = "SAPTEXT")] public string? Saptext { get; set; } /// <summary> /// ååç¼ç ///</summary> [SugarColumn(ColumnName = "FACTORY")] public string? Factory { get; set; } /// <summary> /// å ¬å¸ä»£ç ///</summary> [SugarColumn(ColumnName = "COMPANY")] public string? Company { get; set; } /// <summary> /// æ¯å¦æ¨éERP1-æ¯ï¼2-å¦ ///</summary> [SugarColumn(ColumnName = "TS")] public decimal? Ts { get; set; } /// <summary> /// 0æªè°æ¨1å·²è°æ¨ ///</summary> [SugarColumn(ColumnName = "DB_STATUS")] public string? DbStatus { get; set; } /// <summary> /// è°åºç»ç» ///</summary> [SugarColumn(ColumnName = "FSTOCKOUTORGID")] public decimal? Fstockoutorgid { get; set; } /// <summary> /// è°å ¥ç»ç» ///</summary> [SugarColumn(ColumnName = "FSTOCKORGID")] public decimal? Fstockorgid { get; set; } /// <summary> /// åæ®ç±»å ///</summary> [SugarColumn(ColumnName = "DJ_LX")] public string? Djlx { get; set; } /// <summary> /// è°æ¨ç±»å ///</summary> [SugarColumn(ColumnName = "DB_LX1")] public string? DbLx1 { get; set; } /// <summary> /// è°æ¨æ¹å ///</summary> [SugarColumn(ColumnName = "DB_FX")] public string? DbFx { get; set; } /// <summary> /// è°æ¨ç±»å ///</summary> [SugarColumn(ColumnName = "DB_LX")] public string? DbLx { get; set; } /// <summary> /// ä¸å¡ç±»å ///</summary> [SugarColumn(ColumnName = "YW_LX")] public string? YwLx { get; set; } /// <summary> /// åæ®ç¶æ ///</summary> [SugarColumn(ColumnName = "DJ_ZT")] public string? DjZt { get; set; } /// <summary> /// ç³è¯·é¨é¨ ///</summary> [SugarColumn(ColumnName = "SQ_BM")] public string? SqBm { get; set; } /// <summary> /// ç³è¯·ç»ç» ///</summary> [SugarColumn(ColumnName = "SQ_ZZ")] public string? SqZz { get; set; } /// <summary> /// ç³è¯·æ¥æ ///</summary> [SugarColumn(ColumnName = "SQ_TIME")] public string? SqTime { get; set; } /// <summary> /// è°åºè´§ä¸»ç±»å ///</summary> [SugarColumn(ColumnName = "DC_HZ")] public string? DcHz { get; set; } /// <summary> /// ///</summary> [SugarColumn(ColumnName = "ERPID")] public string? Erpid { get; set; } /// <summary> /// è°åºåºåç»ç» ///</summary> [SugarColumn(ColumnName = "DC_KC")] public string? DcKc { get; set; } /// <summary> /// è°å ¥åºåç»ç» ///</summary> [SugarColumn(ColumnName = "DR_KC")] public string? DrKc { get; set; } /// <summary> /// è°å ¥è´§ä¸» ///</summary> [SugarColumn(ColumnName = "DR_HZ")] public string? DrHz { get; set; } /// <summary> /// è°å ¥ä»åº ///</summary> [SugarColumn(ColumnName = "DR_CK")] public string? DrCk { get; set; } /// <summary> /// è°åºé¨é¨ ///</summary> [SugarColumn(ColumnName = "DC_BM")] public string? DcBm { get; set; } /// <summary> /// è°å ¥é¨é¨ ///</summary> [SugarColumn(ColumnName = "DR_BM")] public string? DrBm { get; set; } /// <summary> /// MESç±»å ///</summary> [SugarColumn(ColumnName = "TYPE2")] public string? Type2 { get; set; } /// <summary> /// ä¾åºå ///</summary> [SugarColumn(ColumnName = "GYS")] public string? Gys { get; set; } } } StandardInterface/MES.Service/Modes/MesInvItemDbsqItems2.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,176 @@ using System; using System.Collections.Generic; using System.Linq; using SqlSugar; namespace MES.Service.Modes { /// <summary> /// è°æ¨ç³è¯·åæç»è¡¨ ///</summary> [SugarTable("MES_INV_ITEM_DBSQ_ITEMS2")] public class MesInvItemDbsqItems2 { /// <summary> /// SEQ_MOVE_DETAIL ///</summary> [SugarColumn(ColumnName = "ID", IsPrimaryKey = true, OracleSequenceName = "SEQ_DBSQ_DETAIL2")] //[SugarColumn(ColumnName = "ID", IsPrimaryKey = true)] public decimal Id { get; set; } /// <summary> /// 主表id ///</summary> [SugarColumn(ColumnName = "ITEM_MOVE_ID")] public decimal? ItemMoveId { get; set; } /// <summary> /// ç©æå ç ///</summary> [SugarColumn(ColumnName = "ITEM_ID")] public decimal? ItemId { get; set; } /// <summary> /// ç©æç¼ç ///</summary> [SugarColumn(ColumnName = "ITEM_NO")] public string? ItemNo { get; set; } /// <summary> /// ç³è¯·æ°é ///</summary> [SugarColumn(ColumnName = "SQ_NUM")] public decimal? SqNum { get; set; } /// <summary> /// è°åºæ°é ///</summary> [SugarColumn(ColumnName = "DC_NUM")] public decimal? DcNum { get; set; } /// <summary> /// è°å ¥æ°é ///</summary> [SugarColumn(ColumnName = "DR_NUM")] public decimal? DrNum { get; set; } /// <summary> /// å½ååºåæ° ///</summary> [SugarColumn(ColumnName = "KC")] public decimal? Kc { get; set; } /// <summary> /// 夿³¨ ///</summary> [SugarColumn(ColumnName = "REMARK")] public string? Remark { get; set; } /// <summary> /// 项次 ///</summary> [SugarColumn(ColumnName = "LINE_NO")] public decimal? LineNo { get; set; } /// <summary> /// è°æ¨ç³è¯·åå· ///</summary> [SugarColumn(ColumnName = "BILL_NO")] public string? BillNo { get; set; } /// <summary> /// è°åºç¶æ ///</summary> [SugarColumn(ColumnName = "MOVE_OUT")] public decimal? MoveOut { get; set; } /// <summary> /// è°å ¥ç¶æ ///</summary> [SugarColumn(ColumnName = "MOVE_IN")] public decimal? MoveIn { get; set; } /// <summary> /// å建人 ///</summary> [SugarColumn(ColumnName = "CREATE_BY")] public string? CreateBy { get; set; } /// <summary> /// å建æ¶é´ ///</summary> [SugarColumn(ColumnName = "CREATE_DATE")] public DateTime? CreateDate { get; set; } /// <summary> /// æåæ´æ°äºº ///</summary> [SugarColumn(ColumnName = "LASTUPDATE_BY")] public string? LastupdateBy { get; set; } /// <summary> /// æåæ´æ°æ¶é´ ///</summary> [SugarColumn(ColumnName = "LASTUPDATE_DATE")] public DateTime? LastupdateDate { get; set; } /// <summary> /// åä½ ///</summary> [SugarColumn(ColumnName = "ITEM_UNIT")] public decimal? ItemUnit { get; set; } /// <summary> /// æ¯å¦åæ¥ERP ///</summary> [SugarColumn(ColumnName = "IS_TB")] public decimal? IsTb { get; set; } /// <summary> /// è°åºç»ç» ///</summary> [SugarColumn(ColumnName = "DC_ORG")] public string? DcOrg { get; set; } /// <summary> /// è°åºä»åº ///</summary> [SugarColumn(ColumnName = "DC_DEPOT")] public string? DcDepot { get; set; } /// <summary> /// è°å ¥ç»ç» ///</summary> [SugarColumn(ColumnName = "DR_ORG")] public string? DrOrg { get; set; } /// <summary> /// è°å ¥ä»åº ///</summary> [SugarColumn(ColumnName = "DR_DEPOT")] public string? DrDepot { get; set; } /// <summary> /// è°åºè´§ä¸» ///</summary> [SugarColumn(ColumnName = "DC_HZ")] public string? DcHz { get; set; } /// <summary> /// è°å ¥è´§ä¸» ///</summary> [SugarColumn(ColumnName = "DR_HZ")] public string? DrHz { get; set; } /// <summary> /// erpid ///</summary> [SugarColumn(ColumnName = "ERPID")] public string? Erpid { get; set; } /// <summary> /// erp头id ///</summary> [SugarColumn(ColumnName = "EID")] public string? Eid { get; set; } /// <summary> /// æºåç±»å ///</summary> [SugarColumn(ColumnName = "YD_LX")] public string? YdLx { get; set; } /// <summary> /// æºåç¼å· ///</summary> [SugarColumn(ColumnName = "YD_BM")] public string? YdBm { get; set; } /// <summary> /// 订åç±»å ///</summary> [SugarColumn(ColumnName = "DD_LX")] public string? DdLx { get; set; } /// <summary> /// 订åç¼å· ///</summary> [SugarColumn(ColumnName = "DD_BM")] public string? DdBm { get; set; } /// <summary> /// éç¥ååå· ///</summary> [SugarColumn(ColumnName = "TZD_DH")] public string? TzdDh { get; set; } } } StandardInterface/MES.Service/service/BasicData/Organization/MesStaffManager.cs
StandardInterface/MES.Service/service/DbckaManager.cs
@@ -10,7 +10,7 @@ namespace MES.Service.service { public class DbckaManager : Repository<MesInvItemDbsq> public class DbckaManager : Repository<MesInvItemDbsq2> { public bool SaveList(List<ERPDBCK> list) { @@ -39,9 +39,9 @@ }) > 0; } private MesInvItemDbsq MapErpToMesHead(ErpDBCKA dto) private MesInvItemDbsq2 MapErpToMesHead(ErpDBCKA dto) { var entity = new MesInvItemDbsq var entity = new MesInvItemDbsq2 { BillNo = dto.billno, Djlx = dto.dj_lx, @@ -66,7 +66,7 @@ // var single = base.GetSingle(it => it.Erpid == entity.Erpid); /* if (single != null && single.Id.HasValue) entity.Id = single.Id.Value;*/ var single = Db.Queryable<MesInvItemDbsq>() var single = Db.Queryable<MesInvItemDbsq2>() .Where(it => it.Erpid == entity.Erpid) .First(); if (single != null) @@ -76,13 +76,13 @@ } private List<MesInvItemDbsqItems> MapErpDbckbToDbckb(List<ErpDBCKB> list) private List<MesInvItemDbsqItems2> MapErpDbckbToDbckb(List<ErpDBCKB> list) { var result = new List<MesInvItemDbsqItems>(); var result = new List<MesInvItemDbsqItems2>(); foreach (var dto in list) { var item = new MesInvItemDbsqItems var item = new MesInvItemDbsqItems2 { ItemId = Convert.ToDecimal(dto.itemid), ItemUnit = Convert.ToDecimal(dto.unit), @@ -99,7 +99,7 @@ }; var existing = Db.Queryable<MesInvItemDbsqItems>().Where(s => s.Erpid == item.Erpid).Single(); var existing = Db.Queryable<MesInvItemDbsqItems2>().Where(s => s.Erpid == item.Erpid).Single(); if (existing != null) item.Id = existing.Id; result.Add(item); @@ -108,12 +108,12 @@ return result; } private bool SaveOrUpdateData(SqlSugarScope db, MesInvItemDbsq head, List<MesInvItemDbsqItems> details) private bool SaveOrUpdateData(SqlSugarScope db, MesInvItemDbsq2 head, List<MesInvItemDbsqItems2> details) { if (head.Id != null) base.DeleteById(head.Id); db.Deleteable<MesInvItemDbsqItems>() db.Deleteable<MesInvItemDbsqItems2>() .Where(d => d.Eid == head.Erpid) .ExecuteCommand(); @@ -135,11 +135,11 @@ throw new NotImplementedException("æå ¥ææ´æ°å¤±è´¥"); } private bool UpdateData(SqlSugarScope db, MesInvItemDbsq head, List<MesInvItemDbsqItems> details) private bool UpdateData(SqlSugarScope db, MesInvItemDbsq2 head, List<MesInvItemDbsqItems2> details) { var ids = details.Select(d => d.Id).ToArray(); var deletedHead = base.DeleteById(head.Id); var deletedDetails = db.Deleteable<MesInvItemDbsqItems>().In(ids).ExecuteCommand() > 0; var deletedDetails = db.Deleteable<MesInvItemDbsqItems2>().In(ids).ExecuteCommand() > 0; if (deletedHead && deletedDetails) return true;