Merge branch 'master' of http://47.95.120.53:8083/r/WCSNet6

chengsc

2024-11-04 50f6cb0f96f04f505b9493f7621d8e49ad5add9d

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

@@ -1,4 +1,8 @@
using Elastic.Clients.Elasticsearch;
using DocumentFormat.OpenXml.Presentation;
using Elastic.Clients.Elasticsearch;
using Furion.Logging;
using Newtonsoft.Json;
using System;
using System.Diagnostics.CodeAnalysis;
using System.Linq;
using System.Text;
@@ -96,6 +100,7 @@
                TaskType = TaskTypeEnum.Out,
                Status = TaskStatusEnum.Wait,
                //IsSuccess =TaskSuccessEnum.Success,
                Levels = 999,
                Origin = "WMS",
                StartRoadway= models.StartRoadway,
                StartLocate = models.StartLocate,
@@ -123,6 +128,7 @@
    /// </summary>
    /// <param name="models"></param>
    /// <returns></returns>
    [HttpPost]
    [AllowAnonymous]
    public ResponseModel AddOrderTask(List<ResponseOrderTaskModel> models)
    {
@@ -157,4 +163,117 @@
        }
    }


    /// <summary>
    /// WCS接受赋码系统推送的箱码信息
    /// </summary>
    /// <param name="models">箱码信息</param>
    /// <returns>反馈信息</returns>
    [HttpPost]
    [AllowAnonymous]
    public ResponseFuMaModel AddHttpBoxInfo(FumaBoxInfoInput models)
    {
        
        try
        {
            string str = JsonConvert.SerializeObject(models);
            Log.Information("接收赋码推送的箱码信息："+str);
            if (models.Origin != "赋码")
            {
                throw new Exception("来源未识别");
            }
            var num = _db.Queryable<WcsBoxInfo>().Where(m=>m.BoxNo == models.BoxNo && m.IsDelete == false).ToList();
            var type = "add";
            if (num.Count>0)
            {
                //WCS存在箱码信息，更新箱码信息(需判断箱码是否已组盘入库)
                var num2 = num.Count(m => m.Status != "0" || !string.IsNullOrWhiteSpace(m.PalletNo));
                if (num2 > 0)
                {
                    throw new Exception("该箱已入盘入库，不可更新信息");
                }
                type = "edit";
            }
            
            if (models.DelistList.Count == 0) 
            {
                throw new Exception("盒码集合不能为空");
            }
            
            var listBox = new List<WcsBoxInfo>();
            foreach (var item in models.DelistList)
            {
                var level = "3";
                if (string.IsNullOrWhiteSpace(item.BoxNo2))
                {
                    level = "2";
                }
                if (item.DelistList2.Count == 0)
                {
                    throw new Exception("值码集合不能为空");
                }
                //二级码
                foreach (var item2 in item.DelistList2)
                {
                    if (string.IsNullOrWhiteSpace(models.ProductionTime) || string.IsNullOrWhiteSpace(models.ExpirationTime))
                    {
                        throw new Exception("生产日期或失效日期不能为空");
                    }
                    DateTime proTime;
                    DateTime expTime;
                    var isValid = DateTime.TryParse(models.ProductionTime, out proTime);
                    var isValid2 = DateTime.TryParse(models.ExpirationTime, out expTime);
                    if (!isValid || !isValid2)
                    {
                        throw new Exception("生产日期或失效日期格式错误");
                    };

                    var boxAdd = new WcsBoxInfo()
                    {
                        BoxNo = models.BoxNo,
                        //OrderNo = models.OrderNo,
                        SkuNo = models.SkuNo,
                        SkuName = models.SkuName,
                        Standard = models.Standard,
                        LotNo = models.LotNo,
                        Qty = item2.Qty,
                        FullQty = models.FullQty,
                        //SupplierLot = models.SupplierLot,
                        InsPectMark = models.InsPectMark,
                        BitBoxMark = models.BitBoxMark,
                        //InspectStatus = models.InspectStatus，
                        ProductionTime = proTime,
                        ExpirationTime = expTime,
                        StoreTime = DateTime.Parse(models.StoreTime),
                        EndLotFlag = string.IsNullOrWhiteSpace(models.EndBatchMark) ? "0" : models.EndBatchMark,

                        BoxNo2 = item.BoxNo2,
                        BoxNo3 = item2.BoxNo3,
                        QtyCount = item2.QtyCount,
                        QtyOrd = item2.QtyOrd,

                        Status = "0",
                        Level = level,

                        IsDelete = false
                    };
                    listBox.Add(boxAdd);
                }

            }
            _db.Insertable(listBox).ExecuteCommand();
            if (type == "edit")
            {
                //gen
                _db.Deleteable(num).ExecuteCommand();
                return new ResponseFuMaModel() { Success = "0", Message = "更新成功" };
            }
            return new ResponseFuMaModel() { Success = "0", Message = "插入成功" };
        }
        catch (Exception ex)
        {
            return new ResponseFuMaModel() { Success = "-1", Message = ex.Message };
        }
    }

}