|
|
@@ -107,7 +107,8 @@ namespace WCS.Service.Works.Station
|
|
|
var devs = Device.Find(agvtask.Station).Create<StationDeviceGroup>();
|
|
|
foreach (var dev in devs.Items)
|
|
|
{
|
|
|
- dev.Data2.Goodscode = agvtask.ID;
|
|
|
+ dev.Data.Goodscode = agvtask.ID;
|
|
|
+ dev.Data.GoodsSize = (short)agvtask.Goodsnum;
|
|
|
}
|
|
|
}
|
|
|
else if (Ltc.Do(agvtask, v => v.AGVStatus == AGVTaskStatus.取消))
|
|
|
@@ -159,7 +160,7 @@ namespace WCS.Service.Works.Station
|
|
|
var station = Device.Where(v => v.DEVICEGROUP.Any(p => p.MEMBER.CODE == dev.Entity.CODE)).FirstOrDefault().Create<StationDeviceGroup>();
|
|
|
DB.Do(db =>
|
|
|
{
|
|
|
- var agvTask = db.Default.Set<WCS_AGVTask>().Where(v => v.ID == dev.Data2.Goodscode).FirstOrDefault() ?? throw new WarnException("无完成AGV任务");
|
|
|
+ var agvTask = db.Default.Set<WCS_AGVTask>().Where(v => v.ID == dev.Data.Goodscode).FirstOrDefault() ?? throw new WarnException("无完成AGV任务");
|
|
|
|
|
|
if (agvTask.Status != AGVTaskStatus.完成扫码)
|
|
|
{
|
|
|
@@ -188,7 +189,7 @@ namespace WCS.Service.Works.Station
|
|
|
dev.Data.Tasknum = task.ID;
|
|
|
dev.Data.Goodsstart = task.ADDRFROM.ToShort();
|
|
|
dev.Data.Goodsend = task.ADDRNEXT.ToShort();
|
|
|
- dev.Data.Goodsnum = (short)agvTask.Goodsnum;
|
|
|
+ //dev.Data.Goodsnum = (short)agvTask.Goodsnum;
|
|
|
dev.Data.CmdType = IstationCmdType.扫码入库;
|
|
|
dev.Data.VoucherNo++;
|
|
|
var msg = $"下达从{dev.Entity.CODE}移动至{next}的PLC指令。";
|
Administrator