|
|
@@ -236,8 +236,15 @@ namespace WCS.Service.Works.Station
|
|
|
|
|
|
if (!obj.Items.Any(v => v.Data2.Status.HasFlag(IstationStatus.手动入库)))
|
|
|
{
|
|
|
- agvTask = db.Default.Set<WCS_AGVTask>().Where(v => v.Status == AGVTaskStatus.完成 && v.Station == obj.Entity.CODE).FirstOrDefault() ?? throw new WarnException("无完成AGV任务");
|
|
|
-
|
|
|
+ if (obj.Entity.CODE == "G1435")
|
|
|
+ {
|
|
|
+ agvTask = db.Default.Set<WCS_AGVTask>().Where(v => v.Status == AGVTaskStatus.完成 && v.Station == "G1394").FirstOrDefault() ?? throw new WarnException("无完成AGV任务");
|
|
|
+ }
|
|
|
+ else
|
|
|
+ {
|
|
|
+ agvTask = db.Default.Set<WCS_AGVTask>().Where(v => v.Status == AGVTaskStatus.完成 && v.Station == obj.Entity.CODE).FirstOrDefault() ?? throw new WarnException("无完成AGV任务");
|
|
|
+ }
|
|
|
+
|
|
|
if (agvTask.Status != AGVTaskStatus.完成扫码)
|
|
|
{
|
|
|
agvTask.Status = AGVTaskStatus.完成扫码;
|