|
@@ -115,7 +115,15 @@ namespace WCS.Service.Works
|
|
|
else throw new Exception($"[SRM{deviceCode.Substring(2)}]任务类型错误");
|
|
|
|
|
|
dev.Data2.FinishedACK = 1;
|
|
|
- task.CreateStatusLog(db);
|
|
|
+ //task.CreateStatusLog(db);
|
|
|
+ if (task.TYPE == TaskType.出库 && !(dev.Data.ELine >= 2275 && dev.Data.ELine <= 2280))
|
|
|
+ {
|
|
|
+ task.CreateStatusLog(db, "任务堆垛机完成");
|
|
|
+ }
|
|
|
+ else
|
|
|
+ {
|
|
|
+ task.CreateStatusLog(db, "任务完成");
|
|
|
+ }
|
|
|
});
|
|
|
return;
|
|
|
}
|
|
@@ -180,7 +188,7 @@ namespace WCS.Service.Works
|
|
|
|
|
|
task.TUNNEL = task.TUNNEL;
|
|
|
db.Default.SaveChanges();
|
|
|
- task.CreateStatusLog(db);
|
|
|
+ task.CreateStatusLog(db,$"任务下发堆垛机执行,起始地址[{task.ADDRFROM}],目标地址[{task.ADDRTO}]");
|
|
|
|
|
|
Uploader.Upload(db);
|
|
|
|
|
@@ -236,7 +244,7 @@ namespace WCS.Service.Works
|
|
|
db.Default.SaveChanges();
|
|
|
|
|
|
Uploader.Upload(db);
|
|
|
- task.CreateStatusLog(db);
|
|
|
+ task.CreateStatusLog(db, $"任务下发堆垛机执行,起始地址[{st.Entity.CODE}],目标地址[{task.ADDRTO}]");
|
|
|
|
|
|
dev.Data2.TaskID = task.ID;
|
|
|
|
|
@@ -345,7 +353,7 @@ namespace WCS.Service.Works
|
|
|
task.UPDATETIME = DateTime.Now;
|
|
|
db.Default.SaveChanges();
|
|
|
Uploader.Upload(db);
|
|
|
- task.CreateStatusLog(db);
|
|
|
+ task.CreateStatusLog(db, $"任务下发堆垛机执行,起始地址[{task.ADDRFROM}],目标地址[{task.SCSTATION}]");
|
|
|
|
|
|
if (task.ADDRFROM.Split('-').Length != 3) throw new Exception($"[SRM{deviceCode.Substring(2)}]出库任务起始位置错误:{task.ADDRFROM}");
|
|
|
|
|
@@ -466,7 +474,14 @@ namespace WCS.Service.Works
|
|
|
else throw new Exception($"[SRM{deviceCode.Substring(2)}]任务类型错误");
|
|
|
|
|
|
dev.Data2.FinishedACK = 1;
|
|
|
- task.CreateStatusLog(db);
|
|
|
+ if (task.TYPE == TaskType.出库 && !(dev.Data.ELine >= 2275 && dev.Data.ELine <= 2280))
|
|
|
+ {
|
|
|
+ task.CreateStatusLog(db, "任务堆垛机完成");
|
|
|
+ }
|
|
|
+ else
|
|
|
+ {
|
|
|
+ task.CreateStatusLog(db, "任务完成");
|
|
|
+ }
|
|
|
});
|
|
|
LogHelper.AddWCS_EXCEPTION($"WCS变更[SRM{deviceCode.Substring(2)}]任务[{task.ID}]状态为[{task.STATUS}]");
|
|
|
return;
|
|
@@ -520,7 +535,7 @@ namespace WCS.Service.Works
|
|
|
|
|
|
task.TUNNEL = task.TUNNEL;
|
|
|
db.Default.SaveChanges();
|
|
|
- task.CreateStatusLog(db);
|
|
|
+ task.CreateStatusLog(db, $"任务下发堆垛机执行,起始地址[{task.ADDRFROM}],目标地址[{task.ADDRTO}]");
|
|
|
|
|
|
Uploader.Upload(db);
|
|
|
|
|
@@ -582,7 +597,7 @@ namespace WCS.Service.Works
|
|
|
db.Default.SaveChanges();
|
|
|
|
|
|
Uploader.Upload(db);
|
|
|
- task.CreateStatusLog(db);
|
|
|
+ task.CreateStatusLog(db, $"任务下发堆垛机执行,起始地址[{st.Entity.CODE}],目标地址[{task.ADDRTO}]");
|
|
|
|
|
|
dev.Data2.TaskID = task.ID;
|
|
|
|
|
@@ -681,6 +696,7 @@ namespace WCS.Service.Works
|
|
|
task.UPDATETIME = DateTime.Now;
|
|
|
db.Default.SaveChanges();
|
|
|
Uploader.Upload(db);
|
|
|
+ task.CreateStatusLog(db, $"任务下发堆垛机执行,起始地址[{task.ADDRFROM}],目标地址[{task.SCSTATION}]");
|
|
|
|
|
|
if (task.ADDRFROM.Split('-').Length != 3) throw new Exception($"[SRM{deviceCode.Substring(2)}]出库任务起始位置错误:" + task.ADDRFROM);
|
|
|
|