From 162b556259d1e35da685c5a9a1812631b738b35e Mon Sep 17 00:00:00 2001 From: "LAPTOP-NLSJV9RB\\91647" <916477576@qq.com> Date: Tue, 26 Mar 2024 14:57:55 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Khd.Core.Domain/Models/WcsCmd.cs | 14 +- src/Khd.Core.Domain/Models/WcsCmdLog.cs | 12 ++ src/Khd.Core.Domain/Models/WcsOutstockLock.cs | 122 ++++++++++++++++++ src/Khd.Core.Domain/Models/WcsTask.cs | 18 ++- src/Khd.Core.Domain/Models/WcsTaskLog.cs | 22 +++- .../Models/WcsWarehouseOrder.cs | 34 ++--- .../Models/WmsProductOutstock.cs | 10 +- src/Khd.Core.Domain/Models/WmsRawOutstock.cs | 10 +- 8 files changed, 211 insertions(+), 31 deletions(-) create mode 100644 src/Khd.Core.Domain/Models/WcsOutstockLock.cs diff --git a/src/Khd.Core.Domain/Models/WcsCmd.cs b/src/Khd.Core.Domain/Models/WcsCmd.cs index 13956af..799614a 100644 --- a/src/Khd.Core.Domain/Models/WcsCmd.cs +++ b/src/Khd.Core.Domain/Models/WcsCmd.cs @@ -29,11 +29,17 @@ namespace Khd.Core.Domain.Models public long? taskId { get; set; } /// - /// 设备id + /// 设备编号 /// [Column("equipment_no")] public string equipmentNo { get; set; } + /// + /// 容器号 + /// + [Column("container_no")] + public string containerNo { get; set; } + /// /// 指令类型,字典表 /// @@ -135,6 +141,12 @@ namespace Khd.Core.Domain.Models /// [Column("remark")] public string remark { get; set; } + + /// + /// 下发标志 0未下发 1 已下发 + /// + [Column("send_flag")] + public int? sendFlag { get; set; } } } diff --git a/src/Khd.Core.Domain/Models/WcsCmdLog.cs b/src/Khd.Core.Domain/Models/WcsCmdLog.cs index fe26356..1993cde 100644 --- a/src/Khd.Core.Domain/Models/WcsCmdLog.cs +++ b/src/Khd.Core.Domain/Models/WcsCmdLog.cs @@ -36,6 +36,12 @@ namespace Khd.Core.Domain.Models [Column("equip_id")] public long? equipId { get; set; } + /// + /// 容器号 + /// + [Column("container_no")] + public string containerNo { get; set; } + /// /// 指令类型,字典表 /// @@ -137,6 +143,12 @@ namespace Khd.Core.Domain.Models /// [Column("remark")] public string remark { get; set; } + + /// + /// 下发标志 0未下发 1 已下发 + /// + [Column("send_flag")] + public int? sendFlag { get; set; } } } diff --git a/src/Khd.Core.Domain/Models/WcsOutstockLock.cs b/src/Khd.Core.Domain/Models/WcsOutstockLock.cs new file mode 100644 index 0000000..db98344 --- /dev/null +++ b/src/Khd.Core.Domain/Models/WcsOutstockLock.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_outstock_lock")] + public class WcsOutstockLock + { + + [Key] + [Column("objid")] + public long objid { get; set; } + + /// + /// wms申请单id + /// + [Column("wms_order_id")] + public long? wmsOrderId { get; set; } + + /// + /// wms申请单子表id + /// + [Column("wms_order_detail_id")] + public long? wmsOrderDetailId { get; set; } + + /// + /// 单据类型(1 入库 2 出库 3 移库) + /// + [Column("order_type")] + public int? orderType { get; set; } + + /// + /// 物料id + /// + [Column("material_id")] + public long? materialId { get; set; } + + /// + /// 仓库id + /// + [Column("warehouse_id")] + public long? warehouseId { get; set; } + + /// + /// 所属楼层 + /// + [Column("floor_num")] + public int? floorNum { get; set; } + + /// + /// 数量 + /// + [Column("qty")] + public decimal? qty { 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/WcsTask.cs b/src/Khd.Core.Domain/Models/WcsTask.cs index a724bad..339a60a 100644 --- a/src/Khd.Core.Domain/Models/WcsTask.cs +++ b/src/Khd.Core.Domain/Models/WcsTask.cs @@ -22,11 +22,23 @@ namespace Khd.Core.Domain.Models [Column("objid")] public long objid { get; set; } + /// + /// wcs_warehouse_order 主键id + /// + [Column("master_id")] + public long? masterId { get; set; } + + /// + /// wms出入库记录表id + /// + [Column("order_id")] + public long? orderId { get; set; } + /// /// 流水号 /// [Column("serial_no")] - public long serialNo { get; set; } + public long? serialNo { get; set; } /// /// 设备编号 @@ -37,8 +49,8 @@ namespace Khd.Core.Domain.Models /// /// 容器号(托盘或者箱号) /// - [Column("customer_no")] - public string customerNo { get; set; } + [Column("container_no")] + public string containerNo { get; set; } /// /// 任务类型,字典表 diff --git a/src/Khd.Core.Domain/Models/WcsTaskLog.cs b/src/Khd.Core.Domain/Models/WcsTaskLog.cs index 4d49a37..b4eb8fd 100644 --- a/src/Khd.Core.Domain/Models/WcsTaskLog.cs +++ b/src/Khd.Core.Domain/Models/WcsTaskLog.cs @@ -20,19 +20,31 @@ namespace Khd.Core.Domain.Models [Key] [Column("objid")] - public Guid objid { get; set; } + public long objid { get; set; } /// /// 任务ID /// [Column("taskid")] - public Guid taskid { get; set; } + public long? taskid { get; set; } + + /// + /// wcs_warehouse_order 主键id + /// + [Column("master_id")] + public long? masterId { get; set; } + + /// + /// wms出入库记录表id + /// + [Column("order_id")] + public long? orderId { get; set; } /// /// 流水号 /// [Column("serial_no")] - public long serialNo { get; set; } + public long? serialNo { get; set; } /// /// 设备编号 @@ -43,8 +55,8 @@ namespace Khd.Core.Domain.Models /// /// 容器号(托盘或者箱号) /// - [Column("customer_no")] - public string customerNo { get; set; } + [Column("container_no")] + public string containerNo { get; set; } /// /// 任务类型,字典表 diff --git a/src/Khd.Core.Domain/Models/WcsWarehouseOrder.cs b/src/Khd.Core.Domain/Models/WcsWarehouseOrder.cs index efd7d6f..dd37aff 100644 --- a/src/Khd.Core.Domain/Models/WcsWarehouseOrder.cs +++ b/src/Khd.Core.Domain/Models/WcsWarehouseOrder.cs @@ -19,91 +19,91 @@ namespace Khd.Core.Domain.Models { [Key] - [Column("OBJID")] - public Guid objid { get; set; } + [Column("objid")] + public long objid { get; set; } /// /// wms申请单id /// - [Column("WMS_ORDER_ID")] - public string wmsOrderId { get; set; } + [Column("wms_order_id")] + public long? wmsOrderId { get; set; } /// /// 单据类型(1 入库 2 出库 3 移库) /// - [Column("ORDER_TYPE")] + [Column("order_type")] public int? orderType { get; set; } /// /// 所属楼层 /// - [Column("FLOOR_NUM")] + [Column("floor_num")] public int? floorNum { get; set; } /// /// 数量 /// - [Column("QTY")] + [Column("qty")] public int? qty { get; set; } /// /// 单据状态(0 创建订单 1 订单执行中 2 订单完成) /// - [Column("ORDER_STATUS")] + [Column("order_status")] public int? orderStatus { get; set; } /// /// 起始点编号 /// - [Column("ORDER_TIME")] + [Column("order_time")] public string orderTime { 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; } /// diff --git a/src/Khd.Core.Domain/Models/WmsProductOutstock.cs b/src/Khd.Core.Domain/Models/WmsProductOutstock.cs index 7cbc98d..26fb0a7 100644 --- a/src/Khd.Core.Domain/Models/WmsProductOutstock.cs +++ b/src/Khd.Core.Domain/Models/WmsProductOutstock.cs @@ -87,10 +87,16 @@ namespace Khd.Core.Domain.Models /// [Column("product_id")] public long? productId { get; set; } - /// - /// 申请数量 + /// 出库目的地 /// + [Column("end_station_code")] + public long? endStationCode { get; set; } + + + /// + /// 申请数量 + /// [Column("apply_qty")] public decimal? applyQty { get; set; } diff --git a/src/Khd.Core.Domain/Models/WmsRawOutstock.cs b/src/Khd.Core.Domain/Models/WmsRawOutstock.cs index 6a11145..aff2ea4 100644 --- a/src/Khd.Core.Domain/Models/WmsRawOutstock.cs +++ b/src/Khd.Core.Domain/Models/WmsRawOutstock.cs @@ -33,10 +33,14 @@ namespace Khd.Core.Domain.Models /// [Column("warehouse_id")] public long? warehouseId { get; set; } - - /// - /// 库位编码 /// + [Column("end_station_code")] + public long? endStationCode { get; set; } + + + /// + /// 库位编码 + /// [Column("location_code")] public string locationCode { get; set; }