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
@@ -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