|
@@ -261,7 +261,7 @@ namespace WCS.Service.Works.Station
|
|
|
var infos = devise.GetWMSInTask();
|
|
|
|
|
|
WCS_AGVTask agvTask = null;
|
|
|
-
|
|
|
+
|
|
|
if (!stationDeviceGroup.Items.Any(v => v.Data2.Status.HasFlag(IstationStatus.手动入库)))
|
|
|
{
|
|
|
if (stationDeviceGroup.Entity.CODE == "G1435")
|
|
@@ -547,6 +547,7 @@ namespace WCS.Service.Works.Station
|
|
|
{
|
|
|
var dev = item.Entity.Create<StationDevice>();
|
|
|
var task = taskList.FirstOrDefault(p => p.ID == dev.Data2.Tasknum);
|
|
|
+ if (task.TYPE == TaskType.倒库) continue;
|
|
|
if (task == null) throw new WarnException($"WCS无该任务{dev.Data2.Tasknum}--{dev.Entity.CODE}");
|
|
|
|
|
|
task.DEVICE = tunnelInfo.SRM.Entity.CODE;
|
|
@@ -572,6 +573,14 @@ namespace WCS.Service.Works.Station
|
|
|
|
|
|
finishTask.Station.Data.Tasknum = task.ID;
|
|
|
finishTask.Station.Data.Goodsstart = stationDeviceGroup.Entity.CODE.Replace("G", "").ToShort();
|
|
|
+ if (task.TYPE == TaskType.倒库)
|
|
|
+ {
|
|
|
+ finishTask.Station.Data.Goodsend = finishTask.Station.Entity.GetPath(task.DEVICEDL).CODE.ToShort();
|
|
|
+ }
|
|
|
+ else
|
|
|
+ {
|
|
|
+ finishTask.Station.Data.Goodsend = finishTask.Station.Entity.GetPath(task.DEVICE).CODE.ToShort();
|
|
|
+ }
|
|
|
finishTask.Station.Data.Goodsend = finishTask.Station.Entity.GetPath(task.DEVICE).CODE.ToShort();
|
|
|
finishTask.Station.Data.Goodsnum = finishTaskList.Count.ToShort();
|
|
|
finishTask.Station.Data.CmdType = IstationCmdType.分配目标地址;
|