|
@@ -1,8 +1,8 @@
|
|
|
-using NetTaste;
|
|
|
-using PlcSiemens.Core.Extension;
|
|
|
+using PlcSiemens.Core.Extension;
|
|
|
using ServiceCenter.Extensions;
|
|
|
using ServiceCenter.Logs;
|
|
|
using ServiceCenter.SqlSugars;
|
|
|
+using SqlSugar;
|
|
|
using System.ComponentModel;
|
|
|
using WCS.Core;
|
|
|
using WCS.Entity;
|
|
@@ -32,7 +32,7 @@ namespace WCS.WorkEngineering.Systems
|
|
|
obj.Data.TaskNumber = obj.Data2.TaskNumber;
|
|
|
World.Log($"复写:{obj.Data.TaskNumber}");
|
|
|
}
|
|
|
- World.Log($"凭证号不一致,DB520:{obj.Data.VoucherNo}-DB521:{obj.Data2.VoucherNo}",LogLevelEnum.Mid);
|
|
|
+ World.Log($"凭证号不一致,DB520:{obj.Data.VoucherNo}-DB521:{obj.Data2.VoucherNo}", LogLevelEnum.Mid);
|
|
|
return;
|
|
|
}
|
|
|
|
|
@@ -45,7 +45,7 @@ namespace WCS.WorkEngineering.Systems
|
|
|
;
|
|
|
if (!obj.Data3.Status.HasFlag(StationStatus.OT_Status))
|
|
|
{
|
|
|
- World.Log("站台货物信息与实际占用不一致",LogLevelEnum.Mid);
|
|
|
+ World.Log("站台货物信息与实际占用不一致", LogLevelEnum.Mid);
|
|
|
return;
|
|
|
}
|
|
|
|
|
@@ -104,7 +104,7 @@ namespace WCS.WorkEngineering.Systems
|
|
|
World.Log($"未找到对应的WCS任务{obj.Data2.TaskNumber}", LogLevelEnum.Mid);
|
|
|
return;
|
|
|
}
|
|
|
- else if (taskInfo.AddTime < DateTime.Now.AddHours(-12) && obj.Data2.TaskNumber == taskInfo.ID)
|
|
|
+ else if (taskInfo.AddTime < DateTime.Now.AddHours(-12) && obj.Data2.TaskNumber == taskInfo.ID)
|
|
|
{
|
|
|
obj.Data.TaskNumber = 1;
|
|
|
obj.Data.GoodsEnd = obj.Entity.Code.ToShort();
|
|
@@ -112,7 +112,7 @@ namespace WCS.WorkEngineering.Systems
|
|
|
World.Log($"超时执行记录:任务号[{taskInfo.ID}]-[{obj.Data.TaskNumber}]-[{obj.Data.VoucherNo}]");
|
|
|
return;
|
|
|
}
|
|
|
- else if (taskInfo.Grade != null &&(taskInfo.Grade.ToUpper() != "A") && obj.Data2.TaskNumber == taskInfo.ID)
|
|
|
+ else if (taskInfo.Grade != null && (taskInfo.Grade.ToUpper() != "A") && obj.Data2.TaskNumber == taskInfo.ID)
|
|
|
{
|
|
|
obj.Data.TaskNumber = 3;
|
|
|
obj.Data.GoodsEnd = obj.Entity.Code.ToShort();
|
|
@@ -120,7 +120,6 @@ namespace WCS.WorkEngineering.Systems
|
|
|
World.Log($"BC执行记录:任务号[{taskInfo.ID}]-[{obj.Data.TaskNumber}]-[{obj.Data.VoucherNo}]");
|
|
|
return;
|
|
|
}
|
|
|
-
|
|
|
|
|
|
if (!taskInfo.BarCode.Contains("Error"))
|
|
|
{
|
|
@@ -149,16 +148,16 @@ namespace WCS.WorkEngineering.Systems
|
|
|
{
|
|
|
case "418":
|
|
|
if (taskInfo.WarehouseCode != "1N") //throw new KnownException($"当前任务应该当前往{taskInfo.WarehouseCode}库", LogLevelEnum.Mid);
|
|
|
- {
|
|
|
- WriteInfo(obj,taskInfo);
|
|
|
+ {
|
|
|
+ EditFlow(taskInfo, "1N", db, obj.Entity.Code);
|
|
|
return;
|
|
|
- }
|
|
|
+ }
|
|
|
break;
|
|
|
|
|
|
case "618":
|
|
|
if (taskInfo.WarehouseCode != "1S") //throw new KnownException($"当前任务应该当前往{taskInfo.WarehouseCode}库", LogLevelEnum.Mid);
|
|
|
{
|
|
|
- WriteInfo(obj, taskInfo);
|
|
|
+ EditFlow(taskInfo, "1S", db, obj.Entity.Code);
|
|
|
return;
|
|
|
}
|
|
|
break;
|
|
@@ -166,7 +165,7 @@ namespace WCS.WorkEngineering.Systems
|
|
|
case "818":
|
|
|
if (taskInfo.WarehouseCode != "2N") //throw new KnownException($"当前任务应该当前往{taskInfo.WarehouseCode}库", LogLevelEnum.Mid);
|
|
|
{
|
|
|
- WriteInfo(obj, taskInfo);
|
|
|
+ EditFlow(taskInfo, "2N", db, obj.Entity.Code);
|
|
|
return;
|
|
|
}
|
|
|
break;
|
|
@@ -174,7 +173,7 @@ namespace WCS.WorkEngineering.Systems
|
|
|
case "1018":
|
|
|
if (taskInfo.WarehouseCode != "2S") //throw new KnownException($"当前任务应该当前往{taskInfo.WarehouseCode}库", LogLevelEnum.Mid);
|
|
|
{
|
|
|
- WriteInfo(obj, taskInfo);
|
|
|
+ EditFlow(taskInfo, "2S", db, obj.Entity.Code);
|
|
|
return;
|
|
|
}
|
|
|
break;
|
|
@@ -182,7 +181,7 @@ namespace WCS.WorkEngineering.Systems
|
|
|
case "1218":
|
|
|
if (taskInfo.WarehouseCode != "3N") //throw new KnownException($"当前任务应该当前往{taskInfo.WarehouseCode}库", LogLevelEnum.Mid);
|
|
|
{
|
|
|
- WriteInfo(obj, taskInfo);
|
|
|
+ EditFlow(taskInfo, "3N", db, obj.Entity.Code);
|
|
|
return;
|
|
|
}
|
|
|
break;
|
|
@@ -190,7 +189,7 @@ namespace WCS.WorkEngineering.Systems
|
|
|
case "1418":
|
|
|
if (taskInfo.WarehouseCode != "3S") //throw new KnownException($"当前任务应该当前往{taskInfo.WarehouseCode}库", LogLevelEnum.Mid);
|
|
|
{
|
|
|
- WriteInfo(obj, taskInfo);
|
|
|
+ EditFlow(taskInfo, "3S", db, obj.Entity.Code);
|
|
|
return;
|
|
|
}
|
|
|
break;
|
|
@@ -257,6 +256,17 @@ namespace WCS.WorkEngineering.Systems
|
|
|
World.Log($"南北流错执行记录:任务号[{task.ID}]-[{device.Data.TaskNumber}]-[{device.Data.VoucherNo}]");
|
|
|
}
|
|
|
|
|
|
+ /// <summary>
|
|
|
+ /// 编辑流向
|
|
|
+ /// </summary>
|
|
|
+ public void EditFlow(WCS_TaskInfo task, string warehouseCode, SqlSugarScopeProvider db, string locCode)
|
|
|
+ {
|
|
|
+ WmsApi.EditorialFlow(new FjEditorialFlowRequest() { TaskId = task.ID, LocCode = locCode, WareCode = warehouseCode });
|
|
|
+ task.WarehouseCode = warehouseCode;
|
|
|
+ db.UpdateableRowLock(task);
|
|
|
+ task.AddWCS_TASK_DTL(db, locCode, $"变更流向至{warehouseCode}");
|
|
|
+ }
|
|
|
+
|
|
|
public override bool Select(Device dev)
|
|
|
{
|
|
|
return dev.Code is "418" or "618" or "818" or "1018" or "1218" or "1418";
|
|
@@ -315,4 +325,4 @@ namespace WCS.WorkEngineering.Systems
|
|
|
};
|
|
|
}
|
|
|
}
|
|
|
-}
|
|
|
+}
|