.gitignore
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,4 @@ 代ç 管ç/WMS/WMS_Server/WIDESEA_WebApi/appsettings.json *.json 代ç 管ç/PCS/WCS_Server/WIDESEA_Comm/StateEnum/LocationStateEnum.cs ´úÂë¹ÜÀí/PCS/WCS_Server/WIDESEA_Comm/MES_Info/BasicSN.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,16 @@ using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; namespace WIDESEA_Comm.MES_Info { public class BasicSN { public class detail { public string sn { get; set; } } } } ´úÂë¹ÜÀí/PCS/WCS_Server/WIDESEA_Comm/MES_Info/Request/agvInWarehousePara.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,42 @@ using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; namespace WIDESEA_Comm.MES_Info.Request { public class agvInWarehousePara :BasicSN { /// <summary> /// å·¥åç¼å· /// </summary> public string JobID { get; set; } /// <summary> /// è½¦è½®ä¿¡æ¯ /// </summary> public List<detail> details { get; set; } /// <summary> /// åºæ¿åç§° /// </summary> public string warehouseName { get; set; } /// <summary> /// åºä½åç§° /// </summary> public string zoneID { get; set; } /// <summary> /// åä½åç§° /// </summary> public string stackID { get; set; } /// <summary> /// å±å· /// </summary> public int? layerNo { get; set; } } } ´úÂë¹ÜÀí/PCS/WCS_Server/WIDESEA_Comm/MES_Info/Request/agvMoveWarehousePara.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,56 @@ using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; namespace WIDESEA_Comm.MES_Info.Request { public class agvMoveWarehousePara :BasicSN { /// <summary> /// 车轮SN /// </summary> public List<detail> details { get; set; } /// <summary> /// æºåºæ¿åç§° /// </summary> public string fromWarehouseName { get; set; } /// <summary> /// æºåºä½åç§° /// </summary> public string fromZoneID { get; set; } /// <summary> /// æºåä½åç§° /// </summary> public string fromStackID { get; set; } /// <summary> /// æºå±å· /// </summary> public string fromLayerNo { get; set; } /// <summary> /// ç®æ åºæ¿åç§° /// </summary> public string toWarehouseName { get; set;} /// <summary> /// ç®æ åºä½åç§° /// </summary> public string toZoneID { get; set;} /// <summary> /// ç®æ åä½åç§° /// </summary> public string toStackID { get; set;} /// <summary> /// ç®æ å±å· /// </summary> public string toLayerNo { get; set;} } } ´úÂë¹ÜÀí/PCS/WCS_Server/WIDESEA_Comm/MES_Info/Request/agvOutWarehousePara.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,23 @@ using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; namespace WIDESEA_Comm.MES_Info { public class agvOutWarehousePara : BasicSN { /// <summary> /// å·¥åå· /// </summary> public string JobID { get; set; } /// <summary> /// 车轮 /// </summary> public List<detail> details { get; set; } } } ´úÂë¹ÜÀí/PCS/WCS_Server/WIDESEA_Comm/MES_Info/Request/agvTransferListPara.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,27 @@ using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; namespace WIDESEA_Comm.MES_Info.Request { public class agvTransferListPara :BasicSN { public string transferListID { get; set; } public string materialCode { get; set; } public string drawingNoVer { get; set; } public string fromWarehouse { get; set; } public string toWarehouse { get; set; } public string Operator { get; set; } public string updateTime { get; set; } /// <summary> /// è½¦è½®ä¿¡æ¯ /// </summary> public List<detail> details { get; set; } } } ´úÂë¹ÜÀí/PCS/WCS_Server/WIDESEA_Comm/MES_Info/Response/Mes_WorkInfo.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,121 @@ using System; using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; using System.Runtime.CompilerServices; using System.Text; namespace WIDESEA_Common { public class Mes_WorkInfo { /// <summary> /// å·¥ä½ä»¤å· /// </summary> public string workOrder { get; set; } /// <summary> /// å·¥åå· /// </summary> public string jobID { get; set; } /// <summary> /// éæ±åå· /// </summary> public string reqID { get; set; } /// <summary> /// éæ±åå· /// </summary> public string reqIDLineNo { get; set; } /// <summary> /// ç©æç¼ç /// </summary> public string materialCode { get; set; } /// <summary> /// å¾å· /// </summary> public string drawingNo { get; set; } /// <summary> /// ææ¯ç¶æ /// </summary> public string drawingNoVer { get; set; } /// <summary> /// 产åå /// </summary> public string productName { get; set; } /// <summary> /// 产åæè¿° /// </summary> public string productDesc { get; set; } /// <summary> /// è®¡åæ°é /// </summary> public int? quantity { get; set; } /// <summary> /// è½®å代ç /// </summary> //[AllowNull] public string typeID { get; set; } /// <summary> /// æå æ°é /// </summary> public int? stackNoRange { get; set; } /// <summary> /// è½®å¾åå·® /// </summary> public decimal? maxDiameterDiff { get; set; } /// <summary> /// 计åå¼å§æ¶é´ /// </summary> public DateTime? expectedStartTime { get; set; } /// <summary> /// 计åç»ææ¶é´ /// </summary> public DateTime? expectedFinishTime { get; set; } /// <summary> /// 车轮信æ¯éå /// </summary> public List<detail> details { get; set; } } public class detail { /// <summary> /// å·¥åç¼å· /// </summary> public string jobID { get; set; } /// <summary> /// çä»£å· /// </summary> public string heatID { get; set; } /// <summary> ///é¢å¯å· /// </summary> public int? billetID { get; set; } /// <summary> /// 车轮SNå· /// </summary> public string SN { get; set; } /// <summary> /// çå¤çæ¹æ¬¡ /// </summary> public string heatBatchID { get; set; } } } ´úÂë¹ÜÀí/PCS/WCS_Server/WIDESEA_Comm/StateEnum/LocationStateEnum.cs
@@ -15,6 +15,11 @@ /// <summary> /// ç©ºè´§ä½ /// </summary> <<<<<<< Updated upstream Empty ======= Empty, Busy >>>>>>> Stashed changes } } ´úÂë¹ÜÀí/PCS/WCS_Server/WIDESEA_Core/Utilities/Response/WebResponseContent.cs
@@ -1,4 +1,5 @@ using WIDESEA_Core.Enums; using System; using WIDESEA_Core.Enums; using WIDESEA_Core.Extensions; namespace WIDESEA_Core.Utilities ´úÂë¹ÜÀí/PCS/WCS_Server/WIDESEA_Entity/DomainModels/Base/dt_materielinfo.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,329 @@ /* *代ç ç±æ¡æ¶çæ,任使´æ¹é½å¯è½å¯¼è´è¢«ä»£ç çæå¨è¦ç *å¦ææ°æ®åºå段åçååï¼è¯·å¨ä»£ç çå¨éæ°çææ¤Model */ using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; using System.Linq; using System.Text; using System.Threading.Tasks; using WIDESEA_Entity.SystemModels; namespace WIDESEA_Entity.DomainModels { [Entity(TableCnName = "ç©æä¿¡æ¯",TableName = "dt_materielinfo")] public partial class dt_materielinfo:BaseEntity { /// <summary> ///ä¸»é® /// </summary> [Display(Name ="主é®")] [Column(TypeName="uniqueidentifier")] [Editable(true)] [Required(AllowEmptyStrings=false)] public Guid materiel_pkid { get; set; } /// <summary> ///ç©æid /// </summary> [Display(Name ="ç©æid")] [MaxLength(100)] [Column(TypeName="nvarchar(100)")] [Editable(true)] [Required(AllowEmptyStrings=false)] public string materiel_id { get; set; } /// <summary> ///æå±åºåº /// </summary> [Display(Name ="æå±åºåº")] [Column(TypeName="int")] [Editable(true)] [Required(AllowEmptyStrings=false)] public int materiel_areaid { get; set; } /// <summary> ///ç©æåç§° /// </summary> [Display(Name ="ç©æåç§°")] [MaxLength(200)] [Column(TypeName="nvarchar(200)")] [Editable(true)] [Required(AllowEmptyStrings=false)] public string materiel_name { get; set; } /// <summary> ///ç©æä¿¡æ¯æè¿° /// </summary> [Display(Name ="ç©æä¿¡æ¯æè¿°")] [MaxLength(200)] [Column(TypeName="nvarchar(200)")] [Editable(true)] public string materiel_desc { get; set; } /// <summary> ///å è£ è§æ ¼ /// </summary> [Display(Name ="å è£ è§æ ¼")] [MaxLength(20)] [Column(TypeName="nvarchar(20)")] [Editable(true)] public string materiel_packspes { get; set; } /// <summary> ///å½åç¶æ /// </summary> [Display(Name ="å½åç¶æ")] [MaxLength(20)] [Column(TypeName="nvarchar(20)")] [Editable(true)] public string materiel_state { get; set; } /// <summary> ///ç©æç±»å /// </summary> [Display(Name ="ç©æç±»å")] [MaxLength(20)] [Column(TypeName="nvarchar(20)")] [Editable(true)] public string materiel_type { get; set; } /// <summary> ///计éåä½ /// </summary> [Display(Name ="计éåä½")] [MaxLength(10)] [Column(TypeName="nvarchar(10)")] [Editable(true)] public string materiel_unit { get; set; } /// <summary> ///æå°å è£ /// </summary> [Display(Name ="æå°å è£ ")] [DisplayFormat(DataFormatString="18,2")] [Column(TypeName="decimal")] [Editable(true)] public decimal? materiel_minpack_qty { get; set; } /// <summary> ///ç产å /// </summary> [Display(Name ="ç产å")] [MaxLength(40)] [Column(TypeName="nvarchar(40)")] [Editable(true)] public string materiel_mfacturer { get; set; } /// <summary> ///ä¾åºå /// </summary> [Display(Name ="ä¾åºå")] [MaxLength(40)] [Column(TypeName="nvarchar(40)")] [Editable(true)] public string materiel_supplier { get; set; } /// <summary> ///åé /// </summary> [Display(Name ="åé")] [DisplayFormat(DataFormatString="18,2")] [Column(TypeName="decimal")] [Editable(true)] public decimal? materiel_netweight { get; set; } /// <summary> ///æ¯é /// </summary> [Display(Name ="æ¯é")] [DisplayFormat(DataFormatString="18,2")] [Column(TypeName="decimal")] [Editable(true)] public decimal? materiel_grossweight { get; set; } /// <summary> ///æææ /// </summary> [Display(Name ="æææ")] [Column(TypeName="int")] [Editable(true)] public int? materiel_validity { get; set; } /// <summary> ///å®å ¨åºå /// </summary> [Display(Name ="å®å ¨åºå")] [DisplayFormat(DataFormatString="18,2")] [Column(TypeName="decimal")] [Editable(true)] public decimal? materiel_safety { get; set; } /// <summary> ///å建è /// </summary> [Display(Name ="å建è ")] [MaxLength(20)] [Column(TypeName="nvarchar(20)")] [Editable(true)] public string materiel_creator { get; set; } /// <summary> ///å建æ¶é´ /// </summary> [Display(Name ="å建æ¶é´")] [Column(TypeName="datetime")] [Editable(true)] public DateTime? materiel_createtime { get; set; } /// <summary> ///夿³¨ /// </summary> [Display(Name ="夿³¨")] [MaxLength(100)] [Column(TypeName="nvarchar(100)")] [Editable(true)] public string materiel_remark { get; set; } /// <summary> ///éè´ç±»å /// </summary> [Display(Name ="éè´ç±»å")] [MaxLength(20)] [Column(TypeName="nvarchar(20)")] [Editable(true)] public string materiel_purchaseType { get; set; } /// <summary> ///è±ææè¿° /// </summary> [Display(Name ="è±ææè¿°")] [MaxLength(200)] [Column(TypeName="nvarchar(200)")] [Editable(true)] public string materiel_englishdesc { get; set; } /// <summary> ///ç©æç» /// </summary> [Display(Name ="ç©æç»")] [MaxLength(20)] [Column(TypeName="varchar(20)")] [Editable(true)] public string materiel_materielGroup { get; set; } /// <summary> ///产åç» /// </summary> [Display(Name ="产åç»")] [MaxLength(20)] [Column(TypeName="varchar(20)")] [Editable(true)] public string materiel_productGroup { get; set; } /// <summary> ///大å°/é纲 /// </summary> [Display(Name ="大å°/é纲")] [MaxLength(20)] [Column(TypeName="nvarchar(20)")] [Editable(true)] public string materiel_size { get; set; } /// <summary> ///MRPç±»å /// </summary> [Display(Name ="MRPç±»å")] [MaxLength(20)] [Column(TypeName="nvarchar(20)")] [Editable(true)] public string materiel_mrpType { get; set; } /// <summary> ///追溯æ è¯ /// </summary> [Display(Name ="追溯æ è¯")] [MaxLength(20)] [Column(TypeName="varchar(20)")] [Editable(true)] public string materiel_traceabilityCode { get; set; } /// <summary> ///ç©æé¿ /// </summary> [Display(Name ="ç©æé¿")] [DisplayFormat(DataFormatString="18,2")] [Column(TypeName="decimal")] [Editable(true)] public decimal? materiel_long { get; set; } /// <summary> ///ç©æå®½ /// </summary> [Display(Name ="ç©æå®½")] [DisplayFormat(DataFormatString="18,2")] [Column(TypeName="decimal")] [Editable(true)] public decimal? materiel_width { get; set; } /// <summary> ///ç©æé« /// </summary> [Display(Name ="ç©æé«")] [DisplayFormat(DataFormatString="18,2")] [Column(TypeName="decimal")] [Editable(true)] public decimal? materiel_height { get; set; } /// <summary> ///æçé¿ /// </summary> [Display(Name ="æçé¿")] [DisplayFormat(DataFormatString="18,2")] [Column(TypeName="decimal")] [Editable(true)] public decimal? materiel_palletlong { get; set; } /// <summary> ///æç宽 /// </summary> [Display(Name ="æç宽")] [DisplayFormat(DataFormatString="18,2")] [Column(TypeName="decimal")] [Editable(true)] public decimal? materiel_palletwidth { get; set; } /// <summary> ///æçé« /// </summary> [Display(Name ="æçé«")] [DisplayFormat(DataFormatString="18,2")] [Column(TypeName="decimal")] [Editable(true)] public decimal? materiel_palletheight { get; set; } /// <summary> ///åºåå°ç¹ /// </summary> [Display(Name ="åºåå°ç¹")] [MaxLength(20)] [Column(TypeName="nvarchar(20)")] [Editable(true)] public string materiel_location { get; set; } /// <summary> /// /// </summary> [Key] [Display(Name ="ID")] [Column(TypeName="int")] [Editable(true)] [Required(AllowEmptyStrings=false)] [DatabaseGenerated(DatabaseGeneratedOption.Identity)] public int ID { get; set; } } } ´úÂë¹ÜÀí/PCS/WCS_Server/WIDESEA_Entity/DomainModels/Base/partial/dt_materielinfo.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,21 @@ /* *代ç ç±æ¡æ¶çæ,任使´æ¹é½å¯è½å¯¼è´è¢«ä»£ç çæå¨è¦ç *å¦ææ°æ®åºå段åçååï¼è¯·å¨ä»£ç çå¨éæ°çææ¤Model */ using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; using System.Linq; using System.Text; using System.Threading.Tasks; using WIDESEA_Entity.SystemModels; namespace WIDESEA_Entity.DomainModels { public partial class dt_materielinfo { //æ¤å¤é ç½®åæ®µ(åæ®µé ç½®è§æ¤modelçå¦ä¸ä¸ªpartial),å¦æè¡¨ä¸æ²¡ææ¤å段请å ä¸ [NotMapped]屿§ï¼å¦åä¼å¼å¸¸ } } ´úÂë¹ÜÀí/PCS/WCS_Server/WIDESEA_Entity/DomainModels/System/dt_stationinfo.cs
@@ -134,6 +134,21 @@ [Column(TypeName="int")] public int? column { get; set; } /// <summary> ///å·¥åç¼å· /// </summary> [Display(Name = "å·¥åç¼å·")] [MaxLength(255)] [Column(TypeName = "nvarchar(255)")] [Editable(true)] public string Number { get; set; } /// <summary> ///çå· /// </summary> [Display(Name = "çå·")] [Column(TypeName = "int")] [Required(AllowEmptyStrings = false)] public int heatNumber { get; set; } } } ´úÂë¹ÜÀí/PCS/WCS_Server/WIDESEA_Entity/DomainModels/Taskinfo/dt_agvtask.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,225 @@ /* *代ç ç±æ¡æ¶çæ,任使´æ¹é½å¯è½å¯¼è´è¢«ä»£ç çæå¨è¦ç *å¦ææ°æ®åºå段åçååï¼è¯·å¨ä»£ç çå¨éæ°çææ¤Model */ using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; using System.Linq; using System.Text; using System.Threading.Tasks; using WIDESEA_Entity.SystemModels; namespace WIDESEA_Entity.DomainModels { [Entity(TableCnName = "AGVä»»å¡", TableName = "dt_agvtask")] public partial class dt_agvtask : BaseEntity { /// <summary> ///ä»»å¡Id /// </summary> [Key] [Display(Name = "ä»»å¡Id")] [Column(TypeName = "uniqueidentifier")] [Editable(true)] [Required(AllowEmptyStrings = false)] public Guid agv_id { get; set; } /// <summary> ///ä»»å¡ç¼å· /// </summary> [Display(Name = "ä»»å¡ç¼å·")] [MaxLength(50)] [Column(TypeName = "nvarchar(50)")] [Editable(true)] [Required(AllowEmptyStrings = false)] public string agv_tasknum { get; set; } /// <summary> ///èµ·ç¹å°å /// </summary> [Display(Name = "èµ·ç¹å°å")] [MaxLength(50)] [Column(TypeName = "nvarchar(50)")] [Editable(true)] public string agv_fromaddress { get; set; } /// <summary> ///ç»ç¹å°å /// </summary> [Display(Name = "ç»ç¹å°å")] [MaxLength(50)] [Column(TypeName = "nvarchar(50)")] [Editable(true)] public string agv_toaddress { get; set; } /// <summary> ///AGVç¼å· /// </summary> [Display(Name = "AGVç¼å·")] [MaxLength(50)] [Column(TypeName = "nvarchar(50)")] [Editable(true)] [Required(AllowEmptyStrings = false)] public string agv_code { get; set; } /// <summary> ///ä»»å¡ç¶æ /// </summary> [Display(Name = "ä»»å¡ç¶æ")] [MaxLength(20)] [Column(TypeName = "nvarchar(20)")] [Editable(true)] [Required(AllowEmptyStrings = false)] public string agv_taskstate { get; set; } /// <summary> ///AGVå·¥ä½ç±»å /// </summary> [Display(Name = "AGVå·¥ä½ç±»å")] [Column(TypeName = "int")] [Editable(true)] public int? agv_worktype { get; set; } /// <summary> ///ç©æç±»å /// </summary> [Display(Name = "ç©æç±»å")] [MaxLength(50)] [Column(TypeName = "nvarchar(50)")] [Editable(true)] [Required(AllowEmptyStrings = false)] public string agv_materielid { get; set; } /// <summary> ///æ°é /// </summary> [Display(Name = "æ°é")] [Column(TypeName = "int")] [Editable(true)] [Required(AllowEmptyStrings = false)] public int? agv_qty { get; set; } /// <summary> ///å建æ¶é´ /// </summary> [Display(Name = "å建æ¶é´")] [Column(TypeName = "datetime")] [Editable(true)] [Required(AllowEmptyStrings = false)] public DateTime agv_createtime { get; set; } /// <summary> ///æ§è¡æ¶é´ /// </summary> [Display(Name = "æ§è¡æ¶é´")] [Column(TypeName = "datetime")] [Editable(true)] public DateTime? agv_realesstime { get; set; } /// <summary> ///宿æ¶é´ /// </summary> [Display(Name = "宿æ¶é´")] [Column(TypeName = "datetime")] [Editable(true)] public DateTime? agv_finishedtime { get; set; } /// <summary> ///ä»»å¡ç±»å /// </summary> [Display(Name = "ä»»å¡ç±»å")] [MaxLength(20)] [Column(TypeName = "nvarchar(20)")] [Editable(true)] [Required(AllowEmptyStrings = false)] public string agv_tasktype { get; set; } /// <summary> ///夿³¨ /// </summary> [Display(Name = "夿³¨")] [MaxLength(100)] [Column(TypeName = "nvarchar(100)")] [Editable(true)] public string agv_remark { get; set; } /// <summary> ///ä»»å¡ç级 /// </summary> [Display(Name = "ä»»å¡ç级")] [Column(TypeName = "int")] [Editable(true)] public int? agv_grade { get; set; } /// <summary> ///å建è /// </summary> [Display(Name = "å建è ")] [MaxLength(20)] [Column(TypeName = "nvarchar(20)")] [Editable(true)] public string agv_userid { get; set; } /// <summary> ///æçç /// </summary> [Display(Name = "æçç ")] [MaxLength(30)] [Column(TypeName = "nvarchar(30)")] [Editable(true)] //[Required(AllowEmptyStrings = false)]//ä¸è½ä¸ºç©º public string agv_barcode { get; set; } /// <summary> ///ç©æç /// </summary> [Display(Name = "ç©æç ")] [MaxLength(50)] [Column(TypeName = "nvarchar(50)")] [Editable(true)] public string agv_materbarcode { get; set; } /// <summary> ///èµ·å§ç¹æ§è¡ä¸ /// </summary> [Display(Name = "èµ·å§ç¹æ§è¡ä¸")] [Column(TypeName = "datetime")] [Editable(true)] public DateTime? agv_executingBeginTime { get; set; } /// <summary> ///èµ·å§ç¹å®æ /// </summary> [Display(Name = "èµ·å§ç¹å®æ")] [Column(TypeName = "datetime")] [Editable(true)] public DateTime? agv_executingEndTime { get; set; } /// <summary> ///ç®çç¹æ§è¡ä¸ /// </summary> [Display(Name = "ç®çç¹æ§è¡ä¸")] [Column(TypeName = "datetime")] [Editable(true)] public DateTime? agv_completeBeginTime { get; set; } /// <summary> /// /// </summary> [Display(Name = "unitag")] [Column(TypeName = "uniqueidentifier")] [Editable(true)] public Guid? unitag { get; set; } /// <summary> ///车轮SNå· /// </summary> [Display(Name = "车轮SNå·")] [MaxLength(500)] [Column(TypeName = "nvarchar(500)")] public string bindSN { get; set; } } } ´úÂë¹ÜÀí/PCS/WCS_Server/WIDESEA_Entity/DomainModels/Taskinfo/dt_agvtask_hty.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,257 @@ /* *代ç ç±æ¡æ¶çæ,任使´æ¹é½å¯è½å¯¼è´è¢«ä»£ç çæå¨è¦ç *å¦ææ°æ®åºå段åçååï¼è¯·å¨ä»£ç çå¨éæ°çææ¤Model */ using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; using System.Linq; using System.Text; using System.Threading.Tasks; using WIDESEA_Entity.SystemModels; namespace WIDESEA_Entity.DomainModels { [Entity(TableCnName = "AGVåå²ä»»å¡", TableName = "dt_agvtask_hty")] public partial class dt_agvtask_hty : BaseEntity { /// <summary> ///åå²ä»»å¡ID /// </summary> [Key] [Display(Name = "åå²ä»»å¡ID")] [Column(TypeName = "uniqueidentifier")] [Editable(true)] [Required(AllowEmptyStrings = false)] public Guid hty_pkid { get; set; } /// <summary> ///ä»»å¡ID /// </summary> [Display(Name = "ä»»å¡ID")] [Column(TypeName = "uniqueidentifier")] [Editable(true)] [Required(AllowEmptyStrings = false)] public Guid agv_id { get; set; } /// <summary> ///ä»»å¡ç¼å· /// </summary> [Display(Name = "ä»»å¡ç¼å·")] [MaxLength(50)] [Column(TypeName = "nvarchar(50)")] [Editable(true)] [Required(AllowEmptyStrings = false)] public string agv_tasknum { get; set; } /// <summary> ///ç©æç±»å /// </summary> [Display(Name = "ç©æç±»å")] [MaxLength(50)] [Column(TypeName = "nvarchar(50)")] [Editable(true)] [Required(AllowEmptyStrings = false)] public string agv_materielid { get; set; } /// <summary> ///æ°é /// </summary> [Display(Name = "æ°é")] [Column(TypeName = "int")] [Editable(true)] [Required(AllowEmptyStrings = false)] public int? agv_qty { get; set; } /// <summary> ///å建æ¶é´ /// </summary> [Display(Name = "å建æ¶é´")] [Column(TypeName = "datetime")] [Editable(true)] [Required(AllowEmptyStrings = false)] public DateTime agv_createtime { get; set; } /// <summary> ///æ§è¡æ¶é´ /// </summary> [Display(Name = "æ§è¡æ¶é´")] [Column(TypeName = "datetime")] [Editable(true)] public DateTime? agv_realesstime { get; set; } /// <summary> ///宿æ¶é´ /// </summary> [Display(Name = "宿æ¶é´")] [Column(TypeName = "datetime")] [Editable(true)] public DateTime? agv_finishedtime { get; set; } /// <summary> ///ä»»å¡ç¶æ /// </summary> [Display(Name = "ä»»å¡ç¶æ")] [MaxLength(20)] [Column(TypeName = "nvarchar(20)")] [Editable(true)] [Required(AllowEmptyStrings = false)] public string agv_taskstate { get; set; } /// <summary> ///ä»»å¡ç±»å /// </summary> [Display(Name = "ä»»å¡ç±»å")] [MaxLength(20)] [Column(TypeName = "nvarchar(20)")] [Editable(true)] [Required(AllowEmptyStrings = false)] public string agv_tasktype { get; set; } /// <summary> ///èµ·ç¹å°å /// </summary> [Display(Name = "èµ·ç¹å°å")] [MaxLength(50)] [Column(TypeName = "nvarchar(50)")] [Editable(true)] public string agv_fromaddress { get; set; } /// <summary> ///ç»ç¹å°å /// </summary> [Display(Name = "ç»ç¹å°å")] [MaxLength(50)] [Column(TypeName = "nvarchar(50)")] [Editable(true)] public string agv_toaddress { get; set; } /// <summary> ///æä½ç±»å /// </summary> [Display(Name = "æä½ç±»å")] [MaxLength(10)] [Column(TypeName = "nvarchar(10)")] [Editable(true)] [Required(AllowEmptyStrings = false)] public string agv_operatetype { get; set; } /// <summary> ///æä½è /// </summary> [Display(Name = "æä½è ")] [MaxLength(20)] [Column(TypeName = "nvarchar(20)")] [Editable(true)] [Required(AllowEmptyStrings = false)] public string agv_compeletor { get; set; } /// <summary> ///æä½æ¶é´ /// </summary> [Display(Name = "æä½æ¶é´")] [Column(TypeName = "datetime")] [Editable(true)] [Required(AllowEmptyStrings = false)] public DateTime agv_completedate { get; set; } /// <summary> ///ä»»å¡ç级 /// </summary> [Display(Name = "ä»»å¡ç级")] [Column(TypeName = "int")] [Editable(true)] public int? agv_grade { get; set; } /// <summary> ///å建è /// </summary> [Display(Name = "å建è ")] [MaxLength(20)] [Column(TypeName = "nvarchar(20)")] [Editable(true)] public string agv_userid { get; set; } /// <summary> ///æçç /// </summary> [Display(Name = "æçç ")] [MaxLength(30)] [Column(TypeName = "nvarchar(30)")] [Editable(true)] [Required(AllowEmptyStrings = false)] public string agv_barcode { get; set; } /// <summary> ///AGVç¼å· /// </summary> [Display(Name = "AGVç¼å·")] [MaxLength(50)] [Column(TypeName = "nvarchar(50)")] [Editable(true)] [Required(AllowEmptyStrings = false)] public string agv_code { get; set; } /// <summary> ///AGVå·¥ä½ç±»å /// </summary> [Display(Name = "AGVå·¥ä½ç±»å")] [Column(TypeName = "int")] [Editable(true)] [Required(AllowEmptyStrings = false)] public int? agv_worktype { get; set; } /// <summary> ///ç©æç /// </summary> [Display(Name = "ç©æç ")] [MaxLength(50)] [Column(TypeName = "nvarchar(50)")] [Editable(true)] public string agv_materbarcode { get; set; } /// <summary> ///èµ·å§ç¹æ§è¡ä¸ /// </summary> [Display(Name = "èµ·å§ç¹æ§è¡ä¸")] [Column(TypeName = "datetime")] [Editable(true)] public DateTime? agv_executingBeginTime { get; set; } /// <summary> ///èµ·å§ç¹å®æ /// </summary> [Display(Name = "èµ·å§ç¹å®æ")] [Column(TypeName = "datetime")] [Editable(true)] public DateTime? agv_executingEndTime { get; set; } /// <summary> ///ç®çç¹æ§è¡ä¸ /// </summary> [Display(Name = "ç®çç¹æ§è¡ä¸")] [Column(TypeName = "datetime")] [Editable(true)] public DateTime? agv_completeBeginTime { get; set; } /// <summary> ///夿³¨ /// </summary> [Display(Name = "夿³¨")] [MaxLength(100)] [Column(TypeName = "nvarchar(100)")] [Editable(true)] public string agv_remark { get; set; } /// <summary> ///车轮SNå· /// </summary> [Display(Name = "车轮SNå·")] [MaxLength(500)] [Column(TypeName = "nvarchar(500)")] public string bindSN { get; set; } } } ´úÂë¹ÜÀí/PCS/WCS_Server/WIDESEA_Entity/DomainModels/Taskinfo/partial/dt_agvtask.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,21 @@ /* *代ç ç±æ¡æ¶çæ,任使´æ¹é½å¯è½å¯¼è´è¢«ä»£ç çæå¨è¦ç *å¦ææ°æ®åºå段åçååï¼è¯·å¨ä»£ç çå¨éæ°çææ¤Model */ using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; using System.Linq; using System.Text; using System.Threading.Tasks; using WIDESEA_Entity.SystemModels; namespace WIDESEA_Entity.DomainModels { public partial class dt_agvtask { //æ¤å¤é ç½®åæ®µ(åæ®µé ç½®è§æ¤modelçå¦ä¸ä¸ªpartial),å¦æè¡¨ä¸æ²¡ææ¤å段请å ä¸ [NotMapped]屿§ï¼å¦åä¼å¼å¸¸ } } ´úÂë¹ÜÀí/PCS/WCS_Server/WIDESEA_Entity/DomainModels/Taskinfo/partial/dt_agvtask_hty.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,21 @@ /* *代ç ç±æ¡æ¶çæ,任使´æ¹é½å¯è½å¯¼è´è¢«ä»£ç çæå¨è¦ç *å¦ææ°æ®åºå段åçååï¼è¯·å¨ä»£ç çå¨éæ°çææ¤Model */ using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; using System.Linq; using System.Text; using System.Threading.Tasks; using WIDESEA_Entity.SystemModels; namespace WIDESEA_Entity.DomainModels { public partial class dt_agvtask_hty { //æ¤å¤é ç½®åæ®µ(åæ®µé ç½®è§æ¤modelçå¦ä¸ä¸ªpartial),å¦æè¡¨ä¸æ²¡ææ¤å段请å ä¸ [NotMapped]屿§ï¼å¦åä¼å¼å¸¸ } } ´úÂë¹ÜÀí/PCS/WCS_Server/WIDESEA_Entity/DomainModels/ToMES/dt_mes_detail.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,84 @@ /* *代ç ç±æ¡æ¶çæ,任使´æ¹é½å¯è½å¯¼è´è¢«ä»£ç çæå¨è¦ç *å¦ææ°æ®åºå段åçååï¼è¯·å¨ä»£ç çå¨éæ°çææ¤Model */ using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; using System.Linq; using System.Text; using System.Threading.Tasks; using WIDESEA_Entity.SystemModels; namespace WIDESEA_Entity.DomainModels { [Entity(TableCnName = "å·¥å详ç»ä¿¡æ¯", TableName = "dt_mes_detail")] public partial class dt_mes_detail : BaseEntity { /// <summary> ///å·¥åæç»ID /// </summary> [Key] [Display(Name = "mes_detail_id")] [Column(TypeName = "uniqueidentifier")] [Required(AllowEmptyStrings = false)] public Guid mes_detail_id { get; set; } /// <summary> ///å·¥å头表ID /// </summary> [Key] [Display(Name = "mes_headID")] [Column(TypeName = "uniqueidentifier")] [Required(AllowEmptyStrings = false)] public Guid mes_headID { get; set; } /// <summary> ///å·¥ååå· /// </summary> [Display(Name = "jobID")] [MaxLength(40)] [Column(TypeName = "nvarchar(40)")] [Editable(true)] public string jobID { get; set; } /// <summary> ///çä»£å· /// </summary> [Display(Name = "ç代å·")] [MaxLength(50)] [Column(TypeName = "nvarchar(50)")] [Editable(true)] public string heatID { get; set; } /// <summary> ///é¢å¯å· /// </summary> [Display(Name = "é¢å¯å·")] [Column(TypeName = "int")] [Editable(true)] public int? billetID { get; set; } /// <summary> ///车轮SNå· /// </summary> [Display(Name = "车轮SNå·")] [MaxLength(50)] [Column(TypeName = "nvarchar(50)")] [Editable(true)] public string SN { get; set; } /// <summary> ///çå¤çæ¹æ¬¡ /// </summary> [Display(Name = "çå¤çæ¹æ¬¡")] [MaxLength(30)] [Column(TypeName = "varchar(30)")] [Editable(true)] public string heatBatchID { get; set; } } } ´úÂë¹ÜÀí/PCS/WCS_Server/WIDESEA_Entity/DomainModels/ToMES/dt_mes_head.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,181 @@ /* *代ç ç±æ¡æ¶çæ,任使´æ¹é½å¯è½å¯¼è´è¢«ä»£ç çæå¨è¦ç *å¦ææ°æ®åºå段åçååï¼è¯·å¨ä»£ç çå¨éæ°çææ¤Model */ using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; using System.Linq; using System.Text; using System.Threading.Tasks; using WIDESEA_Entity.SystemModels; namespace WIDESEA_Entity.DomainModels { [Entity(TableCnName = "å·¥åä¿¡æ¯", TableName = "dt_mes_head")] public partial class dt_mes_head : BaseEntity { /// <summary> ///ID /// </summary> [Key] [Display(Name = "mes_id")] [Column(TypeName = "uniqueidentifier")] [Required(AllowEmptyStrings = false)] public Guid mes_id { get; set; } /// <summary> ///å·¥ä½ä»¤å· /// </summary> [Display(Name = "å·¥ä½ä»¤å·")] [MaxLength(50)] [Column(TypeName = "nvarchar(50)")] [Editable(true)] public string workOrder { get; set; } /// <summary> ///å·¥åç¼å· /// </summary> [Display(Name = "å·¥åç¼å·")] [MaxLength(40)] [Column(TypeName = "nvarchar(40)")] [Editable(true)] public string jobID { get; set; } /// <summary> ///éæ±åå· /// </summary> [Display(Name = "éæ±åå·")] [MaxLength(40)] [Column(TypeName = "nvarchar(40)")] [Editable(true)] public string reqID { get; set; } /// <summary> ///éæ±åå·è¡å· /// </summary> [Display(Name = "éæ±åå·è¡å·")] [MaxLength(20)] [Column(TypeName = "nvarchar(20)")] [Editable(true)] public string reqIDLineNo { get; set; } /// <summary> ///å·¥åç±»å (17-æºå å·¥ 28-æ£æµçº¿) /// </summary> [Display(Name = "å·¥åç±»å")] [MaxLength(20)] [Column(TypeName = "nvarchar(20)")] [Editable(true)] public string processCode { get; set; } /// <summary> ///ç©æç¼ç /// </summary> [Display(Name = "ç©æç¼ç ")] [MaxLength(20)] [Column(TypeName = "nvarchar(20)")] [Editable(true)] public string materialCode { get; set; } /// <summary> ///å¾å· /// </summary> [Display(Name = "å¾å·")] [MaxLength(20)] [Column(TypeName = "nvarchar(20)")] [Editable(true)] public string drawingNo { get; set; } /// <summary> ///ææ¯ç¶æ /// </summary> [Display(Name = "ææ¯ç¶æ")] [MaxLength(10)] [Column(TypeName = "nvarchar(10)")] [Editable(true)] public string drawingNoVer { get; set; } /// <summary> ///产ååç§° /// </summary> [Display(Name = "产ååç§°")] [MaxLength(40)] [Column(TypeName = "nvarchar(40)")] [Editable(true)] public string productName { get; set; } /// <summary> ///产åæè¿° /// </summary> [Display(Name = "产åæè¿°")] [Column(TypeName = "nvarchar(200)")] [Editable(true)] [MaxLength(200)] public string productDesc { get; set; } /// <summary> ///宿æ°é /// </summary> [Display(Name = "宿æ°é")] [Column(TypeName = "int")] [Editable(true)] public int? quantity { get; set; } /// <summary> ///è½®å代ç /// </summary> [Display(Name = "è½®å代ç ")] [MaxLength(20)] [Column(TypeName = "nvarchar(20)")] [Editable(true)] public string typeID { get; set; } /// <summary> ///æå æ°é /// </summary> [Display(Name = "æå æ°é")] [Column(TypeName = "int")] [Editable(true)] public int? stackNoRange { get; set; } /// <summary> ///è½®å¾åå·® /// </summary> [Display(Name = "è½®å¾åå·®")] [Column(TypeName = "nmberic(18,2)")] [Editable(true)] public decimal? maxDiameterDiff { get; set; } /// <summary> ///å·¥åå¼å§æ¶é´ /// </summary> [Display(Name = "å·¥åå¼å§æ¶é´")] [Column(TypeName = "datetime")] public DateTime? expectedStartTime { get; set; } /// <summary> ///å·¥åç»ææ¶é´ /// </summary> [Display(Name = "å·¥åç»ææ¶é´")] [Column(TypeName = "datetime")] public DateTime? expectedFinishTime { get; set; } /// <summary> ///å建æ¶é´ /// </summary> [Display(Name = "å建æ¶é´")] [Column(TypeName = "datetime")] public DateTime CreateTime { get; set; } /// <summary> ///å建è /// </summary> [Display(Name = "å建è ")] [MaxLength(40)] [Column(TypeName = "nvarchar(40)")] public string creator { get; set; } } } ´úÂë¹ÜÀí/PCS/WCS_Server/WIDESEA_Entity/DomainModels/ToMES/partial/dt_mes_detail.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,21 @@ /* *代ç ç±æ¡æ¶çæ,任使´æ¹é½å¯è½å¯¼è´è¢«ä»£ç çæå¨è¦ç *å¦ææ°æ®åºå段åçååï¼è¯·å¨ä»£ç çå¨éæ°çææ¤Model */ using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; using System.Linq; using System.Text; using System.Threading.Tasks; using WIDESEA_Entity.SystemModels; namespace WIDESEA_Entity.DomainModels { public partial class dt_ActualProduction { //æ¤å¤é ç½®åæ®µ(åæ®µé ç½®è§æ¤modelçå¦ä¸ä¸ªpartial),å¦æè¡¨ä¸æ²¡ææ¤å段请å ä¸ [NotMapped]屿§ï¼å¦åä¼å¼å¸¸ } } ´úÂë¹ÜÀí/PCS/WCS_Server/WIDESEA_Entity/DomainModels/ToMES/partial/dt_mes_head.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,21 @@ /* *代ç ç±æ¡æ¶çæ,任使´æ¹é½å¯è½å¯¼è´è¢«ä»£ç çæå¨è¦ç *å¦ææ°æ®åºå段åçååï¼è¯·å¨ä»£ç çå¨éæ°çææ¤Model */ using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; using System.Linq; using System.Text; using System.Threading.Tasks; using WIDESEA_Entity.SystemModels; namespace WIDESEA_Entity.DomainModels { public partial class dt_mes_head { //æ¤å¤é ç½®åæ®µ(åæ®µé ç½®è§æ¤modelçå¦ä¸ä¸ªpartial),å¦æè¡¨ä¸æ²¡ææ¤å段请å ä¸ [NotMapped]屿§ï¼å¦åä¼å¼å¸¸ } } ´úÂë¹ÜÀí/PCS/WCS_Server/WIDESEA_WCS/JobsPart/Common/StationTask.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,171 @@ using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; using WIDESEA_WCS.IRepositories; using WIDESEA_WCS.Repositories; using WIDESEA_Core.EFDbContext; using WIDESEA_Core.FreeDB; using WIDESEA_Entity.DomainModels; using WIDESEA_Comm; namespace WIDESEA_WCS.JobsPart.Common { public class StationTask { FreeDB freeDB = new FreeDB(); public void CreateTask() { VOLContext context = new VOLContext(); Idt_stationinfoRepository stationinfoRepository = new dt_stationinfoRepository(context); Idt_WorkinfoRepository workinfoRepository = new dt_WorkinfoRepository(context); List<dt_stationinfo> stationinfos = stationinfoRepository.Find(x => x.stationCode.Contains('X')); foreach (var item in stationinfos) { //æ ¹æ®ä¸æå£çç»å®ä¿¡æ¯æ¥è¯¢å¯¹åºå·¥åï¼æ£æµæ¤å·¥åæ¯å¦å·²å®æ 宿å³å¯å°å ¶éå ¥åº dt_Workinfo workinfo = workinfoRepository.FindFirst(x => x.WorkNumber == item.Number); int CompeletedNum = Convert.ToInt32(workinfo.PlannedQuantity) - Convert.ToInt32(workinfo.QuantityCompletion); //å¤å®ä»»å¡æ¯å¦å·²å建//å¦å·²åå¨ if (freeDB.Select<dt_agvtask>().Where(x => x.agv_fromaddress == item.stationCode).Count() > 0) continue; if (item.quantity == 5 || CompeletedNum == 0) //循ç¯è¯»å车轮æ°ä¸º5æè 订å已宿æ°éçä¸æå£ âå·¥åäººå·¥å ³éçå·¥å { dt_stationinfo TargetLocation = GetEmptyLocation(stationinfoRepository, workinfo, item); if (TargetLocation != null) { //todo: è°ç¨WMSæ¥å£åå»ºä»»å¡ dt_agvtask agvtask = new dt_agvtask() { agv_fromaddress = item.stationCode, agv_id = Guid.NewGuid(), agv_grade = 0, agv_barcode = "", agv_createtime = DateTime.Now, agv_taskstate = TaskStatus.Created.ToString(), agv_toaddress = TargetLocation.stationCode, }; freeDB.Add(agvtask); TargetLocation.location_state = LocationStateEnum.Busy.ToString(); freeDB.Update(TargetLocation); } } } } /// <summary> /// è·å空åºä½ /// </summary> /// <param name="stationinfoRepository">åºå</param> /// <param name="workinfo">订å</param> /// <param name="stationinfo">䏿å£ä¿¡æ¯</param> /// <returns></returns> private dt_stationinfo GetEmptyLocation(Idt_stationinfoRepository stationinfoRepository, dt_Workinfo workinfo, dt_stationinfo stationinfo) { //æ¾è´§ä½ dt_stationinfo TargetLocation = null; //æ ¹æ®è®¢åæ°éæ¥å¯»æ¾å¯¹åºåºåºä¸åç©æç±»ååºä½ if (workinfo.PlannedQuantity < 50) //åºåº1 ç©æç±»åå¤ { dt_stationinfo station = stationinfoRepository.Find(x => x.stationType == stationinfo.stationType && x.area == "1").OrderByDescending(x => x.lastUpdateTime).FirstOrDefault(); if (station != null) { //å¦åå¨åç©æç±»åä¸å¨1è¡çåºååæ°å ¥åºçç©ææ¾è³åå ä¸åå¨åå¯»æ¾æ°è¡åºä½ if (station.line == 1) { TargetLocation = stationinfoRepository.Find(x => x.area == station.area && x.location_state == LocationStateEnum.Empty.ToString() && x.column == station.column && x.enable).OrderBy(x => x.line).ThenBy(x => x.column).FirstOrDefault(); } TargetLocation = stationinfoRepository.Find(x => x.area == station.area && x.location_state == LocationStateEnum.Empty.ToString() && x.line == 1 && x.enable).OrderBy(x => x.line).ThenBy(x => x.column).FirstOrDefault(); } else { TargetLocation = stationinfoRepository.Find(x => x.area == "1" && x.location_state == LocationStateEnum.Empty.ToString() && x.line == 1 && x.enable).OrderBy(x => x.line).ThenBy(x => x.column).FirstOrDefault(); } } else { //int quantity = Convert.ToInt32(workinfo.PlannedQuantity); //string area = GetArea(quantity); dt_materielinfo materielinfo = freeDB.Select<dt_materielinfo>().Where(x => x.materiel_id == stationinfo.stationType).First(); if (materielinfo == null) throw new Exception($"æ æ¤ç©æç±»å{stationinfo.stationType}åºåº"); string area = materielinfo.materiel_areaid.ToString(); //å¦åå¨åç±»åç©æåæ¾ç½®åè¡åºä½ ä¸åå¨åæ¾ç½®æ°è¡ç第ä¸åä¸ dt_stationinfo station = stationinfoRepository.Find(x => x.stationType == stationinfo.stationType && x.area == area).OrderBy(x => x.lastUpdateTime).FirstOrDefault(); if (station != null) { TargetLocation = stationinfoRepository.Find(x => x.area == station.area && x.location_state == LocationStateEnum.Empty.ToString() && x.enable && x.line == station.line).OrderBy(x => x.column).FirstOrDefault(); if (TargetLocation == null) { TargetLocation = stationinfoRepository.Find(x => x.area == area && x.location_state == LocationStateEnum.Empty.ToString() && x.enable && x.column == '1').OrderBy(x => x.line).FirstOrDefault(); } } else { TargetLocation = stationinfoRepository.Find(x => x.area == area && x.location_state == LocationStateEnum.Empty.ToString() && x.enable && x.column == '1').OrderBy(x => x.line).FirstOrDefault(); } //todo å¦ç©æå·²æ»¡åæ¾ç½®å ¶ä»åºåº //if (TargetLocation == null) //{ // stationinfoRepository.Find(x => x.area == area && x.location_state == LocationStateEnum.Empty.ToString() && x.enable && x.column == '1').OrderBy(x => x.line).FirstOrDefault(); //} } if (TargetLocation == null) { throw new Exception("åºä½å·²æ»¡"); } //else if (workinfo.PlannedQuantity >= 50 && workinfo.PlannedQuantity < 110) //åºåº2 //{ // //å¦åå¨åç±»åç©æåæ¾ç½®åè¡åºä½ ä¸åå¨åæ¾ç½®æ°è¡ç第ä¸åä¸ // dt_stationinfo station = stationinfoRepository.Find(x => x.stationType == stationinfo.stationType && x.area == "2").OrderBy(x => x.lastUpdateTime).FirstOrDefault(); // if (station != null) // { // TargetLocation = stationinfoRepository.Find(x => x.area == station.area && x.location_state == LocationStateEnum.Empty.ToString() && x.line == station.line).OrderBy(x => x.column).FirstOrDefault(); // } // else // { // TargetLocation = stationinfoRepository.Find(x => x.area == "2" && x.location_state == LocationStateEnum.Empty.ToString() && x.column == '1').OrderBy(x => x.line).FirstOrDefault(); // } //} //else if(workinfo.PlannedQuantity >= 110 && workinfo.PlannedQuantity < 180) //{ //} return TargetLocation; } /// <summary> /// æ ¹æ®è®¢åæ°éè¿ååºåº(ææ¶å¼ç¨) //æ´æ¢ä¸ºåºä½ç±»åå¹é /// </summary> /// <param name="quantity"></param> /// <returns></returns> private string GetArea(int quantity) { if (quantity >= 50 && quantity < 180) return "2"; else if (quantity >= 180 && quantity < 180) return "3"; else if (quantity >= 180 && quantity < 220) return "4"; return null; } } } ´úÂë¹ÜÀí/PCS/WCS_Server/WIDESEA_WCS/ToMES/ToMesServer.cs
@@ -1,15 +1,21 @@ using System; using Newtonsoft.Json; using System; using System.Collections.Generic; using System.Linq; using System.Runtime.InteropServices; using System.Text; using System.Threading.Tasks; using WIDESEA_Common; using WIDESEA_Core.FreeDB; using WIDESEA_Core.Utilities; using WIDESEA_Entity.DomainModels; using static FreeSql.Internal.GlobalFilter; namespace WIDESEA_WCS { public partial class ToMesServer { /// <summary> /// æ·»å å·¥åä¿¡æ¯ /// </summary> @@ -30,5 +36,75 @@ WebResponseContent content = new WebResponseContent(); return content; } /// <summary> /// MESä¸åWMSå·¥åæ¥å£ /// </summary> /// <param name="json"></param> /// <returns></returns> public static WebResponseContent AddMes_Info(object json) { WebResponseContent content = new WebResponseContent(); FreeDB freeDB = new FreeDB(); try { Mes_WorkInfo workInfo = JsonConvert.DeserializeObject<Mes_WorkInfo>(json.ToString()); if (workInfo == null) { return content.Error("å·¥åä¿¡æ¯æ°æ®ä¸ºç©º"); } var mesinfo = freeDB.Select<dt_mes_head>().Where(x => x.jobID == workInfo.jobID).First(); if (mesinfo != null) { return content.Error($"å·¥åå·{mesinfo.jobID}å·²åå¨,è¯·æ ¸å®åå¨åéï¼"); } Guid head = Guid.NewGuid(); dt_mes_head mes_Head = new dt_mes_head { mes_id = head, CreateTime = DateTime.Now, creator = "MES", drawingNo = workInfo.drawingNo, drawingNoVer = workInfo.drawingNoVer, expectedFinishTime = workInfo.expectedFinishTime, expectedStartTime = workInfo.expectedStartTime, jobID = workInfo.jobID, materialCode = workInfo.materialCode, maxDiameterDiff = workInfo.maxDiameterDiff, productDesc = workInfo.productDesc, productName = workInfo.productName, quantity = workInfo.quantity, reqID = workInfo.reqID, reqIDLineNo = workInfo.reqIDLineNo, stackNoRange = workInfo.stackNoRange, typeID = workInfo.typeID, workOrder = workInfo.workOrder }; freeDB.Add(mes_Head); foreach (var item in workInfo.details) { dt_mes_detail mes_Detail = new dt_mes_detail { mes_detail_id = Guid.NewGuid(), mes_headID = head, jobID = item.jobID, billetID = item.billetID, heatBatchID = item.heatBatchID, heatID = item.heatID, SN = item.SN }; freeDB.Add(mes_Detail); } return content.OK(); } catch (Exception ex) { return content.Error(ex.Message); } } } } ´úÂë¹ÜÀí/PCS/WCS_Server/WIDESEA_WebApi/Controllers/ToMes/ToMESController.cs
@@ -1,4 +1,5 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using WIDESEA_Core.Utilities; using WIDESEA_Entity.DomainModels; using WIDESEA_WCS; @@ -32,5 +33,16 @@ { return ToMesServer.AddActualProduction(request); } /// <summary> /// /// </summary> /// <param name="json"></param> /// <returns></returns> [HttpPost,Route("AddMes_Info"),AllowAnonymous] public WebResponseContent AddMES_info([FromBody] object json) { return ToMesServer.AddMes_Info(json); } } } ´úÂë¹ÜÀí/WMS/WMS_Server/WIDESEA_WMS/Services/system/Partial/dt_areainfoService.cs
@@ -1,11 +1,3 @@ /* *ææå ³äºdt_areainfoç±»çä¸å¡ä»£ç åºå¨æ¤å¤ç¼å *å¯ä½¿ç¨repository.è°ç¨å¸¸ç¨æ¹æ³ï¼è·åEF/Dapperçä¿¡æ¯ *妿éè¦äºå¡è¯·ä½¿ç¨repository.DbContextBeginTransaction *ä¹å¯ä½¿ç¨DBServerProvider.æå¨è·åæ°æ®åºç¸å ³ä¿¡æ¯ *ç¨æ·ä¿¡æ¯ãæéãè§è²ç使ç¨UserContext.Currentæä½ *dt_areainfoService对å¢ãå ãæ¹æ¥ãå¯¼å ¥ã导åºãå®¡æ ¸ä¸å¡ä»£ç æ©å±åç §ServiceFunFilter */ using WIDESEA_Core.BaseProvider; using WIDESEA_Core.Extensions.AutofacManager; using WIDESEA_Entity.DomainModels; ´úÂë¹ÜÀí/WMS/WMS_Server/WIDESEA_WMS/Services/system/Partial/dt_stationinfoService.cs
@@ -99,5 +99,8 @@ return base.Add(saveDataModel); } } }