修改2楼分拣和1楼拆垛时获取拆垛信息接口

liudl

2025-01-20 48d66a079c307356997fb400d27907ff6d363b7b

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

@@ -41,7 +41,7 @@
    [DisplayName("分页查询分拣任务表")]
    public async Task<SqlSugarPagedList<WcsCheckTaskOutput>> Page(PageWcsCheckTaskInput input)
    {
      input.SearchKey = input.SearchKey?.Trim();
        input.SearchKey = input.SearchKey?.Trim();
        var query = _wcsCheckTaskRep.AsQueryable()
            .WhereIF(!string.IsNullOrEmpty(input.SearchKey), u =>
                u.OrderNo.Contains(input.SearchKey)
@@ -67,14 +67,14 @@
            .WhereIF(!string.IsNullOrWhiteSpace(input.Status), u => u.Status.Contains(input.Status.Trim()))
            .WhereIF(!string.IsNullOrWhiteSpace(input.PZNo), u => u.PZNo.Contains(input.PZNo.Trim()))
            .WhereIF(!string.IsNullOrWhiteSpace(input.PalletNo), u => u.PalletNo.Contains(input.PalletNo.Trim()))
            .WhereIF(input.BoxInsert>0, u => u.BoxInsert == input.BoxInsert)
            .WhereIF(input.BoxCount>0, u => u.BoxCount == input.BoxCount)
            .WhereIF(input.Qty>0, u => u.Qty == input.Qty)
            .WhereIF(input.FinishQty>0, u => u.FinishQty == input.FinishQty)
            .WhereIF(input.BoxInsert > 0, u => u.BoxInsert == input.BoxInsert)
            .WhereIF(input.BoxCount > 0, u => u.BoxCount == input.BoxCount)
            .WhereIF(input.Qty > 0, u => u.Qty == input.Qty)
            .WhereIF(input.FinishQty > 0, u => u.FinishQty == input.FinishQty)
            .WhereIF(input.BindTimeRange != null && input.BindTimeRange.Length == 2, u => u.BindTime >= input.BindTimeRange[0] && u.BindTime <= input.BindTimeRange[1])
            .WhereIF(input.BindUserId>0, u => u.BindUserId == input.BindUserId)
            .WhereIF(input.BindUserId > 0, u => u.BindUserId == input.BindUserId)
            .Select<WcsCheckTaskOutput>();
      return await query.OrderBuilder(input).ToPagedListAsync(input.Page, input.PageSize);
        return await query.OrderBuilder(input).ToPagedListAsync(input.Page, input.PageSize);
    }

    /// <summary>
@@ -191,38 +191,82 @@
        checkTaskInfo.LotNo = taskInfo.LotNo;
        checkTaskInfo.SkuNo = taskInfo.SkuNo;
        checkTaskInfo.SkuName = taskInfo.SkuName;
        checkTaskInfo.BoxType = taskInfo.BoxType;
        //checkTaskInfo.BoxType = taskInfo.BoxType;
        checkTaskInfo.Qty = taskInfo.Qty;
        checkTaskInfo.Status = "1";//已绑定
        checkTaskInfo.PZNo = skuInfo.PZNo;        
        checkTaskInfo.PZNo = skuInfo.PZNo;

        #region#给PLC写入抓箱品种号
        var modPlc = await _wcsDeviceRep.Context.Queryable<WcsPlc>().FirstAsync(s => s.Id == deviceInfo.PlcId);
        if (modPlc == null)
        if (checkTaskInfo.Id >= 6)
        {
            throw Oops.Bah("找不到PLC信息");
            var modPlc = await _wcsDeviceRep.Context.Queryable<WcsPlc>().FirstAsync(s => s.Id == deviceInfo.PlcId);
            if (modPlc == null)
            {
                throw Oops.Bah("找不到PLC信息");
            }
            PLCUtil modUtil = new PLCUtil(modPlc);
            if (modUtil.Connected)
            {
                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未连接，绑定失败！");
            }
        }
        PLCUtil modUtil = new PLCUtil(modPlc);
        var ret= modUtil.SetPlcDBValue(checkTaskInfo.PosType, checkTaskInfo.DbNumber, checkTaskInfo.PlcPos, checkTaskInfo.PZNo);
        if (ret.IsSucceed)
        else
        {
            //写入流程字成功后更新分拣任务
            await _wcsCheckTaskRep.AsUpdateable(checkTaskInfo).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommandAsync();
        }
        #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 +286,66 @@
                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, "1");
                //var ret1 = modUtil.SetPlcDBValue(item.PosTypeLot, item.DbNumber, item.PosLot, "0");    // 解绑分道
                //if (ret1.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交互失败，结批失败！");
                //}
            }
            else
            {
                throw Oops.Bah("PCL未连接，结批失败！");
            }
            #endregion
        }
    }
    /// <summary>
    /// 任务解绑
    /// </summary>
    /// <param name="input"></param>
    /// <returns></returns>
    [HttpPost]
    [ApiDescriptionSettings(Name = "UnBindTaskForPLC")]
    [DisplayName("任务解绑")]
    public async Task UnBindTaskForPLC(BaseIdInput input)
    {
        var modCheckTask = await _wcsCheckTaskRep.AsQueryable().FirstAsync(s => s.Id == input.Id);
        if (modCheckTask == null)
            throw Oops.Bah("找不到该信息");
        if (modCheckTask.Status != "1")
            throw Oops.Bah("该任务已解绑");
        modCheckTask.Status = "0";
        modCheckTask.OrderNo = "";
        modCheckTask.TaskNo = "";
        modCheckTask.SkuNo = "";
        modCheckTask.SkuName = "";
        modCheckTask.LotNo = "";
        modCheckTask.PZNo = "";
        modCheckTask.BoxType = "";
        modCheckTask.Qty = 0;

            //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,
        await _wcsCheckTaskRep.AsUpdateable(modCheckTask).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommandAsync();

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

            #endregion                      
        }  
    }
}