增加WCS接收WMS下发的入库单任务；修改分拣码垛绑定和结批功能

wxw

2024-09-26 06d50c0f77ccf01ebe751a819e9ad06b871d8e90

 Admin.NET/WCS.Application/OpenApi/DemoOpenApi.cs

@@ -1,6 +1,8 @@
using System.Diagnostics.CodeAnalysis;
using Elastic.Clients.Elasticsearch;
using System.Diagnostics.CodeAnalysis;
using System.Linq;
using System.Text;
using WCS.Application.OpenApi.Dto;
using WCS.Application.Entity;

namespace WCS.Application;

@@ -9,6 +11,7 @@
/// </summary>
[ApiDescriptionSettings("开放接口", Name = "Demo", Order = 100)]
//[Authorize(AuthenticationSchemes = SignatureAuthenticationDefaults.AuthenticationScheme)]
[AllowAnonymous]
public class DemoOpenApi : IDynamicApiController
{
    private static readonly ISqlSugarClient _db = SqlSugarSetup.ITenant.GetConnectionScope(SqlSugarConst.MainConfigId);
@@ -26,32 +29,65 @@
    //    return Task.FromResult($"Hello word. {_userManager.Account}");
    //}

    // <summary>
    /// WCS接受WMS下发的任务(单条任务)
    /// </summary>
    /// <param name="models">任务信息</param>
    /// <returns>反馈信息</returns>
    [AllowAnonymous]
    public ResponseModel AddWcsTasks(List<ResponseTasksModel> modelList)
    {
        ResponseModel result = new ResponseModel();
        result.StatusCode = 0;
        try
        {            
            foreach (var models in modelList)
            {
                var res = AddWcsTask(models);
                if (res.StatusCode == -1)
                {
                    result.StatusCode = -1;
                    result.Msg = res.Msg;
                }
                else if (res.StatusCode == 0)
                {
                    result.StatusCode = 0;
                    result.Msg = models.TaskNo + "任务" + res.Msg;
                }
            }            
        }
        catch (Exception ex)
        {
            return new ResponseModel() { StatusCode = -1, Msg = ex.Message };
        }
        return result;
    }
    /// <summary>
    /// WCS接受WMS下发的任务(单条任务)
    /// </summary>
    /// <param name="models">任务信息</param>
    /// <returns>反馈信息</returns>
    [AllowAnonymous]
    public WCSResultModel AddWcsTask(WCSTasks models)
    public ResponseModel AddWcsTask(ResponseTasksModel models)
    {
        WCSResultModel result = new WCSResultModel();
        ResponseModel result = new ResponseModel();
        try
        {
            // 验证任务是否已存在
            var taskInfo = _db.Queryable<WcsTask>().First(w => w.TaskNo == models.TaskNo);
            if (taskInfo != null)
            {
                result.StatusCode = "-1";
                result.StatusCode = -1;
                result.Msg = "任务:" + models.TaskNo + ";已存在!";
                return result;
            }
            if (models.Type == "0")
            if (models.TaskType == "0")
            {
                models.Levels = "1.5";
                models.Order = 1;
            }
            else
            {
                models.Levels = "2";
                models.Order = 2;
            }
            //新增任务
            var taskAdd = new WcsTask()
@@ -67,18 +103,58 @@
                EndRoadway= models.EndRoadway,
                PalletNo = models.PalletNo,

                LotNo =models.LotNo,
                SkuNo=models.SkuNo,
                SkuName=models.SkuName,
                Qty=models.Qty
                //LotNo =models.LotNo,
                //SkuNo=models.SkuNo,
                //SkuName=models.SkuName,
                //Qty=models.Qty
            };
            _db.Insertable(taskAdd).ExecuteCommand();           

            return new WCSResultModel() { StatusCode = "1", Msg = "插入成功" };
            return new ResponseModel() { StatusCode = 0, Msg = "插入成功" };
        }
        catch (Exception ex)
        {
            return new WCSResultModel() { StatusCode = "-1", Msg = ex.Message };
            return new ResponseModel() { StatusCode = -1, Msg = ex.Message };
        }
    }

    /// <summary>
    /// WCS接收WMS下发的入库单任务
    /// </summary>
    /// <param name="models"></param>
    /// <returns></returns>
    [AllowAnonymous]
    public ResponseModel AddOrderTask(List<ResponseOrderTaskModel> models)
    {
        ResponseModel result = new ResponseModel();
        try
        {
            foreach (var item in models)
            {
                // 验证任务是否已存在
                //var taskInfo = _db.Queryable<WcsOderTask>().First(w => w.OrderNo == item.OrderNo && w.SkuNo == item.SkuNo && w.LotNo == item.LotNo);
                //if (taskInfo == null)
                //{
                    var orderAdd = new WcsOderTask()
                    {
                        OrderNo = item.OrderNo,
                        TaskNo = "",
                        LotNo = item.LotNo,
                        SkuNo = item.SkuNo,
                        SkuName = item.SkuName,
                        BoxType = item.BoxType,
                        Qty = item.Qty,
                        TaskType = (TaskTypeEnum)item.TaskType,
                    };
                    _db.Insertable(orderAdd).ExecuteCommand();
               //}
            }
            return new ResponseModel() { StatusCode = 0, Msg = "插入成功" };
        }
        catch (Exception ex)
        {
            return new ResponseModel() { StatusCode = -1, Msg = ex.Message };
        }
    }

}