|
@@ -46,7 +46,20 @@ namespace WCS.WorkEngineering.Systems
|
|
|
var taskCodes = taskList.Select(x => x.BarCode).ToList();
|
|
|
if (!obj.Data5.CmdType.HasFlag(TrussCmdType.End1))
|
|
|
{
|
|
|
- if (TaskNoList.Count == 0) return;
|
|
|
+ if (TaskNoList.Count == 0)
|
|
|
+ {
|
|
|
+ var taskAny = db.Queryable<WCS_TaskInfo>().NoLock().Single(x => x.Type == TaskType.EnterDepot && x.Status == TaskStatus.ConveyorExecution && x.BusType == "码垛入库" && x.AddrFrom == obj.Entity.Code);
|
|
|
+ //针对断电写入信号失败的情况
|
|
|
+ if (taskAny != null && obj.Data.TaskNumber != taskAny.ID)
|
|
|
+ {
|
|
|
+ obj.Data.TaskNumber = taskAny.ID;
|
|
|
+ obj.Data.GoodsStart = obj.Entity.Code.ToShort();
|
|
|
+ obj.Data.GoodsEnd = taskAny.AddrNext.ToShort();
|
|
|
+ obj.Data4.CmdType = TrussCmdType.End;
|
|
|
+ }
|
|
|
+ return;
|
|
|
+ }
|
|
|
+
|
|
|
if (taskList.Count != TaskNoList.Count)
|
|
|
{
|
|
|
var taskIn = db.Queryable<WCS_TaskInfo>().NoLock().Single(x => x.BarCode == palletizing.PalleCode && x.Type == TaskType.EnterDepot && x.Status < TaskStatus.Finish);
|