任务添加zoneid

添加物料打印
添加物料工序
添加库存出库
修改状态返回接口
wcs请求添加 重量和入口
This commit is contained in:
zhougf committed 2025-07-09 01:11:10 +08:00
1 parent 42c26b2800
commit b12ed2d5e5
54 files changed
+1442 -393

No files matched your search

+5 -42
View File
@@ -23,8 +23,12 @@ public class Location : BasePoco
[Display(Name = "Location.Type", Description = "库位类型")]
public LocationTypeEnum Type { get; set; }
[Display(Name = "Location.Status", Description = "库位状态")]
[Display(Name = "Location.Status", Description = "是否锁定")]
public LocationStatusEnum Status { get; set; }
[Display(Name = "Location.ContainerStatus", Description = "库位状态")]
[StringLength(50, ErrorMessage = "Validate.{0}stringmax{1}")]
public string ContainerStatus { get; set; }
[Display(Name = "Location.RoadWay", Description = "巷道")]
[Required(ErrorMessage = "Validate.{0}required")]
@@ -68,45 +72,4 @@ public class Location : BasePoco
public string ContiguousCode { get; set; }
public Guid? Version { get; set; }
}
public enum LocationTypeEnum : short
{
/// <summary>
/// 成品库位
/// </summary>
[Display(Name = "LocationTypeEnum.L")]
C = 0,
/// <summary>
/// 模具库位
/// </summary>
[Display(Name = "LocationTypeEnum.M")]
M = 1,
/// <summary>
/// 线边库位
/// </summary>
[Display(Name = "LocationTypeEnum.X")]
X = 2
}
public enum LocationStatusEnum : short
{
[Display(Name = "LocationStatusEnum.Empty")]
Empty = 0,
[Display(Name = "LocationStatusEnum.EmptyContainer")]
EmptyContainer = 1,
[Display(Name = "LocationStatusEnum.Some")]
Some = 2,
[Display(Name = "LocationStatusEnum.Full")]
Full = 3,
[Display(Name = "LocationStatusEnum.Locked")]
Locked = 4,
}
public enum RowFlagEnum : short
{
[Display(Name = "RowFlagEnum.Outer")]
Outer = 0,
[Display(Name = "RowFlagEnum.Inner")]
Inner = 1,
}
@@ -0,0 +1,37 @@
using System;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using WalkingTec.Mvvm.Core;
namespace HHWMS.Web.Models
{
[Table("MaterialProcess")]
public class MaterialProcess : BasePoco
{
[Key]
[DatabaseGenerated(DatabaseGeneratedOption.Identity)]
public new int ID { get; set; }
[Display(Name = "MaterialProcess.MaterialCode", Description = "物料编码")]
[StringLength(50, ErrorMessage = "Validate.{0}stringmax{1}")]
public string MaterialCode { get; set; }
[Display(Name = "MaterialProcess.ProcessOrder", Description = "工序顺序")]
public int ProcessOrder { get; set; }
[Display(Name = "MaterialProcess.ProcessName", Description = "工序名称")]
[StringLength(100, ErrorMessage = "Validate.{0}stringmax{1}")]
public string ProcessName { get; set; }
[Display(Name = "MaterialProcess.ProcessCode", Description = "工序编码")]
[StringLength(50, ErrorMessage = "Validate.{0}stringmax{1}")]
public string ProcessCode { get; set; }
[Display(Name = "MaterialProcess.Description", Description = "工序描述")]
[StringLength(500, ErrorMessage = "Validate.{0}stringmax{1}")]
public string Description { get; set; }
[Display(Name = "MaterialProcess.IsActive", Description = "是否启用")]
public bool IsActive { get; set; } = true;
}
}
+77 -23
View File
@@ -38,28 +38,10 @@ namespace HHWMS.Web.Models
出库 = 2,
/// <summary>
/// 盘料入库
/// 移库任务
/// </summary>
[Display(Name = "TaskType.PIn")]
盘料入库 = 3,
/// <summary>
/// 盘料出库
/// </summary>
[Display(Name = "TaskType.POut")]
盘料出库 = 4,
/// <summary>
/// 散料入库
/// </summary>
[Display(Name = "TaskType.SIn")]
散料盒入库 = 5,
/// <summary>
/// 散料出库
/// </summary>
[Display(Name = "TaskType.SOut")]
散料盒出库 = 6
[Display(Name = "TaskType.Move")]
移库 = 3,
}
/// <summary>
@@ -269,9 +251,9 @@ namespace HHWMS.Web.Models
}
/// <summary>
/// 拣货口
/// 线边库拣货口
/// </summary>
public static class PickingLocation
public static class PickingLocationXB
{
/// <summary>
/// 拣货口1
@@ -308,4 +290,76 @@ namespace HHWMS.Web.Models
/// </summary>
public const string Picking_7 = "EnterExit_P2013";
}
/// <summary>
/// 成品库拣货口
/// </summary>
public static class PickingLocationCP
{
/// <summary>
/// 拣货口1
/// </summary>
public const string Picking_1 = "EnterExit_P1001";
/// <summary>
/// 拣货口2
/// </summary>
public const string Picking_2 = "EnterExit_P1004";
/// <summary>
/// 拣货口3
/// </summary>
public const string Picking_3 = "EnterExit_P1007";
/// <summary>
/// 拣货口4
/// </summary>
public const string Picking_4 = "EnterExit_P1008";
/// <summary>
/// 拣货口5
/// </summary>
public const string Picking_5 = "EnterExit_P1009";
/// <summary>
/// 拣货口6
/// </summary>
public const string Picking_6 = "EnterExit_P1010";
}
#region location
public enum LocationTypeEnum : short
{
/// <summary>
/// 成品库位
/// </summary>
[Display(Name = "LocationTypeEnum.L")]
C = 0,
/// <summary>
/// 模具库位
/// </summary>
[Display(Name = "LocationTypeEnum.M")]
M = 1,
/// <summary>
/// 线边库位
/// </summary>
[Display(Name = "LocationTypeEnum.X")]
X = 2
}
public enum LocationStatusEnum : short
{
[Display(Name = "LocationStatusEnum.Idle")]
未锁 = 0,
[Display(Name = "LocationStatusEnum.Locked")]
锁定 = 1,
}
public enum RowFlagEnum : short
{
[Display(Name = "RowFlagEnum.Outer")]
Outer = 0,
[Display(Name = "RowFlagEnum.Inner")]
Inner = 1,
}
#endregion
}
@@ -12,6 +12,8 @@ namespace HHWMS.Web
public decimal? Length { get; set; }
public decimal? Width { get; set; }
public decimal? Height { get; set; }
public int Weight { get; set; }
public string InPort { get; set; }
public LocationTypeEnum LocationType { get; set; }
}
}
+3 -2
View File
@@ -18,8 +18,9 @@ namespace HHWMS.Web.Models
public new int ID { get; set; }
[Display(Name = "Task.ZoneCode", Description = "库区")]
[StringLength(50, ErrorMessage = "Validate.{0}stringmax{1}")]
public string ZoneCode { get; set; }
public int ZoneId { get; set; }
public LocationZone Zone { get; set; }
[Display(Name = "Task.TaskNo", Description = "任务号")]
[StringLength(50, ErrorMessage = "Validate.{0}stringmax{1}")]
+3 -2
View File
@@ -17,8 +17,9 @@ namespace HHWMS.Web.Models
public new int ID { get; set; }
[Display(Name = "Task.ZoneCode", Description = "库区")]
[StringLength(50, ErrorMessage = "Validate.{0}stringmax{1}")]
public string ZoneCode { get; set; }
public int ZoneId { get; set; }
public LocationZone Zone { get; set; }
[Display(Name = "Task.TaskNo", Description = "任务号")]
[StringLength(50, ErrorMessage = "Validate.{0}stringmax{1}")]