fix:永丰售后修复BUG,
1,物料库存获取不到ERP:重新调整触发查询逻辑 2,工序变更导致物料无法出库:配置旧工序 3,测试出库订单ERP推送,任务下发
This commit is contained in:
1 parent
b2a9a38f38
commit
c76e7bb681
69 files changed
+5510
-157
No files matched your search
@@ -0,0 +1,51 @@
|
||||
using System;
|
||||
|
||||
namespace HHWMS.Web.Models.Agv
|
||||
{
|
||||
/// <summary>
|
||||
/// AGV 平库任务配置项(对应 appsettings.json 顶层 AgvOption 节点)
|
||||
/// 参考《平库AGV方案流程(AGV自调度版).md》10.5
|
||||
/// </summary>
|
||||
public class AgvOption
|
||||
{
|
||||
/// <summary>
|
||||
/// 模块总开关:false 时接单/回调接口统一拒绝并提示(灰度/紧急停用,不影响立库)
|
||||
/// </summary>
|
||||
public bool Enabled { get; set; } = true;
|
||||
|
||||
/// <summary>
|
||||
/// Mock 模式:不联网、直接返回约定成功报文,开发/联调用(无 AGV 可用)
|
||||
/// </summary>
|
||||
public bool MockEnabled { get; set; } = true;
|
||||
|
||||
/// <summary>
|
||||
/// 对外调用超时(秒),默认 15s
|
||||
/// </summary>
|
||||
public int CallTimeoutSeconds { get; set; } = 15;
|
||||
|
||||
/// <summary>
|
||||
/// 锁持有告警阈值(分钟):超时任务页面标红,由人工决定取消/继续等待
|
||||
/// </summary>
|
||||
public int LockTimeoutMinutes { get; set; } = 60;
|
||||
|
||||
/// <summary>
|
||||
/// 超时监控阈值(分钟):超时监控 Job 周期扫描的判定线
|
||||
/// </summary>
|
||||
public int TimeoutMonitorMinutes { get; set; } = 30;
|
||||
|
||||
/// <summary>
|
||||
/// 对账 Job 开关(默认关闭;开启后周期扫描已下发/执行中超时任务并查询 AGV 状态)
|
||||
/// </summary>
|
||||
public bool ReconcileEnabled { get; set; } = false;
|
||||
|
||||
/// <summary>
|
||||
/// 对账周期(分钟)
|
||||
/// </summary>
|
||||
public int ReconcileMinutes { get; set; } = 10;
|
||||
|
||||
/// <summary>
|
||||
/// AGV 联动写库存的系统账号(必须是真实存在的 FrameworkUser.ITCode,见方案 8.3)
|
||||
/// </summary>
|
||||
public string SysUser { get; set; } = "system";
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,123 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.ComponentModel.DataAnnotations;
|
||||
using System.ComponentModel.DataAnnotations.Schema;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using WalkingTec.Mvvm.Core;
|
||||
|
||||
namespace HHWMS.Web.Models.Agv
|
||||
{
|
||||
/// <summary>
|
||||
/// AGV 平库任务(独立表,与立库 TaskHeader 完全隔离)
|
||||
/// 对应《平库AGV方案流程(AGV自调度版).md》5.1 / 10.2 DDL
|
||||
/// </summary>
|
||||
[Index(nameof(TaskNo), IsUnique = true)]
|
||||
[Index(nameof(AgvStatus))]
|
||||
[Table("AgvTask")]
|
||||
public class AgvTask : BasePoco
|
||||
{
|
||||
[Key]
|
||||
[DatabaseGenerated(DatabaseGeneratedOption.Identity)]
|
||||
public new int ID { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// WMS 任务号(= 上游 sourceCode 或自生成 AGV+日期+序号),全局唯一
|
||||
/// </summary>
|
||||
[Display(Name = "AGV.TaskNo", Description = "WMS任务号")]
|
||||
[StringLength(50, ErrorMessage = "Validate.{0}stringmax{1}")]
|
||||
[Required(ErrorMessage = "Validate.{0}required")]
|
||||
public string TaskNo { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 上游任务号(与 SourceSystem 组合做幂等去重)
|
||||
/// </summary>
|
||||
[Display(Name = "AGV.SourceCode", Description = "上游任务号")]
|
||||
[StringLength(50, ErrorMessage = "Validate.{0}stringmax{1}")]
|
||||
public string SourceCode { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 上游来源系统标识(如 MES、WMS_CP)
|
||||
/// </summary>
|
||||
[Display(Name = "AGV.SourceSystem", Description = "上游来源系统标识")]
|
||||
[StringLength(20, ErrorMessage = "Validate.{0}stringmax{1}")]
|
||||
public string SourceSystem { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// AGV 业务类型(AgvTaskTypeEnum 1~6),由任务场景配置映射
|
||||
/// </summary>
|
||||
[Display(Name = "AGV.AgvTaskType", Description = "AGV业务类型")]
|
||||
public AgvTaskTypeEnum? AgvTaskType { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 起点库位编码(AGV 点位,强制校验)
|
||||
/// </summary>
|
||||
[Display(Name = "AGV.FromLocation", Description = "起点库位编码")]
|
||||
[StringLength(64, ErrorMessage = "Validate.{0}stringmax{1}")]
|
||||
public string FromLocation { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 终点库位编码(AGV 点位,强制校验)
|
||||
/// </summary>
|
||||
[Display(Name = "AGV.ToLocation", Description = "终点库位编码")]
|
||||
[StringLength(64, ErrorMessage = "Validate.{0}stringmax{1}")]
|
||||
public string ToLocation { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 起点楼层(取自 LocationZone.Floor,可空;仅记录/展示,不做强校验)
|
||||
/// </summary>
|
||||
[Display(Name = "AGV.FromFloor", Description = "起点楼层")]
|
||||
public int? FromFloor { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 终点楼层(同上)
|
||||
/// </summary>
|
||||
[Display(Name = "AGV.ToFloor", Description = "终点楼层")]
|
||||
public int? ToFloor { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 容器号(接单/页面非强制,不给则自动生成 LS 临时容器)
|
||||
/// </summary>
|
||||
[Display(Name = "AGV.ContainerCode", Description = "容器号")]
|
||||
[StringLength(50, ErrorMessage = "Validate.{0}stringmax{1}")]
|
||||
public string ContainerCode { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 优先级(数值越大越优先,默认 0)
|
||||
/// </summary>
|
||||
[Display(Name = "AGV.Priority", Description = "优先级")]
|
||||
public int? Priority { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// AGV 任务状态(AgvTaskStatusEnum,状态机单调推进)
|
||||
/// </summary>
|
||||
[Display(Name = "AGV.AgvStatus", Description = "AGV任务状态")]
|
||||
public AgvTaskStatusEnum? AgvStatus { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// AGV 小车编号(回调回传,仅展示/排查用)
|
||||
/// </summary>
|
||||
[Display(Name = "AGV.AgvCarNo", Description = "AGV小车编号")]
|
||||
[StringLength(20, ErrorMessage = "Validate.{0}stringmax{1}")]
|
||||
public string AgvCarNo { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 失败/异常/取消原因与完成联动失败原因
|
||||
/// </summary>
|
||||
[Display(Name = "AGV.ErrorMsg", Description = "错误信息")]
|
||||
[StringLength(255, ErrorMessage = "Validate.{0}stringmax{1}")]
|
||||
public string ErrorMsg { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 流水类型(AgvBillTypeEnum:In_AGV/Out_AGV/Move_AGV)
|
||||
/// </summary>
|
||||
[Display(Name = "AGV.BillType", Description = "流水类型")]
|
||||
[StringLength(20, ErrorMessage = "Validate.{0}stringmax{1}")]
|
||||
public string BillType { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 物料明细(JSON,SKU,非强制;缺明细则按空容器业务处理)
|
||||
/// </summary>
|
||||
[Display(Name = "AGV.Details", Description = "物料明细(JSON)")]
|
||||
public string Details { get; set; }
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,82 @@
|
||||
using System;
|
||||
using System.ComponentModel.DataAnnotations;
|
||||
using System.ComponentModel.DataAnnotations.Schema;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using WalkingTec.Mvvm.Core;
|
||||
|
||||
namespace HHWMS.Web.Models.Agv
|
||||
{
|
||||
/// <summary>
|
||||
/// AGV 任务归档镜像(超 1 个月终态任务备份于此,再由 AgvTaskArchiveJob 清理主表)
|
||||
/// 对应《平库AGV方案流程(AGV自调度版).md》10.2 DDL 第 5 段
|
||||
/// </summary>
|
||||
[Index(nameof(TaskNo))]
|
||||
[Index(nameof(CreateTime))]
|
||||
[Table("AgvTaskHistory")]
|
||||
public class AgvTaskHistory : BasePoco
|
||||
{
|
||||
[Key]
|
||||
[DatabaseGenerated(DatabaseGeneratedOption.Identity)]
|
||||
public new int ID { get; set; }
|
||||
|
||||
[Display(Name = "AGV.TaskNo", Description = "WMS任务号")]
|
||||
[StringLength(50, ErrorMessage = "Validate.{0}stringmax{1}")]
|
||||
public string TaskNo { get; set; }
|
||||
|
||||
[Display(Name = "AGV.SourceCode", Description = "上游任务号")]
|
||||
[StringLength(50, ErrorMessage = "Validate.{0}stringmax{1}")]
|
||||
public string SourceCode { get; set; }
|
||||
|
||||
[Display(Name = "AGV.SourceSystem", Description = "上游来源系统标识")]
|
||||
[StringLength(20, ErrorMessage = "Validate.{0}stringmax{1}")]
|
||||
public string SourceSystem { get; set; }
|
||||
|
||||
[Display(Name = "AGV.AgvTaskType", Description = "AGV业务类型")]
|
||||
public AgvTaskTypeEnum? AgvTaskType { get; set; }
|
||||
|
||||
[Display(Name = "AGV.FromLocation", Description = "起点库位编码")]
|
||||
[StringLength(64, ErrorMessage = "Validate.{0}stringmax{1}")]
|
||||
public string FromLocation { get; set; }
|
||||
|
||||
[Display(Name = "AGV.ToLocation", Description = "终点库位编码")]
|
||||
[StringLength(64, ErrorMessage = "Validate.{0}stringmax{1}")]
|
||||
public string ToLocation { get; set; }
|
||||
|
||||
[Display(Name = "AGV.FromFloor", Description = "起点楼层")]
|
||||
public int? FromFloor { get; set; }
|
||||
|
||||
[Display(Name = "AGV.ToFloor", Description = "终点楼层")]
|
||||
public int? ToFloor { get; set; }
|
||||
|
||||
[Display(Name = "AGV.ContainerCode", Description = "容器号")]
|
||||
[StringLength(50, ErrorMessage = "Validate.{0}stringmax{1}")]
|
||||
public string ContainerCode { get; set; }
|
||||
|
||||
[Display(Name = "AGV.Priority", Description = "优先级")]
|
||||
public int? Priority { get; set; }
|
||||
|
||||
[Display(Name = "AGV.AgvStatus", Description = "归档前任务状态")]
|
||||
public AgvTaskStatusEnum? AgvStatus { get; set; }
|
||||
|
||||
[Display(Name = "AGV.AgvCarNo", Description = "AGV小车编号")]
|
||||
[StringLength(20, ErrorMessage = "Validate.{0}stringmax{1}")]
|
||||
public string AgvCarNo { get; set; }
|
||||
|
||||
[Display(Name = "AGV.ErrorMsg", Description = "错误信息")]
|
||||
[StringLength(255, ErrorMessage = "Validate.{0}stringmax{1}")]
|
||||
public string ErrorMsg { get; set; }
|
||||
|
||||
[Display(Name = "AGV.BillType", Description = "流水类型")]
|
||||
[StringLength(20, ErrorMessage = "Validate.{0}stringmax{1}")]
|
||||
public string BillType { get; set; }
|
||||
|
||||
[Display(Name = "AGV.Details", Description = "物料明细(JSON)")]
|
||||
public string Details { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 归档时间
|
||||
/// </summary>
|
||||
[Display(Name = "AGV.ArchivedAt", Description = "归档时间")]
|
||||
public DateTime? ArchivedAt { get; set; }
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,109 @@
|
||||
using System;
|
||||
using System.ComponentModel.DataAnnotations;
|
||||
using System.ComponentModel.DataAnnotations.Schema;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using WalkingTec.Mvvm.Core;
|
||||
|
||||
namespace HHWMS.Web.Models.Agv
|
||||
{
|
||||
/// <summary>
|
||||
/// AGV 任务状态与报文日志(每次状态变更/关键动作写一条)
|
||||
/// 对应《平库AGV方案流程(AGV自调度版).md》9.6 / 10.2 DDL 第 4 段
|
||||
/// </summary>
|
||||
[Index(nameof(TaskNo), nameof(CreateTime))]
|
||||
[Index(nameof(OrderId))]
|
||||
[Table("AgvTaskLog")]
|
||||
public class AgvTaskLog : BasePoco
|
||||
{
|
||||
// 必须声明 public new int ID,否则 EF 会用 BasePoco 的 Guid 主键
|
||||
[Key]
|
||||
[DatabaseGenerated(DatabaseGeneratedOption.Identity)]
|
||||
public new int ID { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// WMS 任务号
|
||||
/// </summary>
|
||||
[Display(Name = "AGV.TaskNo", Description = "WMS任务号")]
|
||||
[StringLength(50, ErrorMessage = "Validate.{0}stringmax{1}")]
|
||||
[Required(ErrorMessage = "Validate.{0}required")]
|
||||
public string TaskNo { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// AGV 返回运单号(与 TaskNo 一致,原值留痕)
|
||||
/// </summary>
|
||||
[Display(Name = "AGV.OrderId", Description = "AGV运单号")]
|
||||
[StringLength(50, ErrorMessage = "Validate.{0}stringmax{1}")]
|
||||
public string OrderId { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 变更前状态
|
||||
/// </summary>
|
||||
[Display(Name = "AGV.FromStatus", Description = "变更前状态")]
|
||||
public AgvTaskStatusEnum? FromStatus { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 变更后状态
|
||||
/// </summary>
|
||||
[Display(Name = "AGV.ToStatus", Description = "变更后状态")]
|
||||
public AgvTaskStatusEnum? ToStatus { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 回调事件(如 Loaded/Unloaded/Exception/Canceled)
|
||||
/// </summary>
|
||||
[Display(Name = "AGV.Event", Description = "回调事件")]
|
||||
[StringLength(30, ErrorMessage = "Validate.{0}stringmax{1}")]
|
||||
public string Event { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 方向:down=下发,up=回调
|
||||
/// </summary>
|
||||
[Display(Name = "AGV.Direction", Description = "方向(down/up)")]
|
||||
[StringLength(10, ErrorMessage = "Validate.{0}stringmax{1}")]
|
||||
public string Direction { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 事件发生时间
|
||||
/// </summary>
|
||||
[Display(Name = "AGV.EventTime", Description = "事件发生时间")]
|
||||
public DateTime? EventTime { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 来源 IP
|
||||
/// </summary>
|
||||
[Display(Name = "AGV.SourceIp", Description = "来源IP")]
|
||||
[StringLength(50, ErrorMessage = "Validate.{0}stringmax{1}")]
|
||||
public string SourceIp { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 耗时(毫秒)
|
||||
/// </summary>
|
||||
[Display(Name = "AGV.DurationMs", Description = "耗时(毫秒)")]
|
||||
public int? DurationMs { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 请求报文
|
||||
/// </summary>
|
||||
[Display(Name = "AGV.RequestJson", Description = "请求报文")]
|
||||
public string RequestJson { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 响应报文
|
||||
/// </summary>
|
||||
[Display(Name = "AGV.ResponseJson", Description = "响应报文")]
|
||||
public string ResponseJson { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 操作人(AGV 回调记 AGV)
|
||||
/// </summary>
|
||||
[Display(Name = "AGV.Operator", Description = "操作人")]
|
||||
[StringLength(50, ErrorMessage = "Validate.{0}stringmax{1}")]
|
||||
public string Operator { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 备注/异常信息
|
||||
/// </summary>
|
||||
[Display(Name = "AGV.Remark", Description = "备注")]
|
||||
[StringLength(500, ErrorMessage = "Validate.{0}stringmax{1}")]
|
||||
public string Remark { get; set; }
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,73 @@
|
||||
using System;
|
||||
using System.ComponentModel.DataAnnotations;
|
||||
using System.ComponentModel.DataAnnotations.Schema;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using WalkingTec.Mvvm.Core;
|
||||
|
||||
namespace HHWMS.Web.Models.Agv
|
||||
{
|
||||
/// <summary>
|
||||
/// AGV 任务日志归档镜像(超 6 个月日志备份于此,再由 AgvTaskArchiveJob 清理主表)
|
||||
/// 对应《平库AGV方案流程(AGV自调度版).md》10.2 DDL 第 6 段
|
||||
/// </summary>
|
||||
[Index(nameof(TaskNo), nameof(CreateTime))]
|
||||
[Table("AgvTaskLogHistory")]
|
||||
public class AgvTaskLogHistory : BasePoco
|
||||
{
|
||||
[Key]
|
||||
[DatabaseGenerated(DatabaseGeneratedOption.Identity)]
|
||||
public new int ID { get; set; }
|
||||
|
||||
[Display(Name = "AGV.TaskNo", Description = "WMS任务号")]
|
||||
[StringLength(50, ErrorMessage = "Validate.{0}stringmax{1}")]
|
||||
public string TaskNo { get; set; }
|
||||
|
||||
[Display(Name = "AGV.OrderId", Description = "AGV运单号")]
|
||||
[StringLength(50, ErrorMessage = "Validate.{0}stringmax{1}")]
|
||||
public string OrderId { get; set; }
|
||||
|
||||
[Display(Name = "AGV.FromStatus", Description = "变更前状态")]
|
||||
public AgvTaskStatusEnum? FromStatus { get; set; }
|
||||
|
||||
[Display(Name = "AGV.ToStatus", Description = "变更后状态")]
|
||||
public AgvTaskStatusEnum? ToStatus { get; set; }
|
||||
|
||||
[Display(Name = "AGV.Event", Description = "回调事件")]
|
||||
[StringLength(30, ErrorMessage = "Validate.{0}stringmax{1}")]
|
||||
public string Event { get; set; }
|
||||
|
||||
[Display(Name = "AGV.Direction", Description = "方向(down/up)")]
|
||||
[StringLength(10, ErrorMessage = "Validate.{0}stringmax{1}")]
|
||||
public string Direction { get; set; }
|
||||
|
||||
[Display(Name = "AGV.EventTime", Description = "事件发生时间")]
|
||||
public DateTime? EventTime { get; set; }
|
||||
|
||||
[Display(Name = "AGV.SourceIp", Description = "来源IP")]
|
||||
[StringLength(50, ErrorMessage = "Validate.{0}stringmax{1}")]
|
||||
public string SourceIp { get; set; }
|
||||
|
||||
[Display(Name = "AGV.DurationMs", Description = "耗时(毫秒)")]
|
||||
public int? DurationMs { get; set; }
|
||||
|
||||
[Display(Name = "AGV.RequestJson", Description = "请求报文")]
|
||||
public string RequestJson { get; set; }
|
||||
|
||||
[Display(Name = "AGV.ResponseJson", Description = "响应报文")]
|
||||
public string ResponseJson { get; set; }
|
||||
|
||||
[Display(Name = "AGV.Operator", Description = "操作人")]
|
||||
[StringLength(50, ErrorMessage = "Validate.{0}stringmax{1}")]
|
||||
public string Operator { get; set; }
|
||||
|
||||
[Display(Name = "AGV.Remark", Description = "备注")]
|
||||
[StringLength(500, ErrorMessage = "Validate.{0}stringmax{1}")]
|
||||
public string Remark { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 归档时间
|
||||
/// </summary>
|
||||
[Display(Name = "AGV.ArchivedAt", Description = "归档时间")]
|
||||
public DateTime? ArchivedAt { get; set; }
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,71 @@
|
||||
using System;
|
||||
using System.ComponentModel.DataAnnotations;
|
||||
using System.ComponentModel.DataAnnotations.Schema;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using WalkingTec.Mvvm.Core;
|
||||
|
||||
namespace HHWMS.Web.Models.Agv
|
||||
{
|
||||
/// <summary>
|
||||
/// AGV 任务场景配置:映射"客户(甲方/MES)字符串任务类型 -> AGV 场景"
|
||||
/// 对应《平库AGV方案流程(AGV自调度版).md》5.6 / 10.2 DDL 第 3 段
|
||||
/// </summary>
|
||||
[Index(nameof(SourceTaskType), IsUnique = true)]
|
||||
[Table("AgvTaskSceneConfig")]
|
||||
public class AgvTaskSceneConfig : BasePoco
|
||||
{
|
||||
[Key]
|
||||
[DatabaseGenerated(DatabaseGeneratedOption.Identity)]
|
||||
public new int ID { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 上游字符串任务类型(映射主键,如 RAW_IN)
|
||||
/// </summary>
|
||||
[Display(Name = "AGV.SourceTaskType", Description = "上游任务类型(映射主键)")]
|
||||
[StringLength(50, ErrorMessage = "Validate.{0}stringmax{1}")]
|
||||
[Required(ErrorMessage = "Validate.{0}required")]
|
||||
public string SourceTaskType { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 内部业务类型(AgvTaskTypeEnum 1~6,必填)
|
||||
/// </summary>
|
||||
[Display(Name = "AGV.AgvTaskType", Description = "内部业务类型")]
|
||||
public AgvTaskTypeEnum AgvTaskType { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// AGV 场景 ID(不写死,现场调整只改配置)
|
||||
/// </summary>
|
||||
[Display(Name = "AGV.SceneId", Description = "AGV场景ID")]
|
||||
[StringLength(64, ErrorMessage = "Validate.{0}stringmax{1}")]
|
||||
[Required(ErrorMessage = "Validate.{0}required")]
|
||||
public string SceneId { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// AGV 场景名称
|
||||
/// </summary>
|
||||
[Display(Name = "AGV.SceneName", Description = "AGV场景名称")]
|
||||
[StringLength(64, ErrorMessage = "Validate.{0}stringmax{1}")]
|
||||
public string SceneName { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 取货动作名(默认 Load)
|
||||
/// </summary>
|
||||
[Display(Name = "AGV.BinTaskLoad", Description = "取货动作名")]
|
||||
[StringLength(32, ErrorMessage = "Validate.{0}stringmax{1}")]
|
||||
public string BinTaskLoad { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 放货动作名(默认 Unload)
|
||||
/// </summary>
|
||||
[Display(Name = "AGV.BinTaskUnload", Description = "放货动作名")]
|
||||
[StringLength(32, ErrorMessage = "Validate.{0}stringmax{1}")]
|
||||
public string BinTaskUnload { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 备注
|
||||
/// </summary>
|
||||
[Display(Name = "AGV.Remark", Description = "备注")]
|
||||
[StringLength(255, ErrorMessage = "Validate.{0}stringmax{1}")]
|
||||
public string Remark { get; set; }
|
||||
}
|
||||
}
|
||||
@@ -8,6 +8,12 @@ namespace HHWMS.Web.Models;
|
||||
[Table("Location")]
|
||||
public class Location : BasePoco
|
||||
{
|
||||
public Location()
|
||||
{
|
||||
// 默认空仓位,库位初始化时不给状态时兜底
|
||||
ContainerStatus = LocationStatus.空仓位;
|
||||
}
|
||||
|
||||
[Key]
|
||||
[DatabaseGenerated(DatabaseGeneratedOption.Identity)]
|
||||
public new int ID { get; set; }
|
||||
|
||||
@@ -19,5 +19,11 @@ namespace HHWMS.Web.Models
|
||||
[Display(Name = "Location.ZoneName", Description = "名称")]
|
||||
[StringLength(50, ErrorMessage = "Validate.{0}stringmax{1}")]
|
||||
public string Name { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 库区所在楼层(可选;AGV 任务 FromFloor/ToFloor 的取值来源,WMS 不做强校验)
|
||||
/// </summary>
|
||||
[Display(Name = "Location.Floor", Description = "库区楼层")]
|
||||
public int? Floor { get; set; }
|
||||
}
|
||||
}
|
||||
@@ -345,7 +345,13 @@ namespace HHWMS.Web.Models
|
||||
/// 线边库位
|
||||
/// </summary>
|
||||
[Display(Name = "LocationTypeEnum.X")]
|
||||
X = 2
|
||||
X = 2,
|
||||
|
||||
/// <summary>
|
||||
/// 平库AGV点位(缓存区/工位/提升机入口)
|
||||
/// </summary>
|
||||
[Display(Name = "LocationTypeEnum.P")]
|
||||
P = 3
|
||||
}
|
||||
public enum LocationStatusEnum : short
|
||||
{
|
||||
@@ -362,4 +368,224 @@ namespace HHWMS.Web.Models
|
||||
Inner = 1,
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region AGV 平库任务
|
||||
|
||||
/// <summary>
|
||||
/// AGV 业务类型(对应《平库AGV方案流程》5.4)
|
||||
/// </summary>
|
||||
public enum AgvTaskTypeEnum : short
|
||||
{
|
||||
/// <summary>
|
||||
/// 原材料入库(1F月台 → 货架区)
|
||||
/// </summary>
|
||||
[Display(Name = "AgvTaskTypeEnum.1")]
|
||||
原材料入库 = 1,
|
||||
|
||||
/// <summary>
|
||||
/// 原料空托需求(空托区/货架区 → 月台缓存区)
|
||||
/// </summary>
|
||||
[Display(Name = "AgvTaskTypeEnum.2")]
|
||||
原料空托需求 = 2,
|
||||
|
||||
/// <summary>
|
||||
/// 原料满托出库(货架区 → 混料上料点,同楼层点到点)
|
||||
/// </summary>
|
||||
[Display(Name = "AgvTaskTypeEnum.3")]
|
||||
原料满托出库 = 3,
|
||||
|
||||
/// <summary>
|
||||
/// 混料满桶上线(1F除湿房缓存区 → 2F需求工位)
|
||||
/// </summary>
|
||||
[Display(Name = "AgvTaskTypeEnum.4")]
|
||||
混料满桶上线 = 4,
|
||||
|
||||
/// <summary>
|
||||
/// 空桶缓存(2F平台工位 → 1F除湿房缓存区)
|
||||
/// </summary>
|
||||
[Display(Name = "AgvTaskTypeEnum.5")]
|
||||
空桶缓存 = 5,
|
||||
|
||||
/// <summary>
|
||||
/// 辅材缓存(1F月台缓存区 → 2F辅材缓存区)
|
||||
/// </summary>
|
||||
[Display(Name = "AgvTaskTypeEnum.6")]
|
||||
辅材缓存 = 6
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// AGV 任务状态(与 TaskStatusEnum 独立,状态机单调推进,见方案 6.1/6.2)
|
||||
/// </summary>
|
||||
public enum AgvTaskStatusEnum : short
|
||||
{
|
||||
/// <summary>
|
||||
/// 新建
|
||||
/// </summary>
|
||||
[Display(Name = "AgvTaskStatusEnum.0")]
|
||||
新建 = 0,
|
||||
|
||||
/// <summary>
|
||||
/// 已下发
|
||||
/// </summary>
|
||||
[Display(Name = "AgvTaskStatusEnum.5")]
|
||||
已下发 = 5,
|
||||
|
||||
/// <summary>
|
||||
/// 执行中
|
||||
/// </summary>
|
||||
[Display(Name = "AgvTaskStatusEnum.10")]
|
||||
执行中 = 10,
|
||||
|
||||
/// <summary>
|
||||
/// 异常
|
||||
/// </summary>
|
||||
[Display(Name = "AgvTaskStatusEnum.90")]
|
||||
异常 = 90,
|
||||
|
||||
/// <summary>
|
||||
/// 取消
|
||||
/// </summary>
|
||||
[Display(Name = "AgvTaskStatusEnum.95")]
|
||||
取消 = 95,
|
||||
|
||||
/// <summary>
|
||||
/// 完成联动失败(联动事务失败,页面可重试,见方案 9.4)
|
||||
/// </summary>
|
||||
[Display(Name = "AgvTaskStatusEnum.99")]
|
||||
完成联动失败 = 99,
|
||||
|
||||
/// <summary>
|
||||
/// 完成
|
||||
/// </summary>
|
||||
[Display(Name = "AgvTaskStatusEnum.100")]
|
||||
完成 = 100
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// AGV 流水类型(对应方案 15.3-1:ERP 回传通道区分)
|
||||
/// </summary>
|
||||
public enum AgvBillTypeEnum : short
|
||||
{
|
||||
/// <summary>
|
||||
/// AGV 入库(ERP 走 FinishIn 报工)
|
||||
/// </summary>
|
||||
[Display(Name = "AgvBillTypeEnum.In_AGV")]
|
||||
In_AGV = 1,
|
||||
|
||||
/// <summary>
|
||||
/// AGV 出库(ERP 走 AddOtherOut,不上报 FinishIn)
|
||||
/// </summary>
|
||||
[Display(Name = "AgvBillTypeEnum.Out_AGV")]
|
||||
Out_AGV = 2,
|
||||
|
||||
/// <summary>
|
||||
/// AGV 移库(纯库内转移,不回传 ERP)
|
||||
/// </summary>
|
||||
[Display(Name = "AgvBillTypeEnum.Move_AGV")]
|
||||
Move_AGV = 3
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// ERP 上报库区映射枚举(方案 5.4.1)
|
||||
/// 决策(2026-10-20):ERP 上报的 WhCode/Type 不放数据库,统一用本枚举承载;
|
||||
/// 后期要改上报取值 → 只改本枚举成员及下方扩展方法即可,不动数据库、不动字典。
|
||||
/// </summary>
|
||||
public enum AgvErpWhTypeEnum
|
||||
{
|
||||
/// <summary>
|
||||
/// 线边库:WhCode="xb"、Type=1(沿用立库现状)
|
||||
/// </summary>
|
||||
[Display(Name = "线边库")]
|
||||
线边库 = 1,
|
||||
|
||||
/// <summary>
|
||||
/// 成品库:WhCode="cp"、Type=2(沿用立库现状)
|
||||
/// </summary>
|
||||
[Display(Name = "成品库")]
|
||||
成品库 = 2,
|
||||
|
||||
/// <summary>
|
||||
/// 平库原料:WhCode/Type 待 ERP 确认后填入(方案 15.3-2)
|
||||
/// </summary>
|
||||
[Display(Name = "平库原料")]
|
||||
平库原料 = 3
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// AgvErpWhTypeEnum 扩展方法:上报取值集中在下方,改取值只改这里
|
||||
/// </summary>
|
||||
public static class AgvErpWhTypeEnumExtensions
|
||||
{
|
||||
/// <summary>
|
||||
/// 按库区 ID 解析上报库区枚举(用于入库报工/出库回传的 WhCode/Type 取值)。
|
||||
/// 现状:1027 线边库,其余成品库;平库库区 ZoneId 确定后在此补充分支归入平库原料。
|
||||
/// </summary>
|
||||
public static AgvErpWhTypeEnum FromZoneId(int zoneId) => zoneId switch
|
||||
{
|
||||
1027 => AgvErpWhTypeEnum.线边库,
|
||||
// 平库库区 ZoneId 确认后在此追加分支,如: 10xx => AgvErpWhTypeEnum.平库原料
|
||||
_ => AgvErpWhTypeEnum.成品库
|
||||
};
|
||||
|
||||
/// <summary>
|
||||
/// 按库区编码字符串解析上报库区枚举(用于出库流水回传,流水无 ZoneId 只有 ZoneCode)。
|
||||
/// 平库库区 ZoneCode 确定后在此补充分支。
|
||||
/// </summary>
|
||||
public static AgvErpWhTypeEnum FromZoneCode(string zoneCode)
|
||||
{
|
||||
if (string.IsNullOrWhiteSpace(zoneCode))
|
||||
{
|
||||
return AgvErpWhTypeEnum.线边库; // 无库区信息时保持现状 xb,避免既有出库回传行为回归
|
||||
}
|
||||
return zoneCode.Trim().ToUpper() switch
|
||||
{
|
||||
"XB" => AgvErpWhTypeEnum.线边库,
|
||||
"CP" => AgvErpWhTypeEnum.成品库,
|
||||
// 平库库区 ZoneCode 确认后在此追加分支
|
||||
_ => AgvErpWhTypeEnum.线边库
|
||||
};
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 获取 ERP 上报仓库编码 WhCode
|
||||
/// </summary>
|
||||
public static string GetWhCode(this AgvErpWhTypeEnum e) => e switch
|
||||
{
|
||||
AgvErpWhTypeEnum.线边库 => "xb",
|
||||
AgvErpWhTypeEnum.成品库 => "cp",
|
||||
// 平库原料:待 ERP 确认后替换,当前暂回退成品库
|
||||
_ => "cp"
|
||||
};
|
||||
|
||||
/// <summary>
|
||||
/// 获取 ERP 上报类型 Type(命名 GetErpType 避免与 object.GetType 冲突)
|
||||
/// </summary>
|
||||
public static int GetErpType(this AgvErpWhTypeEnum e) => e switch
|
||||
{
|
||||
AgvErpWhTypeEnum.线边库 => 1,
|
||||
AgvErpWhTypeEnum.成品库 => 2,
|
||||
// 平库原料:待 ERP 确认后替换,当前暂回退成品库
|
||||
_ => 2
|
||||
};
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// AgvTaskTypeEnum 扩展方法:任务类型 → 流水类型映射(方案 15.3-1)
|
||||
/// 入库类(1/5/6)→ In_AGV;出库类(2/3/4)→ Out_AGV
|
||||
/// </summary>
|
||||
public static class AgvTaskTypeEnumExtensions
|
||||
{
|
||||
/// <summary>
|
||||
/// 获取对应 AGV 流水类型(任务落库时写入 AgvTask.BillType)
|
||||
/// </summary>
|
||||
public static AgvBillTypeEnum ToBillType(this AgvTaskTypeEnum e) => e switch
|
||||
{
|
||||
AgvTaskTypeEnum.原材料入库 => AgvBillTypeEnum.In_AGV,
|
||||
AgvTaskTypeEnum.空桶缓存 => AgvBillTypeEnum.In_AGV,
|
||||
AgvTaskTypeEnum.辅材缓存 => AgvBillTypeEnum.In_AGV,
|
||||
_ => AgvBillTypeEnum.Out_AGV
|
||||
};
|
||||
}
|
||||
|
||||
#endregion
|
||||
}
|
||||
Reference in new issue
Block a user