diff --git a/src/Khd.Core.Domain/Models/BaseDictionary.cs b/src/Khd.Core.Domain/Models/BaseDictionary.cs new file mode 100644 index 0000000..11203a2 --- /dev/null +++ b/src/Khd.Core.Domain/Models/BaseDictionary.cs @@ -0,0 +1,116 @@ + +//----------------------------------------------------------------------- +// +// * Copyright (C) 2021 KEHAIDASOFT All Rights Reserved +// * version : 4.0.30319.42000 +// * author : khd by t4-2 +// +//----------------------------------------------------------------------- + +using System; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; + +namespace Khd.Core.Domain.Models +{ + + [Table("base_dictionary")] + public class BaseDictionary + { + + [Key] + [Column("OBJID")] + public Guid objid { get; set; } + + /// + /// 字典名 + /// + [Column("DIC_NAME")] + public string dicName { get; set; } + + /// + /// 字段名 + /// + [Column("DIC_FIELD")] + public string dicField { get; set; } + + /// + /// 对应名 + /// + [Column("DIC_KEY")] + public string dicKey { get; set; } + + /// + /// 对应值 + /// + [Column("DIC_VALUE")] + public string dicValue { get; set; } + + /// + /// 排序 + /// + [Column("DIC_SORT")] + public string dicSort { get; set; } + + /// + /// 是否允许编辑 1允许 0不允许 + /// + [Column("IS_EDIT")] + public int? isEdit { get; set; } + + /// + /// 是否可用 0:不可用 1:可用 + /// + [Column("USE_FLAG")] + public int? useFlag { get; set; } + + /// + /// 创建者 + /// + [Column("CREATE_BY")] + public string createBy { get; set; } + + /// + /// 创建时间 + /// + [Column("CREATE_TIME")] + public DateTime? createTime { get; set; } + + /// + /// 更新者 + /// + [Column("UPDATE_BY")] + public string updateBy { get; set; } + + /// + /// 更新时间 + /// + [Column("UPDATE_TIME")] + public DateTime? updateTime { get; set; } + + /// + /// 备用字段1 + /// + [Column("UD1")] + public string ud1 { get; set; } + + /// + /// 备用字段2 + /// + [Column("UD2")] + public string ud2 { get; set; } + + /// + /// 备用字段3 + /// + [Column("UD3")] + public string ud3 { get; set; } + + /// + /// 备注 + /// + [Column("REMARK")] + public string remark { get; set; } + } +} + diff --git a/src/Khd.Core.Domain/Models/WcsCmd.cs b/src/Khd.Core.Domain/Models/WcsCmd.cs new file mode 100644 index 0000000..ee079f4 --- /dev/null +++ b/src/Khd.Core.Domain/Models/WcsCmd.cs @@ -0,0 +1,140 @@ + +//----------------------------------------------------------------------- +// +// * Copyright (C) 2021 KEHAIDASOFT All Rights Reserved +// * version : 4.0.30319.42000 +// * author : khd by t4-2 +// +//----------------------------------------------------------------------- + +using System; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; + +namespace Khd.Core.Domain.Models +{ + + [Table("wcs_cmd")] + public class WcsCmd + { + + [Key] + [Column("OBJID")] + public Guid objid { get; set; } + + /// + /// 任务id + /// + [Column("TASK_ID")] + public Guid taskId { get; set; } + + /// + /// 设备id + /// + [Column("EQUIP_ID")] + public Guid equipId { get; set; } + + /// + /// 指令类型,字典表 + /// + [Column("CMD_TYPE")] + public int? cmdType { get; set; } + + /// + /// 数量 + /// + [Column("QTY")] + public int? qty { get; set; } + + /// + /// 流水号 + /// + [Column("SERIAL_NO")] + public long? serialNo { get; set; } + + /// + /// 当前点编号 + /// + [Column("CURR_POINT_NO")] + public string currPointNo { get; set; } + + /// + /// 当前点id + /// + [Column("CURR_POINT_ID")] + public Guid currPointId { get; set; } + + /// + /// 下一点编号 + /// + [Column("NEXT_POINT_NO")] + public string nextPointNo { get; set; } + + /// + /// 下一点id + /// + [Column("NEXT_POINT_ID")] + public Guid nextPointId { get; set; } + + /// + /// 指令状态,字典表 + /// + [Column("CMD_STATUS")] + public int? cmdStatus { get; set; } + + /// + /// 是否可用 0:不可用 1:可用 + /// + [Column("USE_FLAG")] + public int? useFlag { get; set; } + + /// + /// 创建者 + /// + [Column("CREATE_BY")] + public string createBy { get; set; } + + /// + /// 创建时间 + /// + [Column("CREATE_TIME")] + public DateTime? createTime { get; set; } + + /// + /// 更新者 + /// + [Column("UPDATE_BY")] + public string updateBy { get; set; } + + /// + /// 更新时间 + /// + [Column("UPDATE_TIME")] + public DateTime? updateTime { get; set; } + + /// + /// 备用字段1 + /// + [Column("UD1")] + public string ud1 { get; set; } + + /// + /// 备用字段2 + /// + [Column("UD2")] + public string ud2 { get; set; } + + /// + /// 备用字段3 + /// + [Column("UD3")] + public string ud3 { get; set; } + + /// + /// 备注 + /// + [Column("REMARK")] + public string remark { get; set; } + } +} + diff --git a/src/Khd.Core.Domain/Models/WcsCmdLog.cs b/src/Khd.Core.Domain/Models/WcsCmdLog.cs new file mode 100644 index 0000000..553e655 --- /dev/null +++ b/src/Khd.Core.Domain/Models/WcsCmdLog.cs @@ -0,0 +1,142 @@ + +//----------------------------------------------------------------------- +// +// * Copyright (C) 2021 KEHAIDASOFT All Rights Reserved +// * version : 4.0.30319.42000 +// * author : khd by t4-2 +// +//----------------------------------------------------------------------- + +using System; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; + +namespace Khd.Core.Domain.Models +{ + + [Table("wcs_cmd_log")] + public class WcsCmdLog + { + + /// + /// 主键 + /// + [Column("OBJID")] + public Guid objid { get; set; } + + /// + /// 任务id + /// + [Column("TASK_ID")] + public Guid taskId { get; set; } + + /// + /// 设备id + /// + [Column("EQUIP_ID")] + public Guid equipId { get; set; } + + /// + /// 指令类型,字典表 + /// + [Column("CMD_TYPE")] + public int? cmdType { get; set; } + + /// + /// 数量 + /// + [Column("QTY")] + public int? qty { get; set; } + + /// + /// 流水号 + /// + [Column("SERIAL_NO")] + public long? serialNo { get; set; } + + /// + /// 当前点编号 + /// + [Column("CURR_POINT_NO")] + public string currPointNo { get; set; } + + /// + /// 当前点id + /// + [Column("CURR_POINT_ID")] + public Guid currPointId { get; set; } + + /// + /// 下一点编号 + /// + [Column("NEXT_POINT_NO")] + public string nextPointNo { get; set; } + + /// + /// 下一点id + /// + [Column("NEXT_POINT_ID")] + public Guid nextPointId { get; set; } + + /// + /// 指令状态,字典表 + /// + [Column("CMD_STATUS")] + public int? cmdStatus { get; set; } + + /// + /// 是否可用 0:不可用 1:可用 + /// + [Column("USE_FLAG")] + public int? useFlag { get; set; } + + /// + /// 创建者 + /// + [Column("CREATE_BY")] + public string createBy { get; set; } + + /// + /// 创建时间 + /// + [Column("CREATE_TIME")] + public DateTime? createTime { get; set; } + + /// + /// 更新者 + /// + [Column("UPDATE_BY")] + public string updateBy { get; set; } + + /// + /// 更新时间 + /// + [Column("UPDATE_TIME")] + public DateTime? updateTime { get; set; } + + /// + /// 备用字段1 + /// + [Column("UD1")] + public string ud1 { get; set; } + + /// + /// 备用字段2 + /// + [Column("UD2")] + public string ud2 { get; set; } + + /// + /// 备用字段3 + /// + [Column("UD3")] + public string ud3 { get; set; } + + /// + /// 备注 + /// + [Column("REMARK")] + public string remark { get; set; } + } +} + diff --git a/src/Khd.Core.Domain/Models/WcsStock.cs b/src/Khd.Core.Domain/Models/WcsStock.cs new file mode 100644 index 0000000..6285e0e --- /dev/null +++ b/src/Khd.Core.Domain/Models/WcsStock.cs @@ -0,0 +1,134 @@ + +//----------------------------------------------------------------------- +// +// * Copyright (C) 2021 KEHAIDASOFT All Rights Reserved +// * version : 4.0.30319.42000 +// * author : khd by t4-2 +// +//----------------------------------------------------------------------- + +using System; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; + +namespace Khd.Core.Domain.Models +{ + + [Table("wcs_stock")] + public class WcsStock + { + + [Key] + [Column("OBJID")] + public Guid objid { get; set; } + + /// + /// 物料主键 + /// + [Column("MATERIAL_ID")] + public int? materialId { get; set; } + + /// + /// 物料编码 + /// + [Column("MATERIAL_CODE")] + public string materialCode { get; set; } + + /// + /// 物料名称 + /// + [Column("MATERIAL_NAME")] + public string materialName { get; set; } + + /// + /// 物料类型 + /// + [Column("MATERIAL_TYPE")] + public string materialType { get; set; } + + /// + /// 仓库主键 + /// + [Column("WAREHOUSE_ID")] + public Guid warehouseId { get; set; } + + /// + /// 库位编码 + /// + [Column("LOCATION_CODE")] + public string locationCode { get; set; } + + /// + /// 库位名称 + /// + [Column("LOCATION_NAME")] + public string locationName { get; set; } + + /// + /// 层 + /// + [Column("LAYER_NO")] + public int? layerNo { get; set; } + + /// + /// 列 + /// + [Column("COL_NO")] + public int? colNo { get; set; } + + /// + /// 排 + /// + [Column("ROW_NO")] + public int? rowNo { get; set; } + + /// + /// 深位 + /// + [Column("DEEP_NO")] + public int? deepNo { get; set; } + + /// + /// 楼层编号 + /// + [Column("FLOOR_NO")] + public int? floorNo { get; set; } + + /// + /// 是否可用 0:不可用 1:可用 + /// + [Column("USE_FLAG")] + public int? useFlag { get; set; } + + /// + /// 创建者 + /// + [Column("CREATE_BY")] + public string createBy { get; set; } + + /// + /// 创建时间 + /// + [Column("CREATE_TIME")] + public DateTime? createTime { get; set; } + + /// + /// 更新者 + /// + [Column("UPDATE_BY")] + public string updateBy { get; set; } + + /// + /// 更新时间 + /// + [Column("UPDATE_TIME")] + public DateTime? updateTime { get; set; } + + /// + /// 备注 + /// + [Column("REMARK")] + public string remark { get; set; } + } +} + diff --git a/src/Khd.Core.EntityFramework/DefaultDbContext.cs b/src/Khd.Core.EntityFramework/DefaultDbContext.cs index 4a703db..483eb85 100644 --- a/src/Khd.Core.EntityFramework/DefaultDbContext.cs +++ b/src/Khd.Core.EntityFramework/DefaultDbContext.cs @@ -8,224 +8,89 @@ namespace Khd.Core.EntityFramework public DefaultDbContext(DbContextOptions options) : base(options) { } - //public DbSet BaseAlertinfo { get; set; } + public DbSet BaseDictionary { get; set; } - //public DbSet BaseAmima { get; set; } + public DbSet BaseEquip { get; set; } - //public DbSet BaseArea { get; set; } - //public DbSet BaseAsaveerro { get; set; } + public DbSet BasePlcpoint { get; set; } - //public DbSet BaseAsaveerroBak { get; set; } - //public DbSet BaseAsaveplcnumber { get; set; } + public DbSet MesBasePalletInfo { get; set; } - //public DbSet BaseAsaveplcnumberBak { get; set; } - //public DbSet BaseBomcomponent { get; set; } + public DbSet WcsCmd { get; set; } - //public DbSet BaseCar { get; set; } + public DbSet WcsCmdLog { get; set; } - //public DbSet BaseCararea { get; set; } + public DbSet WcsStock { get; set; } - //public DbSet BaseCarareaRejects { get; set; } - - - //public DbSet BaseCarareaoverdue { get; set; } - - - //public DbSet BaseCargocage { get; set; } - - - //public DbSet BaseCarmateriel { get; set; } - - - //public DbSet BaseCarmateriellog { get; set; } - - - //public DbSet BaseCarmaterielup { get; set; } - - - //public DbSet BaseCarmaterielupdown { get; set; } - - - //public DbSet BaseCarorder { get; set; } - - - //public DbSet BaseCarorderlist { get; set; } - - - //public DbSet BaseCarordernum { get; set; } - - - //public DbSet BaseCarordernumnew { get; set; } - - - //public DbSet BaseCarpreline { get; set; } - - - //public DbSet BaseCarproduct { get; set; } - - - //public DbSet BaseCarrier { get; set; } - - - //public DbSet BaseCarthrough { get; set; } - - - //public DbSet BaseDowncarorderback { get; set; } - - - //public DbSet BaseDownline { get; set; } - - - //public DbSet BaseEquipment { get; set; } - - - //public DbSet BaseFactory { get; set; } - - - //public DbSet BaseFaultlog { get; set; } - - - //public DbSet BaseFaulttime { get; set; } - - - //public DbSet BaseFlag { get; set; } - - - //public DbSet BaseLinearea { get; set; } - - - //public DbSet BaseLineinfo { get; set; } - - - //public DbSet BaseLoginlog { get; set; } - - - //public DbSet BaseMaterialinfo { get; set; } - - - //public DbSet BaseMaterialinfobom { get; set; } - - - //public DbSet BaseOrderinfo { get; set; } - - - //public DbSet BaseOrderlog { get; set; } - - - //public DbSet BasePlcpoint { get; set; } - - - //public DbSet BasePlcpointsite { get; set; } - - - //public DbSet BasePlctype { get; set; } - - - //public DbSet BasePrelinedetail { get; set; } - - - //public DbSet BasePrelineinfo { get; set; } - - - //public DbSet BaseProductionOrderSplit { get; set; } - //public DbSet BaseProductionOrderSplitBak { get; set; } - - //public DbSet BaseProductionOrderSplitTextinsert { get; set; } - - - //public DbSet BaseProductionOrderSplitLine { get; set; } - - - //public DbSet BaseProductionOrderSplitReduct { get; set; } - - - //public DbSet BaseRejects { get; set; } - - - //public DbSet BaseSitearea { get; set; } - - - //public DbSet BaseSitenode { get; set; } - - - //public DbSet BaseSitenum { get; set; } - - - //public DbSet BaseStandbytime { get; set; } - - - //public DbSet BaseStorage { get; set; } - - - //public DbSet BaseSystemconfig { get; set; } - - - //public DbSet BaseTasktstatus { get; set; } - - - //public DbSet BaseTasktype { get; set; } - - - //public DbSet BaseUpdownnum { get; set; } - - - //public DbSet BaseUpdownnumnew { get; set; } - - - //public DbSet BaseWaitdownline { get; set; } - - - //public DbSet BasedataPowerclasslog { get; set; } - - - //public DbSet BasedataUplinescancarlist { get; set; } - - - //public DbSet BusinessCarrierCargocage { get; set; } - - - //public DbSet BusinessCommand { get; set; } - - - //public DbSet BusinessOperationlog { get; set; } - - - //public DbSet BusinessSitehistory { get; set; } - - - //public DbSet BusinessTask { get; set; } - - - //public DbSet DataCargocageMaterialdetail { get; set; } - - - //public DbSet DataCargocageProduct { get; set; } - - - //public DbSet Discretealarms { get; set; } - - - //public DbSet NewMaterial { get; set; } - - //public DbSet BaseFollowmessage { get; set; } - - //public DbSet MesProdPlan { get; set; } - public DbSet WmsRawInstock { get; set; } - public DbSet BasePlcpoint { get; set;} public DbSet WcsTask { get; set; } - + + + public DbSet WcsTaskLog { get; set; } + + + + public DbSet WcsWarehouseOrder { get; set; } + + + public DbSet WcsWarehouseOrderDetaile { get; set; } + + + public DbSet WmsBaseLocation { get; set; } + + + public DbSet WmsBaseWarehouse { get; set; } + + + public DbSet WmsProductInstock { get; set; } + + + public DbSet WmsProductInstockDetail { get; set; } + + + public DbSet WmsProductOutstock { get; set; } + + + public DbSet WmsProductOutstockDetail { get; set; } + + + public DbSet WmsProductStock { get; set; } + + + public DbSet WmsProductStockSaleorder { get; set; } + + + public DbSet WmsRawInstock { get; set; } + + + public DbSet WmsRawInstockDetail { get; set; } + + + public DbSet WmsRawOutstock { get; set; } + + + public DbSet WmsRawOutstockDetail { get; set; } + + + public DbSet WmsRawStock { get; set; } + + + public DbSet WmsRawStockOccupy { get; set; } + + + public DbSet WmsWarehouseMaterial { get; set; } + } } \ No newline at end of file