CancelMoveTask取消AGV移库任务去除仓库限制

admin

昨天 2030ac67543e65073ee45eaa21934c09db9806f0

 Wms/WMS.BLL/BllCheckServer/StockCheckServer.cs

@@ -1635,7 +1635,7 @@
                task.IsFinish = 0;
                task.FinishDate = DateTime.Now;//完成时间
                await Db.Updateable(task).ExecuteCommandAsync();
                if(task.OrderType != "6")//视觉盘点不更改状态
                if (task.OrderType != "6")//视觉盘点不更改状态
                {
                    locate.Status = "0"; // 更改当前任务中的储位状态（改为0空储位）
                    await Db.Updateable(locate).ExecuteCommandAsync();
@@ -1745,7 +1745,7 @@
                    locate2.Status = "1";
                    Db.Updateable(locate2).ExecuteCommand();
                    //判断目标位置如果不是是车间暂存区  并且是平库储位 更改库存位置
                    if (pingKuLocate2.Count(m=>m.LocatNo == task.EndLocat)<=0 && pingKuList.Contains(task.EndLocat))
                    if (pingKuLocate2.Count(m => m.LocatNo == task.EndLocat) <= 0 && pingKuList.Contains(task.EndLocat))
                    {
                        foreach (var item in stockDetail)
                        {
@@ -1852,17 +1852,17 @@
                    var time2 = DateTime.Now;//返回时间 .ToString("yyyy-MM-dd HH:mm:ss")

                    ////解析返回数据 
                    var wcsModel = JsonConvert.DeserializeObject<WcsModel>(response);
                    if (wcsModel.StatusCode == 0)
                    var wcsModel = JsonConvert.DeserializeObject<WcsModel2>(response);
                    if (wcsModel.code == 200)
                    {
                        //更改任务的发送返回时间//
                        new TaskServer().EditTaskIssueOk(list, time1, time2);

                    }
                    if (wcsModel.StatusCode == -1)
                    else
                    {
                        new TaskServer().EditTaskIssueNo(list, time1, time2, wcsModel.Msg);
                        throw new Exception($"wcs返回状态异常：{wcsModel.Msg}");
                        new TaskServer().EditTaskIssueNo(list, time1, time2, wcsModel.message);
                        throw new Exception($"wcs返回状态异常：{wcsModel.message}");
                    }
                }
                catch (Exception ex)
@@ -1973,7 +1973,8 @@
                await Db.Updateable(task).ExecuteCommandAsync();

                //修改起始储位信息
                var locat = await Db.Queryable<SysStorageLocat>().FirstAsync(a => a.IsDel == "0" && a.WareHouseNo == "W02" && a.LocatNo == task.StartLocat);
                //var locat = await Db.Queryable<SysStorageLocat>().FirstAsync(a => a.IsDel == "0" && a.WareHouseNo == "W02" && a.LocatNo == task.StartLocat);
                var locat = await Db.Queryable<SysStorageLocat>().FirstAsync(a => a.IsDel == "0" && a.LocatNo == task.StartLocat);
                if (locat == null)
                {
                    throw Oops.Bah("未查询到储位信息，请核实！");