StandardPda/MES.Service/Dto/service/ItemOut.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,8 @@ namespace MES.Service.Dto.service; public class ItemOut { public ItemOutFrom from { get; set; } public List<ItemOutList> items { get; set; } } StandardPda/MES.Service/Dto/service/ItemOutFrom.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,19 @@ namespace MES.Service.Dto.service; public class ItemOutFrom { public string Type { get; set; } public string? CreateBy { get; set; } public string? FMRMODE { get; set; } public string? RtnNo{ get; set; } public string DepotId { get; set; } public string SupperId { get; set; } //public string? AsnNo { get; set; } public string? MesNo { get; set; } public string? SqNo { get; set; } } StandardPda/MES.Service/Dto/service/ItemOutList.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,13 @@ namespace MES.Service.Dto.service; public class ItemOutList { public string SrcDocNo { get; set; } public string SrcDocLineNo { get; set; } public string AsnLineNo { get; set; } public string itemId { get; set; } public string qty { get; set; } public string SqNo { get; set; } public string MesNo { get; set; } //public string? AsnNo { get; set; } } StandardPda/MES.Service/Modes/DeliveryDetail.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,230 @@ using System; using System.Collections.Generic; using System.Linq; using SqlSugar; namespace MES.Service.Modes { /// <summary> /// ///</summary> [SugarTable("DELIVERY_DETAIL")] public class DeliveryDetail { /// <summary> /// SEQ_DELIVERY_DETAIL ///</summary> [SugarColumn(ColumnName = "ID", IsPrimaryKey = true)] public decimal Id { get; set; } /// <summary> /// DELIVERY_MAINçid ///</summary> [SugarColumn(ColumnName = "PID")] public decimal? Pid { get; set; } /// <summary> /// éè´§åå·ï¼ä¸»ä¸å¡æ è¯ï¼ ///</summary> [SugarColumn(ColumnName = "ZZASN")] public string? Zzasn { get; set; } /// <summary> /// éè´§åè¡å· ///</summary> [SugarColumn(ColumnName = "ZZITEM_ID")] public string? ZzitemId { get; set; } /// <summary> /// éè´åè¯å·ï¼POåå·ï¼ ///</summary> [SugarColumn(ColumnName = "ZZPO_NO")] public string? ZzpoNo { get; set; } /// <summary> /// éè´è®¢åè¡é¡¹ç® ///</summary> [SugarColumn(ColumnName = "ZZPO_ITEM_ID")] public string? ZzpoItemId { get; set; } /// <summary> /// å°ç±³éæ¢è´§åå· ///</summary> [SugarColumn(ColumnName = "ZZREQNR")] public string? Zzreqnr { get; set; } /// <summary> /// éæ¢è´§ç³è¯·åè¡å· ///</summary> [SugarColumn(ColumnName = "ZZREQLN")] public string? Zzreqln { get; set; } /// <summary> /// å°ç±³å é¨ç©æç¼ç ///</summary> [SugarColumn(ColumnName = "ZZPRODUCT_ID")] public string? ZzproductId { get; set; } /// <summary> /// å·¥åå®é ä½¿ç¨æå· ///</summary> [SugarColumn(ColumnName = "ZZVPRODUCT_ID")] public string? ZzvproductId { get; set; } /// <summary> /// åºååä½ç¼ç ///</summary> [SugarColumn(ColumnName = "ZZSKU")] public string? Zzsku { get; set; } /// <summary> /// ç©ææè¿°ï¼å¦ï¼ææºå±å¹ç»ä»¶ï¼ ///</summary> [SugarColumn(ColumnName = "MAKTX")] public string? Maktx { get; set; } /// <summary> /// 产ååå·ï¼ç¤ºä¾ï¼Xiaomi 14 Ultraï¼ ///</summary> [SugarColumn(ColumnName = "MODELNUMBER")] public string? Modelnumber { get; set; } /// <summary> /// 订åéæ±æ°é ///</summary> [SugarColumn(ColumnName = "ZZQUANTITY")] public string? Zzquantity { get; set; } /// <summary> /// 计éåä½ï¼å¦ï¼ä¸ª/ç®±ï¼ ///</summary> [SugarColumn(ColumnName = "ZZUNIT")] public string? Zzunit { get; set; } /// <summary> /// æªå®ææ°éï¼å¾ 补货éï¼ ///</summary> [SugarColumn(ColumnName = "ZZOPEN_QTY")] public string? ZzopenQty { get; set; } /// <summary> /// å®é æ¶è´§æ°é ///</summary> [SugarColumn(ColumnName = "ACT_GR_QTY")] public string? ActGrQty { get; set; } /// <summary> /// Shipmentæ¹æ¬¡æ°é ///</summary> [SugarColumn(ColumnName = "SHIPMENTID_NUM")] public string? ShipmentidNum { get; set; } /// <summary> /// åçåç§°ï¼å¦ï¼Xiaomiï¼ ///</summary> [SugarColumn(ColumnName = "BRAND")] public string? Brand { get; set; } /// <summary> /// ç产å°ï¼ç¤ºä¾ï¼ä¸å½æ·±å³ï¼ ///</summary> [SugarColumn(ColumnName = "PLACE")] public string? Place { get; set; } /// <summary> /// åçç±»åï¼èªæ/ODM/OEMï¼ ///</summary> [SugarColumn(ColumnName = "BRAND_TYPE")] public string? BrandType { get; set; } /// <summary> /// ç©æµæ¹æ¬¡å¯ä¸æ è¯ ///</summary> [SugarColumn(ColumnName = "ZSHIPMENT_ID")] public string? ZshipmentId { get; set; } /// <summary> /// 详ç»é éå°åï¼çå¸åºè¡éé¨çå·ï¼ ///</summary> [SugarColumn(ColumnName = "ADDRESS_DETAIL")] public string? AddressDetail { get; set; } /// <summary> /// è°åºé¡¹ç®å·ï¼è°æ¨æ¥æºæ è¯ï¼ ///</summary> [SugarColumn(ColumnName = "BEDNR")] public string? Bednr { get; set; } /// <summary> /// è°åºä»ç±»åï¼æåä»/åæä»ï¼ ///</summary> [SugarColumn(ColumnName = "WARE_TYPE_FROM")] public string? WareTypeFrom { get; set; } /// <summary> /// è°å ¥ä»ç±»å ///</summary> [SugarColumn(ColumnName = "WARE_TYPE_TO")] public string? WareTypeTo { get; set; } /// <summary> /// ç©æ§è°æ¨åå· ///</summary> [SugarColumn(ColumnName = "XMSTO_NO")] public string? XmstoNo { get; set; } /// <summary> /// è°æ¨åè¡é¡¹ ///</summary> [SugarColumn(ColumnName = "XMSTO_ITEM_NO")] public string? XmstoItemNo { get; set; } /// <summary> /// æåä¿®æ¹æ¶é´ï¼æ ¼å¼ï¼yyyyMMddHHmmssï¼ ///</summary> [SugarColumn(ColumnName = "CHANGED_AT")] public string? ChangedAt { get; set; } /// <summary> /// æ°æ®å建æ¶é´ï¼æ ¼å¼ï¼yyyyMMddHHmmssï¼ ///</summary> [SugarColumn(ColumnName = "CREATED_AT")] public string? CreatedAt { get; set; } /// <summary> /// å ³èé¡¹ç®æºåï¼å¤å¼éå·åéï¼ ///</summary> [SugarColumn(ColumnName = "APP_MODELS")] public string? AppModels { get; set; } /// <summary> /// å¤é¨ç³»ç»åè¯å·ï¼å¦ERPåå·ï¼ ///</summary> [SugarColumn(ColumnName = "EXT_DOC_NO")] public string? ExtDocNo { get; set; } /// <summary> /// å¤é¨åè¯è¡é¡¹ç® ///</summary> [SugarColumn(ColumnName = "EXT_DOC_ITEM")] public string? ExtDocItem { get; set; } /// <summary> /// æµ·å ³HSç¼ç ï¼è¿åºå£æ¥å ³ç¨ï¼ ///</summary> [SugarColumn(ColumnName = "BATCH_ID")] public string? BatchId { get; set; } /// <summary> /// ä¼å éè´æ è¯ï¼ç´§æ¥å¤ææ è®°ï¼ ///</summary> [SugarColumn(ColumnName = "BATCH_ROW")] public string? BatchRow { get; set; } /// <summary> /// 串å·ç®¡çæ è¯ï¼Y/Nï¼æ§å¶åºåå·ééï¼ ///</summary> [SugarColumn(ColumnName = "IS_IDENTIFICATION")] public string? IsIdentification { get; set; } } } StandardPda/MES.Service/Modes/MesInvItemArnDetail.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,291 @@ using SqlSugar; namespace MES.Service.Modes; /// <summary> /// </summary> [SugarTable("MES_INV_ITEM_ARN_DETAIL")] public class MesInvItemArnDetail { /// <summary> /// SEQ_INV_ID /// </summary> [SugarColumn(ColumnName = "ID", IsPrimaryKey = true)] public decimal Id { get; set; } /// <summary> /// 主表ID /// </summary> [SugarColumn(ColumnName = "MID")] public decimal? Mid { get; set; } /// <summary> /// éè´åå· /// </summary> [SugarColumn(ColumnName = "EBELN")] public string? Ebeln { get; set; } /// <summary> /// éè´è®¢åè¡å· /// </summary> [SugarColumn(ColumnName = "EBELN_LINE")] public decimal? EbelnLine { get; set; } /// <summary> /// éè´è®¢åæ°é /// </summary> [SugarColumn(ColumnName = "EBELN_QTY")] public decimal? EbelnQty { get; set; } /// <summary> /// ç©æç¼ç /// </summary> [SugarColumn(ColumnName = "ITEM_NO")] public string? ItemNo { get; set; } /// <summary> /// æ¶è´§æ°é /// </summary> [SugarColumn(ColumnName = "QUANTITY")] public decimal? Quantity { 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 = "FACTORY")] public string? Factory { get; set; } /// <summary> /// å ¬å¸ä»£ç /// </summary> [SugarColumn(ColumnName = "COMPANY")] public string? Company { get; set; } /// <summary> /// éè´åID /// </summary> [SugarColumn(ColumnName = "EBELN_K3ID")] public string? EbelnK3id { get; set; } /// <summary> /// éè´åè¡ID /// </summary> [SugarColumn(ColumnName = "LINE_K3ID")] public string? LineK3id { get; set; } /// <summary> /// æ¬æ¬¡åºæ¶æ°é /// </summary> [SugarColumn(ColumnName = "SUB_QTY")] public decimal? SubQty { get; set; } /// <summary> /// ä½é /// </summary> [SugarColumn(ColumnName = "MARGIN_QTY")] public decimal? MarginQty { get; set; } /// <summary> /// ä»»å¡åå· /// </summary> [SugarColumn(ColumnName = "WORK_NO")] public string? WorkNo { get; set; } /// <summary> /// æ¥ææ è¯ /// </summary> [SugarColumn(ColumnName = "URGENT_FLAG")] public decimal? UrgentFlag { get; set; } /// <summary> /// 夿³¨ /// </summary> [SugarColumn(ColumnName = "MEMO")] public string? Memo { get; set; } /// <summary> /// æ£éªç»æ /// </summary> [SugarColumn(ColumnName = "CHECK_RES")] public string? CheckRes { get; set; } /// <summary> /// æ£éªç¶æ ï¼å¾ æ£ãåéãç¹éãå·²æ£ï¼ /// </summary> [SugarColumn(ColumnName = "CHECK_STATES")] public string? CheckStates { get; set; } /// <summary> /// æ¶è´§ä½é /// </summary> [SugarColumn(ColumnName = "QUANTITY_M")] public decimal? QuantityM { get; set; } /// <summary> /// æ¬æ¬¡åºæ¶ä½é /// </summary> [SugarColumn(ColumnName = "SUB_MQTY")] public decimal? SubMqty { get; set; } /// <summary> /// æ£éªæ¥æ /// </summary> [SugarColumn(ColumnName = "CHECK_DATE")] public DateTime? CheckDate { get; set; } /// <summary> /// æ¯å¦æ£éª /// </summary> [SugarColumn(ColumnName = "ISCHECK")] public short? Ischeck { get; set; } /// <summary> /// å·²æ¶æ°é /// </summary> [SugarColumn(ColumnName = "OK_QTY")] public decimal? OkQty { get; set; } /// <summary> /// å·²æ¶ä½é /// </summary> [SugarColumn(ColumnName = "OK_MQTY")] public decimal? OkMqty { get; set; } /// <summary> /// 产ååå· /// </summary> [SugarColumn(ColumnName = "BOARD_STYLE")] public string? BoardStyle { get; set; } /// <summary> /// ä»»å¡åè¡å· /// </summary> [SugarColumn(ColumnName = "WORK_LINE")] public decimal? WorkLine { get; set; } /// <summary> /// 0ãéè´åï¼1ãå§å¤å /// </summary> [SugarColumn(ColumnName = "F_TYPE")] public decimal? FType { get; set; } /// <summary> /// æ¯å¦å ¥åº /// </summary> [SugarColumn(ColumnName = "ISDEPS_IN")] public short? IsdepsIn { get; set; } /// <summary> /// å°è´§åå· /// </summary> [SugarColumn(ColumnName = "DHA001")] public string? Dha001 { get; set; } /// <summary> /// å·²å ¥åºæ°é /// </summary> [SugarColumn(ColumnName = "OK_RKQTY")] public decimal? OkRkqty { get; set; } /// <summary> /// å°è´§åå· /// </summary> [SugarColumn(ColumnName = "CBILL_NO")] public string? CbillNo { get; set; } /// <summary> /// éè´å ¥åºæ°é /// </summary> [SugarColumn(ColumnName = "CG_RKQTY")] public decimal? CgRkqty { get; set; } /// <summary> /// ç©æID /// </summary> [SugarColumn(ColumnName = "ITEM_ID")] public decimal? ItemId { get; set; } /// <summary> /// éè´§æ è¯ /// </summary> [SugarColumn(ColumnName = "RETURN_FLAG")] public decimal? ReturnFlag { get; set; } /// <summary> /// éå®è®¢åå· /// </summary> [SugarColumn(ColumnName = "SALES_ORDER")] public string? SalesOrder { get; set; } /// <summary> /// ä¸ç¨ç©ææ è¯ /// </summary> [SugarColumn(ColumnName = "IS_ZY")] public decimal? IsZy { get; set; } /// <summary> /// å ¥åºå®ææ¶é´ /// </summary> [SugarColumn(ColumnName = "RK_DATE")] public DateTime? RkDate { get; set; } /// <summary> /// 计åè·è¸ªå· /// </summary> [SugarColumn(ColumnName = "FMTONO")] public string? Fmtono { get; set; } /// <summary> /// ä¾ååå· /// </summary> [SugarColumn(ColumnName = "DELIVERY_NO")] public string? DeliveryNo { get; set; } /// <summary> /// ä¾ååå½å ç /// </summary> [SugarColumn(ColumnName = "DELIVERY_LINE")] public decimal? DeliveryLine { get; set; } /// <summary> /// æ¹å· /// </summary> [SugarColumn(ColumnName = "LOT_NO")] public string? LotNo { get; set; } /// <summary> /// æ è¯è¯¥ç©ææ¯å¦å·²å®æéè¡¥æ¨éæä½ï¼N-æªæ¨éï¼Y-å·²æ¨é /// </summary> [SugarColumn(ColumnName = "REPLENISHMENT_FLAG")] public string? ReplenishmentFlag { get; set; } /// <summary> /// 计åè¡å· /// </summary> [SugarColumn(ColumnName = "PLAN_LINE_NO")] public string? PlanLineNo { get; set; } } StandardPda/MES.Service/Modes/MesInvItemIns.cs
@@ -312,8 +312,8 @@ /// <summary> /// æ¥å·¥äºº /// </summary> [SugarColumn(ColumnName = "BGR")] public string Bgr { get; set; } //[SugarColumn(ColumnName = "BGR")] //public string Bgr { get; set; } //卿°æ®åºæ¥è¯¢æ¶å¿½ç¥è¿ä¸ªå段 [SugarColumn(IsIgnore = true)] public string? DepotName { get; set; } StandardPda/MES.Service/Modes/MesInvItemOutItems.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,259 @@ using SqlSugar; namespace MES.Service.Modes; /// <summary> /// åºåºç³è¯·ç©æè¡¨ /// </summary> [SugarTable("MES_INV_ITEM_OUT_ITEMS")] public class MesInvItemOutItems { /// <summary> /// SEQ_ITEM_ID /// </summary> [SugarColumn(ColumnName = "ID", OracleSequenceName = "SEQ_OUT_ID", IsPrimaryKey = true)] public decimal Id { get; set; } /// <summary> /// åºåºID /// </summary> [SugarColumn(ColumnName = "ITEM_OUT_ID")] public decimal? ItemOutId { get; set; } /// <summary> /// ç©æç¼å· /// </summary> [SugarColumn(ColumnName = "ITEM_NO")] public string? ItemNo { get; set; } /// <summary> /// ç³è¯·æ°é /// </summary> [SugarColumn(ColumnName = "QUANTITY")] public decimal? Quantity { 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 = "REMARK")] public string? Remark { get; set; } /// <summary> /// å·¥å /// </summary> [SugarColumn(ColumnName = "FACTORY")] public string? Factory { get; set; } /// <summary> /// å ¬å¸ /// </summary> [SugarColumn(ColumnName = "COMPANY")] public string? Company { get; set; } /// <summary> /// æ¨ä»ä»åº /// </summary> [SugarColumn(ColumnName = "DEPOT_CODE")] public string? DepotCode { get; set; } /// <summary> /// æ¨ä»åºä½ /// </summary> [SugarColumn(ColumnName = "DEPOT_SECTION_CODE")] public string? DepotSectionCode { get; set; } /// <summary> /// </summary> [SugarColumn(ColumnName = "TASK_NO")] public string? TaskNo { get; set; } /// <summary> /// å°è´§åå· /// </summary> [SugarColumn(ColumnName = "WORK_NO")] public string? WorkNo { get; set; } /// <summary> /// å°è´§åè¡å· /// </summary> [SugarColumn(ColumnName = "WORK_LINE")] public decimal? WorkLine { get; set; } /// <summary> /// ERP 主表ID /// </summary> [SugarColumn(ColumnName = "ERP_ID")] public decimal? ErpId { get; set; } /// <summary> /// ERP ä»è¡¨ID /// </summary> [SugarColumn(ColumnName = "ERP_AUTOID")] public decimal? ErpAutoid { get; set; } /// <summary> /// ERP_æå· /// </summary> [SugarColumn(ColumnName = "ERP_ITEM_NO")] public string? ErpItemNo { get; set; } /// <summary> /// é¢è² /// </summary> [SugarColumn(ColumnName = "COLOR_NAME")] public string? ColorName { get; set; } /// <summary> /// ææ°ä¸è½½æ´æ°æ è¯ /// </summary> [SugarColumn(ColumnName = "UPDATE_FLG")] public decimal? UpdateFlg { 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> /// éè´åå· /// </summary> [SugarColumn(ColumnName = "EBELN")] public string? Ebeln { get; set; } /// <summary> /// éè´è®¢åè¡å· /// </summary> [SugarColumn(ColumnName = "EBELN_LINE")] public decimal? EbelnLine { get; set; } /// <summary> /// éè´è®¢åæ°é /// </summary> [SugarColumn(ColumnName = "EBELN_QTY")] public decimal? EbelnQty { get; set; } /// <summary> /// 产åç¼å· /// </summary> [SugarColumn(ColumnName = "BOARD_ITEM")] public string? BoardItem { get; set; } /// <summary> /// æ¯å¦å§å¤ /// </summary> [SugarColumn(ColumnName = "F_TYPE")] public decimal? FType { get; set; } /// <summary> /// æ¯å¦å®ç» /// </summary> [SugarColumn(ColumnName = "STATUS")] public decimal? Status { get; set; } /// <summary> /// åå表ID /// </summary> [SugarColumn(ColumnName = "ALLOCATEID")] public decimal? Allocateid { get; set; } /// <summary> /// 颿ç¼å·/ç产工å /// </summary> [SugarColumn(ColumnName = "PBILL_NO")] public string? PbillNo { get; set; } /// <summary> /// erpæ¥å£è¿å /// </summary> [SugarColumn(ColumnName = "ERP_MARK")] public string? ErpMark { 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 = "TL_QTY")] public decimal? TlQty { get; set; } /// <summary> /// ç©æID /// </summary> [SugarColumn(ColumnName = "ITEM_ID")] public decimal? ItemId { get; set; } /// <summary> /// ç©æææåID(åææ«ç 使ç¨) /// </summary> [SugarColumn(ColumnName = "ITEM_DABID")] public decimal? ItemDabid { get; set; } /// <summary> /// åä½ /// </summary> [SugarColumn(ColumnName = "UNIT")] public string? Unit { get; set; } /// <summary> /// å ¥åºåè¡å ç /// </summary> [SugarColumn(ColumnName = "RK_LINE")] public decimal? RkLine { get; set; } /// <summary> /// 计åè·è¸ªå· /// </summary> [SugarColumn(ColumnName = "FMTONO")] public string? Fmtono { get; set; } // <summary> /// ç³è¯·è¡å· /// </summary> //[SugarColumn(ColumnName = "SQ_NO")] //public string? SqNo { get; set; } //[SugarColumn(ColumnName = "ZZITEM_ID")] //public string? ZzitemId{ get; set; } } StandardPda/MES.Service/Modes/MesInvItemOuts.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,305 @@ using SqlSugar; namespace MES.Service.Modes; /// <summary> /// ç©æåºåºè¡¨ /// </summary> [SugarTable("MES_INV_ITEM_OUTS")] public class MesInvItemOuts { /// <summary> /// SEQ_INV_ID /// </summary> [SugarColumn(ColumnName = "ID", IsPrimaryKey = true)] public decimal Id { get; set; } /// <summary> /// åºåºåå· /// </summary> [SugarColumn(ColumnName = "ITEM_OUT_NO")] public string? ItemOutNo { get; set; } /// <summary> /// ç产订å /// </summary> [SugarColumn(ColumnName = "TASK_NO")] public string? TaskNo { get; set; } /// <summary> /// å·¥åºå· /// </summary> [SugarColumn(ColumnName = "PROC_NO")] public string? ProcNo { get; set; } /// <summary> /// ç¶æ|0-æªå®¡æ ¸1-å®¡æ ¸ /// </summary> [SugarColumn(ColumnName = "STATUS")] public decimal? Status { 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> /// åæ®ç±»åID /// </summary> [SugarColumn(ColumnName = "BILL_TYPE_ID")] public decimal? BillTypeId { get; set; } /// <summary> /// äºå¡ç±»å /// </summary> [SugarColumn(ColumnName = "TRANSACTION_NO")] public decimal? TransactionNo { get; set; } /// <summary> /// 夿³¨ä¿¡æ¯ /// </summary> [SugarColumn(ColumnName = "REMARK")] public string? Remark { get; set; } /// <summary> /// åºåºåå /// </summary> [SugarColumn(ColumnName = "REASON")] public string? Reason { get; set; } /// <summary> /// ç产线ç¼ç /// </summary> [SugarColumn(ColumnName = "PRODUCE_LINE_NO")] public string? ProduceLineNo { get; set; } /// <summary> /// å®¡æ ¸äºº /// </summary> [SugarColumn(ColumnName = "CHECK_USER")] public string? CheckUser { get; set; } /// <summary> /// å®¡æ ¸æ¥æ /// </summary> [SugarColumn(ColumnName = "CHECK_DATE")] public DateTime? CheckDate { get; set; } /// <summary> /// é¢ææ¥æ /// </summary> [SugarColumn(ColumnName = "OUT_DATE")] public DateTime? OutDate { get; set; } /// <summary> /// é¢æå·¥æ®µ /// </summary> [SugarColumn(ColumnName = "MMLIST")] public string? Mmlist { get; set; } /// <summary> /// ååºCODE /// </summary> [SugarColumn(ColumnName = "DEPOT_CODE")] public string? DepotCode { 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 = "PROC_LINE_NO")] public string? ProcLineNo { get; set; } /// <summary> /// 颿é¨é¨ /// </summary> [SugarColumn(ColumnName = "OUT_PART")] public string? OutPart { get; set; } /// <summary> /// 0 ç产,1 å§å¤ /// </summary> [SugarColumn(ColumnName = "F_TYPE")] public long? FType { get; set; } /// <summary> /// å½å ¥æäº¤ /// </summary> [SugarColumn(ColumnName = "OUT_STATUS")] public decimal? OutStatus { get; set; } /// <summary> /// æ¯å¦å¯è§ /// </summary> [SugarColumn(ColumnName = "IS_VISUAL")] public decimal? IsVisual { get; set; } /// <summary> /// æ¥æ¶äºº /// </summary> [SugarColumn(ColumnName = "RECEIVER")] public string? Receiver { get; set; } /// <summary> /// å·¥åç¼å· /// </summary> [SugarColumn(ColumnName = "FACTORY")] public string? Factory { get; set; } /// <summary> /// å ¬å¸ç¼å· /// </summary> [SugarColumn(ColumnName = "COMPANY")] public string? Company { get; set; } /// <summary> /// å²éäºå¡ç±»åç¼ç /// </summary> [SugarColumn(ColumnName = "MTRANSCTION_NO")] public decimal? MtransctionNo { get; set; } /// <summary> /// ä»»å¡åå· /// </summary> [SugarColumn(ColumnName = "WORK_NO")] public string? WorkNo { get; set; } /// <summary> /// ä»»å¡åå·è¡å· /// </summary> [SugarColumn(ColumnName = "WORK_LINE")] public decimal? WorkLine { get; set; } /// <summary> /// ä¾åºåç¼å· /// </summary> [SugarColumn(ColumnName = "SUPP_NO")] public string? SuppNo { get; set; } /// <summary> /// 订åå· /// </summary> [SugarColumn(ColumnName = "CMPOCODE")] public string? Cmpocode { get; set; } /// <summary> /// åç©æåºè´§æ è¯ /// </summary> [SugarColumn(ColumnName = "ITEM_FLAG")] public decimal? ItemFlag { get; set; } /// <summary> /// 1=åæååºè´§ /// </summary> [SugarColumn(ColumnName = "BOARD_FLAG")] public decimal? BoardFlag { get; set; } /// <summary> /// åºåºç±»å« /// </summary> [SugarColumn(ColumnName = "OUT_TYPE")] public string? OutType { get; set; } /// <summary> /// ä¸å¡ç±»å /// </summary> [SugarColumn(ColumnName = "BUSINESS_TYPE")] public string? BusinessType { get; set; } /// <summary> /// 产åç¼å· /// </summary> [SugarColumn(ColumnName = "BOARD_ITEM")] public string? BoardItem { get; set; } /// <summary> /// 产é /// </summary> [SugarColumn(ColumnName = "PLAN_QTY")] public decimal? PlanQty { get; set; } /// <summary> /// 颿ç¼å·/å§å¤è®¢å /// </summary> [SugarColumn(ColumnName = "PBILL_NO")] public string? PbillNo { get; set; } /// <summary> /// è¡¥æç³è¯·åå· /// </summary> [SugarColumn(ColumnName = "BBILL_NO")] public string? BbillNo { get; set; } /// <summary> /// æ è¯ /1å·²æ¨é /// </summary> [SugarColumn(ColumnName = "NFLAG")] public short? Nflag { get; set; } /// <summary> /// éææ¹å¼ /// </summary> [SugarColumn(ColumnName = "FMRMODE")] public string? Fmrmode { get; set; } /// <summary> /// erpè¿åä¿¡æ¯ /// </summary> [SugarColumn(ColumnName = "MSG")] public string? Msg { get; set; } /// <summary> /// ç¶æ /// </summary> [SugarColumn(ColumnName = "STATES")] public string? States { get; set; } /// <summary> /// ç»ç»ID /// </summary> [SugarColumn(ColumnName = "ORGANIZEID")] public string? Organizeid { get; set; } } StandardPda/MES.Service/service/Warehouse/MesInvItemArnDetailManager.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,8 @@ using MES.Service.DB; using MES.Service.Modes; namespace MES.Service.service.Warehouse; public class MesInvItemArnDetailManager : Repository<MesInvItemArnDetail> { } StandardPda/MES.Service/service/Warehouse/MesInvItemArnManager.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,8 @@ using MES.Service.DB; using MES.Service.Modes; namespace MES.Service.service.Warehouse; public class MesInvItemArnManager : Repository<MesInvItemArn> { } StandardPda/MES.Service/service/Warehouse/MesInvItemInsManager.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,8 @@ using MES.Service.DB; using MES.Service.Modes; namespace MES.Service.service.Warehouse; public class MesInvItemInsManager : Repository<MesInvItemIns> { } StandardPda/MES.Service/service/Warehouse/MesInvItemOutItemsManager.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,8 @@ using MES.Service.DB; using MES.Service.Modes; namespace MES.Service.service.Warehouse; public class MesInvItemOutItemsManager : Repository<MesInvItemOutItems> { } StandardPda/MES.Service/service/Warehouse/MesInvItemOutsManager.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,369 @@ using MES.Service.DB; using MES.Service.Dto.service; using MES.Service.Modes; namespace MES.Service.service.Warehouse; public class MesInvItemOutsManager : Repository<MesInvItemOuts> { private readonly int BILL_TYPE_ID = 200; private readonly int TRANSACTION_NO = 203; public bool ReturnRequest(ItemOut oItemOut) { var itemOutFrom = oItemOut.from; var itemOutLists = oItemOut.items; // æ ¹æ®AsnNoåMesNo对æç»è¿è¡åç» var groupedItems = itemOutLists .GroupBy(item => new { item.MesNo, item.SqNo }) .ToList(); bool result = true; foreach (var group in groupedItems) { //if (group.Key.AsnNo == null) //{ // throw new NotImplementedException("AsnNoä¸è½ä¸ºç©º"); //} if (group.Key.MesNo == null) { throw new NotImplementedException("å ¥åºååå·ä¸è½ä¸ºç©º"); } if (group.Key.SqNo == null) { throw new NotImplementedException("éè´§ç³è¯·åè¡å·ä¸è½ä¸ºç©º"); } // å建ä¸ä¸ªä¸´æ¶çitemOutFrom对象ï¼ä½¿ç¨åç»çKeyä½ä¸ºä¸»è¦å±æ§ var tempItemOutFrom = new ItemOutFrom { MesNo = group.Key.MesNo, SqNo = group.Key.SqNo, // ç»§æ¿åå§itemOutFromçå ¶ä»å±æ§ RtnNo = itemOutFrom.RtnNo, Type = itemOutFrom.Type, CreateBy = itemOutFrom.CreateBy, FMRMODE = itemOutFrom.FMRMODE, DepotId = itemOutFrom.DepotId, SupperId = itemOutFrom.SupperId }; // æ ¹æ®Typeæ§è¡ä¸åçé»è¾ switch (tempItemOutFrom.Type) { case "1": { var mesInvItemOuts = Db.Queryable<MesInvItemOuts>() .Where(s => s.BillTypeId == BILL_TYPE_ID && s.TransactionNo == TRANSACTION_NO && s.ItemOutNo == tempItemOutFrom.RtnNo ) .Count(); if (mesInvItemOuts > 0) { throw new NotImplementedException( tempItemOutFrom.RtnNo + "çéæç³è¯·åå·²ç»åå¨"); } // 为å½ååç»ä¿åæ°æ® var groupResult = Save(tempItemOutFrom, group.ToList()); if (!groupResult) { result = false; } break; } case "4": var removeResult = Remove(tempItemOutFrom); if (!removeResult) { result = false; } break; default: result = false; break; } } return result; } private bool Save(ItemOutFrom from, List<ItemOutList> items) { var mesInvItemIns = Db.Queryable<MesInvItemIns>() .Where(s => s.BillTypeId == 100 && s.TransctionNo == "101" && s.BillNo == from.MesNo ).First(); if (mesInvItemIns == null) { throw new NotImplementedException("éè´å ¥åºä¸åå¨"); } var mesDepots = Db.Queryable<MesDepots>() .Where(s => s.DepotId == Decimal.Parse(from.DepotId)).First(); var mesLinkU9 = Db.Queryable<MesLinkU9>() .Where(s => s.TableType == "MES_SUPPLIER" && s.U9Id == from.SupperId).First(); if (mesLinkU9 == null) { throw new NotImplementedException("ä¾åºåIDä¸å卿æªåæ¥äºU9"); } var mesSupplier = Db.Queryable<MesSupplier>() .Where(s => s.Id == Decimal.Parse(mesLinkU9.MesId)) .First(); if (mesDepots == null) { throw new NotImplementedException("[" + from.DepotId + "]ä»åºä¸åå¨ï¼è¯·åæ¥ç»MES"); } if (mesSupplier == null) { throw new NotImplementedException("[" + from.SupperId + "]ä¾åºåä¸åå¨ï¼è¯·åæ¥ç»MES"); } var nextSequenceValue = Db.Ado.SqlQuery<decimal>("SELECT SEQ_OUT_ID.NEXTVAL FROM DUAL") .First(); // var billCode = // Db.Ado.SqlQuery<string>( // "SELECT GETBILLCODE1('1000', '1000', 'TLSQ') FROM DUAL") // .First(); var billCode = from.RtnNo; // å建éè´éæåè®°å½ var mesInvItemOuts = new MesInvItemOuts { Id = nextSequenceValue, ItemOutNo = billCode, Status = 0, CreateBy = "PL017", CreateDate = DateTime.Now, BillTypeId = 200, TransactionNo = 203, DepotCode = mesDepots.DepotCode, FType = 0, OutStatus = 0, IsVisual = 1, Factory = "1000", Company = "1000", SuppNo = mesSupplier.SuppNo, ItemFlag = 0, BoardFlag = 0, OutType = "éè´éæ", Nflag = 0, Fmrmode = from.FMRMODE, Sapno = from.SqNo, Organizeid = "1002503270000079", }; // å建éè´éæåè®°å½ var mesInvItemOutItems = new List<MesInvItemOutItems>(); foreach (var itemOutList in items) { // æ£æ¥å¿ è¦å段æ¯å¦ä¸ºç©º if (string.IsNullOrEmpty(itemOutList.SrcDocNo)) { throw new NotImplementedException("éè´è®¢åå·ä¸è½ä¸ºç©º"); } if (string.IsNullOrEmpty(itemOutList.SrcDocLineNo)) { throw new NotImplementedException("éè´è®¢åè¡å·ä¸è½ä¸ºç©º"); } //if (string.IsNullOrEmpty(itemOutList.AsnLineNo)) //{ // throw new NotImplementedException("ASNè¡å·ä¸è½ä¸ºç©º"); //} if (string.IsNullOrEmpty(itemOutList.itemId)) { throw new NotImplementedException("ç©æIDä¸è½ä¸ºç©º"); } var mesRohInData = Db.Queryable<MesRohInData>() .Where(s => s.BillNo == itemOutList.SrcDocNo && s.OrderLineId == itemOutList.SrcDocLineNo) .First(); if (mesRohInData == null) { throw new NotImplementedException("éè´è®¢åä¸åå¨"); } //var deliveryDetail = Db.Queryable<DeliveryDetail>() // .Where(a => Int32.Parse(a.ZzitemId) == // Int32.Parse(itemOutList.AsnLineNo)) // .Count(); //if (deliveryDetail <= 0) //{ // throw new NotImplementedException("[" + from.AsnNo + "]çæç»è¡[" + // itemOutList.AsnLineNo + // "]ä¸åå¨"); //} var itemIdLinkU9 = Db.Queryable<MesLinkU9>() .Where(s => s.TableType == "MES_ITEMS" && s.U9Id == itemOutList.itemId).First(); if (mesLinkU9 == null) { throw new NotImplementedException("ä¾åºåIDä¸å卿æªåæ¥äºU9"); } var mesItems = Db.Queryable<MesItems>() .Where(s => s.Id == Decimal.Parse(itemIdLinkU9.MesId)) .First(); if (mesItems == null) { throw new NotImplementedException("[" + itemOutList.itemId + "]ç©æä¸åå¨ï¼è¯·åæ¥ç»MES"); } var mesInvItemInCItems = Db.Queryable<MesInvItemInCItems>() .Where(s => s.ItemInId == mesInvItemIns.Id && s.ItemNo == mesItems.ItemNo && s.Ebeln == itemOutList.SrcDocNo && s.EbelnLineNo == Decimal.Parse(itemOutList.SrcDocLineNo) && s.SuppNo == mesSupplier.SuppNo ).First(); if (mesInvItemInCItems == null) { throw new NotImplementedException("没æå¯¹åºçå ¥åºæç»"); } // ç¡®ä¿CbillNoä¸ä¸ºç©º if (string.IsNullOrEmpty(mesInvItemIns.CbillNo)) { throw new NotImplementedException("å ¥åºåå ³èçéè´åå·ä¸è½ä¸ºç©º"); } mesInvItemOutItems.Add(new MesInvItemOutItems { ItemOutId = nextSequenceValue, ItemNo = mesItems.ItemNo, Quantity = Decimal.Parse(itemOutList.qty), CreateBy = "PL017", CreateDate = DateTime.Now, Factory = "1000", Company = "1000", DepotCode = mesDepots.DepotCode, WorkNo = itemOutList.SrcDocNo, // ç¡®ä¿WorkNoæå¼ WorkLine = Decimal.Parse(itemOutList.SrcDocLineNo), // ç¡®ä¿WorkLineæå¼ EbelnK3id = Decimal.Parse(mesRohInData.ErpId), LineK3id = Decimal.Parse(mesRohInData.EbelnK3id), FType = 0, Status = 0, PbillNo = mesInvItemIns.CbillNo, // ç¡®ä¿PbillNoæå¼ RkNo = from.MesNo, // ç¡®ä¿RkNoæå¼ RkLine = mesInvItemInCItems.Id, // ç¡®ä¿RkLineæå¼ RkQty = mesInvItemInCItems.Quantity, TlQty = 0, ItemId = Decimal.Parse(itemIdLinkU9.MesId), // ç¡®ä¿ItemIdæå¼ //SqNo = itemOutList.SqNo, // ç¡®ä¿ItemIdæå¼ //ZzitemId = itemOutList.AsnLineNo, // ç¡®ä¿ItemIdæå¼ // Unit = item.Unit, }); } var outItemCommand = Db.Insertable(mesInvItemOutItems) .PageSize(1).IgnoreColumnsNull().ExecuteCommand(); if (outItemCommand <= 0) { throw new Exception("å建éè´éæåå表失败"); } // æå ¥éè´éæåè®°å½ var insertResult = Db.Insertable(mesInvItemOuts).IgnoreColumns(true) .ExecuteCommand(); if (insertResult <= 0) { throw new Exception("å建éè´éæå失败"); } return outItemCommand + insertResult >= 2; } private bool Remove(ItemOutFrom from) { // æ¥æ¾è¦å é¤çéè´éæå var mesInvItemOuts = Db.Queryable<MesInvItemOuts>() .Where(s => s.BillTypeId == BILL_TYPE_ID && s.TransactionNo == TRANSACTION_NO && s.ItemOutNo == from.RtnNo).ToList(); if (mesInvItemOuts == null || mesInvItemOuts.Count == 0) { throw new NotImplementedException("æ¾ä¸å°å¯¹åºçéè´éæå: " + from.RtnNo); } // æ£æ¥æ¯å¦æå·²å®¡æ ¸çåæ®ï¼å¦æåå¨å·²å®¡æ ¸(Status=1)åä¸å 许å é¤ if (mesInvItemOuts.Any(item => item.Status == 1)) { throw new NotImplementedException("åå¨å·²å®¡æ ¸çéè´éæåï¼ä¸å 许å é¤"); } // å 餿æç¸å ³åæ® foreach (var itemOut in mesInvItemOuts) { // æ¥æ¾è¦å é¤çéè´éæåæç» var mesInvItemOutItems = Db.Queryable<MesInvItemOutItems>() .Where(s => s.ItemOutId == itemOut.Id) .ToList(); if (mesInvItemOutItems == null || mesInvItemOutItems.Count == 0) { throw new NotImplementedException( $"æ¾ä¸å°éè´éæå[{itemOut.ItemOutNo}]对åºçæç»"); } // å é¤éè´éæåæç» var deleteItemsResult = Db.Deleteable<MesInvItemOutItems>() .Where(s => s.ItemOutId == itemOut.Id) .ExecuteCommand(); if (deleteItemsResult <= 0) { throw new Exception($"å é¤éè´éæå[{itemOut.ItemOutNo}]æç»å¤±è´¥"); } // å é¤éè´éæå var deleteResult = Db.Deleteable<MesInvItemOuts>() .Where(s => s.Id == itemOut.Id) .ExecuteCommand(); if (deleteResult <= 0) { throw new Exception($"å é¤éè´éæå[{itemOut.ItemOutNo}]失败"); } } return true; } } StandardPda/MESApplication/Controllers/Warehouse/MesInvItemOutsController.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,213 @@ using MES.Service.Dto.service; using MES.Service.Modes; using MES.Service.service; using MES.Service.service.Warehouse; using MES.Service.util; using Microsoft.AspNetCore.Mvc; using System.Dynamic; using System.Threading; namespace MESApplication.Controllers.Warehouse; [ApiController] [Route("api/[controller]")] public class MesInvItemOutsController : ControllerBase { private readonly MesInvItemOutsManager m = new(); private readonly MessageCenterManager _manager = new(); private readonly string METHOD = "POST"; private readonly string TableName = "MesInvItemOuts"; private readonly string URL = "http://localhost:10054/api/MesInvItemOuts/"; /// <summary> /// éè´éè´§ç³è¯·å /// </summary> /// <returns></returns> [HttpPost("ReturnRequest")] public ResponseResult ReturnRequest(ItemOut oItemOut) { var entity = new MessageCenter(); entity.TableName = TableName; entity.Url = URL + "ReturnRequest"; entity.Method = METHOD; entity.Data = Newtonsoft.Json.JsonConvert.SerializeObject(oItemOut); entity.Status = 1; entity.CreateBy = "PL017"; try { dynamic resultInfos = new ExpandoObject(); var result = m.ReturnRequest(oItemOut); resultInfos.tbBillList = result; entity.Result = 0; if (result) 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] MesInvItemOuts 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] MesInvItemOuts 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] MesInvItemOuts 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); } } } StandardPda/MESApplication/MESApplication.csproj
@@ -9,7 +9,7 @@ </PropertyGroup> <ItemGroup> <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.0"/> <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.0" /> <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.1"> <PrivateAssets>all</PrivateAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> @@ -18,12 +18,12 @@ <PrivateAssets>all</PrivateAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> </PackageReference> <PackageReference Include="Oracle.EntityFrameworkCore" Version="8.21.121"/> <PackageReference Include="Swashbuckle.AspNetCore" Version="6.4.0"/> <PackageReference Include="Oracle.EntityFrameworkCore" Version="8.21.121" /> <PackageReference Include="Swashbuckle.AspNetCore" Version="6.4.0" /> </ItemGroup> <ItemGroup> <ProjectReference Include="..\MES.Service\MES.Service.csproj"/> <ProjectReference Include="..\MES.Service\MES.Service.csproj" /> </ItemGroup> </Project>