diff --git a/src/Khd.Core.Domain/Models/BaseDictionary.cs b/src/Khd.Core.Domain/Models/BaseDictionary.cs index 11203a2..9802fd1 100644 --- a/src/Khd.Core.Domain/Models/BaseDictionary.cs +++ b/src/Khd.Core.Domain/Models/BaseDictionary.cs @@ -19,97 +19,97 @@ namespace Khd.Core.Domain.Models { [Key] - [Column("OBJID")] - public Guid objid { get; set; } + [Column("objid")] + public long objid { get; set; } /// /// 字典名 /// - [Column("DIC_NAME")] + [Column("dic_name")] public string dicName { get; set; } /// /// 字段名 /// - [Column("DIC_FIELD")] + [Column("dic_field")] public string dicField { get; set; } /// /// 对应名 /// - [Column("DIC_KEY")] + [Column("dic_key")] public string dicKey { get; set; } /// /// 对应值 /// - [Column("DIC_VALUE")] + [Column("dic_value")] public string dicValue { get; set; } /// /// 排序 /// - [Column("DIC_SORT")] + [Column("dic_sort")] public string dicSort { get; set; } /// /// 是否允许编辑 1允许 0不允许 /// - [Column("IS_EDIT")] + [Column("is_edit")] public int? isEdit { get; set; } /// /// 是否可用 0:不可用 1:可用 /// - [Column("USE_FLAG")] + [Column("use_flag")] public int? useFlag { get; set; } /// /// 创建者 /// - [Column("CREATE_BY")] + [Column("create_by")] public string createBy { get; set; } /// /// 创建时间 /// - [Column("CREATE_TIME")] + [Column("create_time")] public DateTime? createTime { get; set; } /// /// 更新者 /// - [Column("UPDATE_BY")] + [Column("update_by")] public string updateBy { get; set; } /// /// 更新时间 /// - [Column("UPDATE_TIME")] + [Column("update_time")] public DateTime? updateTime { get; set; } /// /// 备用字段1 /// - [Column("UD1")] + [Column("ud1")] public string ud1 { get; set; } /// /// 备用字段2 /// - [Column("UD2")] + [Column("ud2")] public string ud2 { get; set; } /// /// 备用字段3 /// - [Column("UD3")] + [Column("ud3")] public string ud3 { get; set; } /// /// 备注 /// - [Column("REMARK")] + [Column("remark")] public string remark { get; set; } } } diff --git a/src/Khd.Core.Domain/Models/BaseEquip.cs b/src/Khd.Core.Domain/Models/BaseEquip.cs index 99ce264..e7a8291 100644 --- a/src/Khd.Core.Domain/Models/BaseEquip.cs +++ b/src/Khd.Core.Domain/Models/BaseEquip.cs @@ -20,13 +20,13 @@ namespace Khd.Core.Domain.Models [Key] [Column("objid")] - public Guid objid { get; set; } + public long objid { get; set; } /// - /// 所属库区 + /// 所属仓库 /// - [Column("warehouse_area_id")] - public Guid warehouseAreaId { get; set; } + [Column("warehouse_id")] + public long? warehouseId { get; set; } /// /// 设备编号 @@ -41,7 +41,7 @@ namespace Khd.Core.Domain.Models public string equipName { get; set; } /// - /// 设备类型 1AGV 2积放链 3提升机 + /// 设备类型 1输送线 2 提升机 3 分拣输送线 /// [Column("equip_type")] public int? equipType { get; set; } diff --git a/src/Khd.Core.Domain/Models/BasePlcpoint.cs b/src/Khd.Core.Domain/Models/BasePlcpoint.cs index ce53bc8..b164a0e 100644 --- a/src/Khd.Core.Domain/Models/BasePlcpoint.cs +++ b/src/Khd.Core.Domain/Models/BasePlcpoint.cs @@ -11,105 +11,105 @@ using System; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; -namespace Khd.Core.Domain.Models +namespace Khd.Core.Domain.Models { - - [Table("base_plcpoint")] + + [Table("base_plcpoint")] public class BasePlcpoint { - + [Key] - [Column("id")] - public Guid id { get; set; } - + [Column("id")] + public long id { get; set; } + /// /// plc点位编码 /// - [Column("plcpoint_no")] + [Column("plcpoint_no")] public string plcpointNo { get; set; } - + /// /// plc点位编名称 /// - [Column("plcpoint_name")] + [Column("plcpoint_name")] public string plcpointName { get; set; } - + /// /// 点位长度 /// - [Column("plcpoint_length")] + [Column("plcpoint_length")] public int? plcpointLength { get; set; } - + /// /// 点位地址 /// - [Column("plcpoint_address")] + [Column("plcpoint_address")] public string plcpointAddress { get; set; } - + /// /// 设备id /// - [Column("equipment_id")] - public Guid equipmentId { get; set; } - + [Column("equipment_id")] + public long? equipmentId { get; set; } + /// /// 设备编码 /// - [Column("equipment_no")] + [Column("equipment_no")] public string equipmentNo { get; set; } - + /// /// 设备名称 /// - [Column("equipment_name")] + [Column("equipment_name")] public string equipmentName { get; set; } - + /// /// plc点位数据类型 /// - [Column("plcpoint_type")] + [Column("plcpoint_type")] public int? plcpointType { get; set; } - + /// /// 站点id /// - [Column("sitenode_id")] + [Column("sitenode_id")] public Guid sitenodeId { get; set; } - + /// /// 所属楼层 /// - [Column("floor_no")] + [Column("floor_no")] public int? floorNo { get; set; } - - [Column("is_delete")] + + [Column("is_delete")] public int? isDelete { get; set; } - - [Column("create_time")] + + [Column("create_time")] public DateTime? createTime { get; set; } - - [Column("create_id")] + + [Column("create_id")] public Guid createId { get; set; } - - [Column("create_by")] + + [Column("create_by")] public string createBy { get; set; } - - [Column("modify_time")] + + [Column("modify_time")] public DateTime? modifyTime { get; set; } - - [Column("modify_id")] + + [Column("modify_id")] public Guid modifyId { get; set; } - - [Column("modify_by")] + + [Column("modify_by")] public string modifyBy { get; set; } - - [Column("definefield3")] + + [Column("definefield3")] public string definefield3 { get; set; } - - [Column("definefield1")] + + [Column("definefield1")] public string definefield1 { get; set; } - - [Column("definefield2")] + + [Column("definefield2")] public string definefield2 { get; set; } } } diff --git a/src/Khd.Core.Domain/Models/WcsCmd.cs b/src/Khd.Core.Domain/Models/WcsCmd.cs index ee079f4..7574bbe 100644 --- a/src/Khd.Core.Domain/Models/WcsCmd.cs +++ b/src/Khd.Core.Domain/Models/WcsCmd.cs @@ -19,121 +19,121 @@ namespace Khd.Core.Domain.Models { [Key] - [Column("OBJID")] - public Guid objid { get; set; } + [Column("objid")] + public long objid { get; set; } /// /// 任务id /// - [Column("TASK_ID")] - public Guid taskId { get; set; } + [Column("task_id")] + public long? taskId { get; set; } /// /// 设备id /// - [Column("EQUIP_ID")] - public Guid equipId { get; set; } + [Column("equip_id")] + public long? equipId { get; set; } /// /// 指令类型,字典表 /// - [Column("CMD_TYPE")] + [Column("cmd_type")] public int? cmdType { get; set; } /// /// 数量 /// - [Column("QTY")] + [Column("qty")] public int? qty { get; set; } /// /// 流水号 /// - [Column("SERIAL_NO")] + [Column("serial_no")] public long? serialNo { get; set; } /// /// 当前点编号 /// - [Column("CURR_POINT_NO")] + [Column("curr_point_no")] public string currPointNo { get; set; } /// /// 当前点id /// - [Column("CURR_POINT_ID")] - public Guid currPointId { get; set; } + [Column("curr_point_id")] + public long? currPointId { get; set; } /// /// 下一点编号 /// - [Column("NEXT_POINT_NO")] + [Column("next_point_no")] public string nextPointNo { get; set; } /// /// 下一点id /// - [Column("NEXT_POINT_ID")] - public Guid nextPointId { get; set; } + [Column("next_point_id")] + public long? nextPointId { get; set; } /// /// 指令状态,字典表 /// - [Column("CMD_STATUS")] + [Column("cmd_status")] public int? cmdStatus { get; set; } /// /// 是否可用 0:不可用 1:可用 /// - [Column("USE_FLAG")] + [Column("use_flag")] public int? useFlag { get; set; } /// /// 创建者 /// - [Column("CREATE_BY")] + [Column("create_by")] public string createBy { get; set; } /// /// 创建时间 /// - [Column("CREATE_TIME")] + [Column("create_time")] public DateTime? createTime { get; set; } /// /// 更新者 /// - [Column("UPDATE_BY")] + [Column("update_by")] public string updateBy { get; set; } /// /// 更新时间 /// - [Column("UPDATE_TIME")] + [Column("update_time")] public DateTime? updateTime { get; set; } /// /// 备用字段1 /// - [Column("UD1")] + [Column("ud1")] public string ud1 { get; set; } /// /// 备用字段2 /// - [Column("UD2")] + [Column("ud2")] public string ud2 { get; set; } /// /// 备用字段3 /// - [Column("UD3")] + [Column("ud3")] public string ud3 { get; set; } /// /// 备注 /// - [Column("REMARK")] + [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 index 553e655..fe26356 100644 --- a/src/Khd.Core.Domain/Models/WcsCmdLog.cs +++ b/src/Khd.Core.Domain/Models/WcsCmdLog.cs @@ -21,121 +21,121 @@ namespace Khd.Core.Domain.Models /// /// 主键 /// - [Column("OBJID")] - public Guid objid { get; set; } + [Column("objid")] + public long objid { get; set; } /// /// 任务id /// - [Column("TASK_ID")] - public Guid taskId { get; set; } + [Column("task_id")] + public long? taskId { get; set; } /// /// 设备id /// - [Column("EQUIP_ID")] - public Guid equipId { get; set; } + [Column("equip_id")] + public long? equipId { get; set; } /// /// 指令类型,字典表 /// - [Column("CMD_TYPE")] + [Column("cmd_type")] public int? cmdType { get; set; } /// /// 数量 /// - [Column("QTY")] + [Column("qty")] public int? qty { get; set; } /// /// 流水号 /// - [Column("SERIAL_NO")] + [Column("serial_no")] public long? serialNo { get; set; } /// /// 当前点编号 /// - [Column("CURR_POINT_NO")] + [Column("curr_point_no")] public string currPointNo { get; set; } /// /// 当前点id /// - [Column("CURR_POINT_ID")] - public Guid currPointId { get; set; } + [Column("curr_point_id")] + public long? currPointId { get; set; } /// /// 下一点编号 /// - [Column("NEXT_POINT_NO")] + [Column("next_point_no")] public string nextPointNo { get; set; } /// /// 下一点id /// - [Column("NEXT_POINT_ID")] - public Guid nextPointId { get; set; } + [Column("next_point_id")] + public long? nextPointId { get; set; } /// /// 指令状态,字典表 /// - [Column("CMD_STATUS")] + [Column("cmd_status")] public int? cmdStatus { get; set; } /// /// 是否可用 0:不可用 1:可用 /// - [Column("USE_FLAG")] + [Column("use_flag")] public int? useFlag { get; set; } /// /// 创建者 /// - [Column("CREATE_BY")] + [Column("create_by")] public string createBy { get; set; } /// /// 创建时间 /// - [Column("CREATE_TIME")] + [Column("create_time")] public DateTime? createTime { get; set; } /// /// 更新者 /// - [Column("UPDATE_BY")] + [Column("update_by")] public string updateBy { get; set; } /// /// 更新时间 /// - [Column("UPDATE_TIME")] + [Column("update_time")] public DateTime? updateTime { get; set; } /// /// 备用字段1 /// - [Column("UD1")] + [Column("ud1")] public string ud1 { get; set; } /// /// 备用字段2 /// - [Column("UD2")] + [Column("ud2")] public string ud2 { get; set; } /// /// 备用字段3 /// - [Column("UD3")] + [Column("ud3")] public string ud3 { get; set; } /// /// 备注 /// - [Column("REMARK")] + [Column("remark")] public string remark { get; set; } } } diff --git a/src/Khd.Core.Domain/Models/WcsInWareOrder.cs b/src/Khd.Core.Domain/Models/WcsInWareOrder.cs new file mode 100644 index 0000000..cee62ea --- /dev/null +++ b/src/Khd.Core.Domain/Models/WcsInWareOrder.cs @@ -0,0 +1,122 @@ + +//----------------------------------------------------------------------- +// +// * 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_in_ware_order")] + public class WcsInWareOrder + { + + [Key] + [Column("objid")] + public long objid { get; set; } + + /// + /// 任务id + /// + [Column("taskid")] + public long? taskid { get; set; } + + /// + /// 物料id + /// + [Column("material_id")] + public long? materialId { get; set; } + + /// + /// 物料编码 + /// + [Column("material_code")] + public string materialCode { get; set; } + + /// + /// 物料类型 + /// + [Column("material_type")] + public string materialType { get; set; } + + /// + /// 所属楼层 + /// + [Column("floor_no")] + public int? floorNo { get; set; } + + /// + /// 数量 + /// + [Column("qty")] + public int? qty { get; set; } + + /// + /// 库位编码 + /// + [Column("location_code")] + public string locationCode { 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/WcsOutWareOrder.cs b/src/Khd.Core.Domain/Models/WcsOutWareOrder.cs new file mode 100644 index 0000000..9f324c9 --- /dev/null +++ b/src/Khd.Core.Domain/Models/WcsOutWareOrder.cs @@ -0,0 +1,122 @@ + +//----------------------------------------------------------------------- +// +// * 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_out_ware_order")] + public class WcsOutWareOrder + { + + [Key] + [Column("objid")] + public long objid { get; set; } + + /// + /// 任务id + /// + [Column("taskid")] + public long? taskid { get; set; } + + /// + /// 物料id + /// + [Column("material_id")] + public long? materialId { get; set; } + + /// + /// 物料编码 + /// + [Column("material_code")] + public string materialCode { get; set; } + + /// + /// 物料类型 + /// + [Column("material_type")] + public string materialType { get; set; } + + /// + /// 所属楼层 + /// + [Column("floor_no")] + public int? floorNo { get; set; } + + /// + /// 数量 + /// + [Column("qty")] + public int? qty { get; set; } + + /// + /// 库位编码 + /// + [Column("location_code")] + public string locationCode { 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 index 6285e0e..475753f 100644 --- a/src/Khd.Core.Domain/Models/WcsStock.cs +++ b/src/Khd.Core.Domain/Models/WcsStock.cs @@ -19,115 +19,115 @@ namespace Khd.Core.Domain.Models { [Key] - [Column("OBJID")] - public Guid objid { get; set; } + [Column("objid")] + public long objid { get; set; } /// /// 物料主键 /// - [Column("MATERIAL_ID")] - public int? materialId { get; set; } + [Column("material_id")] + public long? materialId { get; set; } /// /// 物料编码 /// - [Column("MATERIAL_CODE")] + [Column("material_code")] public string materialCode { get; set; } /// /// 物料名称 /// - [Column("MATERIAL_NAME")] + [Column("material_name")] public string materialName { get; set; } /// /// 物料类型 /// - [Column("MATERIAL_TYPE")] + [Column("material_type")] public string materialType { get; set; } /// /// 仓库主键 /// - [Column("WAREHOUSE_ID")] - public Guid warehouseId { get; set; } + [Column("warehouse_id")] + public long? warehouseId { get; set; } /// /// 库位编码 /// - [Column("LOCATION_CODE")] + [Column("location_code")] public string locationCode { get; set; } /// /// 库位名称 /// - [Column("LOCATION_NAME")] + [Column("location_name")] public string locationName { get; set; } /// /// 层 /// - [Column("LAYER_NO")] + [Column("layer_no")] public int? layerNo { get; set; } /// /// 列 /// - [Column("COL_NO")] + [Column("col_no")] public int? colNo { get; set; } /// /// 排 /// - [Column("ROW_NO")] + [Column("row_no")] public int? rowNo { get; set; } /// /// 深位 /// - [Column("DEEP_NO")] + [Column("deep_no")] public int? deepNo { get; set; } /// /// 楼层编号 /// - [Column("FLOOR_NO")] + [Column("floor_no")] public int? floorNo { get; set; } /// /// 是否可用 0:不可用 1:可用 /// - [Column("USE_FLAG")] + [Column("use_flag")] public int? useFlag { get; set; } /// /// 创建者 /// - [Column("CREATE_BY")] + [Column("create_by")] public string createBy { get; set; } /// /// 创建时间 /// - [Column("CREATE_TIME")] + [Column("create_time")] public DateTime? createTime { get; set; } /// /// 更新者 /// - [Column("UPDATE_BY")] + [Column("update_by")] public string updateBy { get; set; } /// /// 更新时间 /// - [Column("UPDATE_TIME")] + [Column("update_time")] public DateTime? updateTime { get; set; } /// /// 备注 /// - [Column("REMARK")] + [Column("remark")] public string remark { get; set; } } }