diff --git a/src/Khd.Core.Domain/Models/WcsCmd.cs b/src/Khd.Core.Domain/Models/WcsCmd.cs index 7574bbe..13956af 100644 --- a/src/Khd.Core.Domain/Models/WcsCmd.cs +++ b/src/Khd.Core.Domain/Models/WcsCmd.cs @@ -31,8 +31,8 @@ namespace Khd.Core.Domain.Models /// /// 设备id /// - [Column("equip_id")] - public long? equipId { get; set; } + [Column("equipment_no")] + public string equipmentNo { get; set; } /// /// 指令类型,字典表 diff --git a/src/Khd.Core.Domain/Models/WcsTask.cs b/src/Khd.Core.Domain/Models/WcsTask.cs index f437d68..6bd6706 100644 --- a/src/Khd.Core.Domain/Models/WcsTask.cs +++ b/src/Khd.Core.Domain/Models/WcsTask.cs @@ -20,7 +20,7 @@ namespace Khd.Core.Domain.Models [Key] [Column("objid")] - public Guid objid { get; set; } + public long objid { get; set; } /// /// 流水号 diff --git a/src/Khd.Core.Wcs/Global/StaticData.cs b/src/Khd.Core.Wcs/Global/StaticData.cs index 94377ea..6268c80 100644 --- a/src/Khd.Core.Wcs/Global/StaticData.cs +++ b/src/Khd.Core.Wcs/Global/StaticData.cs @@ -36,11 +36,17 @@ namespace Khd.Core.Wcs.Global /// public static List BasePlcpointList = new List(); public static List WcsTask = new List(); + public static List WcsTaskLog = new List(); public static List WmsBaseWarehouse = new List(); public static List WmsWarehouseMaterial = new List(); public static List MesBasePalletInfo = new List(); public static List BaseDictionary = new List(); public static List BaseEquip = new List(); + public static List WcsCmd = new List(); + public static List WcsCmdLog = new List(); + public static List WcsStock = new List(); + public static List WcsInWareOrder = new List(); + public static List WcsOutWareOrder = new List(); } }