修改问题

IPC-610

2024-10-31 9b85a8b67aa6354ee9ea1a13c5799bf1c934922f

 Admin.NET/WCS.Application/Service/WcsCheckTask/WcsCheckTaskService.cs

@@ -203,26 +203,63 @@
            throw Oops.Bah("找不到PLC信息");
        }
        PLCUtil modUtil = new PLCUtil(modPlc);
        var ret= modUtil.SetPlcDBValue(checkTaskInfo.PosType, checkTaskInfo.DbNumber, checkTaskInfo.PlcPos, checkTaskInfo.PZNo);
        if (ret.IsSucceed)
        if (modUtil.Connected)
        {
            //写入流程字成功后更新分拣任务
            await _wcsCheckTaskRep.AsUpdateable(checkTaskInfo).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommandAsync();
            var ret = modUtil.SetPlcDBValue(checkTaskInfo.PosType, checkTaskInfo.DbNumber, checkTaskInfo.PlcPos, checkTaskInfo.PZNo);
            if (ret.IsSucceed)
            {
                //写入流程字成功后更新分拣任务
                await _wcsCheckTaskRep.AsUpdateable(checkTaskInfo).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommandAsync();
            }
            else
            {
                throw Oops.Bah("与PCL交互失败，绑定失败！");
            }
        }
        else
        {
            throw Oops.Bah("PCL未连接，绑定失败！");
        }
        #endregion
    }

    /// <summary>
    /// 任务结批
    /// 任务强制结批
    /// </summary>
    /// <param name="input"></param>
    /// <returns></returns>
    [HttpPost]
    [ApiDescriptionSettings(Name = "CloseTaskForPLC")]
    [DisplayName("任务结批")]
    [DisplayName("任务强制结批")]
    public async Task CloseTaskForPLC(CloseTaskPLCInput input)
    {
        //分拣任务信息
        //  注释：演示模式不绑定分道。liudl 2024-10-30
        //if (PLCTaskAction.boDemo)
        //{
        //    //演示模式
        //    var checkTaskList2 = await _wcsCheckTaskRep.Context.Queryable<WcsCheckTask>().FirstAsync(w => w.Port == "208");

        //    var deviceInfo = await _wcsDeviceRep.Context.Queryable<WcsDevice>().FirstAsync(w => w.StationNum == "208");
        //    if (deviceInfo == null)
        //    {
        //        throw Oops.Bah($"找不到工位号：208的码垛工位信息");
        //    }
        //    var modPlc = await _wcsDeviceRep.Context.Queryable<WcsPlc>().FirstAsync(s => s.Id == deviceInfo.PlcId);
        //    if (modPlc == null)
        //    {
        //        throw Oops.Bah($"找不到工位号：208的设备信息");
        //    }
        //    PLCUtil modUtil = new PLCUtil(modPlc);
            
        //    var ret = modUtil.SetPlcDBValue(checkTaskList2.PosTypeLot, checkTaskList2.DbNumber, checkTaskList2.PosLot, "1");
        //    return;
        //}

        // 正常模式
        if (string.IsNullOrWhiteSpace(input.lotNo))
        {
            throw Oops.Bah($"该工位未绑定任务！");
        }
        var checkTaskList = _wcsCheckTaskRep.Context.Queryable<WcsCheckTask>().Where(w => w.LotNo == input.lotNo && w.Status == "1").ToList();
        if (checkTaskList.Count <= 0)
        {
@@ -242,49 +279,35 @@
                throw Oops.Bah($"找不到工位号：{item.Port} 的设备信息");
            }
            PLCUtil modUtil = new PLCUtil(modPlc);
            var ret = modUtil.SetPlcDBValue(item.PosType, item.DbNumber, item.PlcPos, item.PZNo);
            if (ret.IsSucceed)
            if (modUtil.Connected)
            {
                //写入流程字成功后更新分拣任务
                item.OrderNo = "";
                item.TaskNo = "";
                item.LotNo = "";
                item.SkuNo = "";
                item.SkuName = "";
                item.BoxType = "";
                item.Qty = 0;
                item.PZNo = "";
                item.Status = "0";//未绑定 
                var ret = modUtil.SetPlcDBValue(item.PosTypeLot, item.DbNumber, item.PosLot, "0");    // 解绑分道
                if (ret.IsSucceed)
                {
                    //写入流程字成功后更新分拣任务
                    item.OrderNo = "";
                    item.TaskNo = "";
                    item.LotNo = "";
                    item.SkuNo = "";
                    item.SkuName = "";
                    item.BoxType = "";
                    item.Qty = 0;
                    item.PZNo = "";
                    item.Status = "0";//未绑定 

                //更新分拣任务
                await _wcsCheckTaskRep.AsUpdateable(item).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommandAsync();
                    //更新分拣任务
                    await _wcsCheckTaskRep.AsUpdateable(item).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommandAsync();
                }
                else
                {
                    throw Oops.Bah("与PCL交互失败，结批失败！");
                }
            }

            //Service.WcsDevice.Dto.WcsDeviceTaskOrderDto order=  await _wcsDeviceRep.Context.Queryable<WcsDevice>()
            //    .InnerJoin<WcsPlc>((device, plc) => device.PlcId == plc.Id)
            //    .LeftJoin<WcsCheckTask>((device, plc, task) => device.StationNum == task.Port)
            //    .Where((device, plc, task) => device.PlcId == 1000 && task.Port=="")
            //    .Select((device, plc, task) => new Service.WcsDevice.Dto.WcsDeviceTaskOrderDto()
            //    {
            //        Id = device.Id,
            //        Text = device.Text,
            //        TaskNo = task.TaskNo,
            //        OrderNo = task.OrderNo,
            //        LotNo = task.LotNo,
            //        SkuNo = task.SkuNo,
            //        SkuName = task.SkuName,
            //        LineNo = task.LineNo,
            //        Status = task.Status,
            //        PZNo = task.PZNo,
            //        Qty = task.Qty,

            //        Type = plc.Type
            //    })
            //    .FirstAsync();
            ////下发分拣任务
            //HubUtil.PublicCheckTask(order.Adapt<Service.WcsDevice.Dto.WcsDeviceTaskOrderDto>());

            #endregion                      
        }  
            else
            {
                throw Oops.Bah("PCL未连接，结批失败！");
            }
            #endregion
        }
    }
}