11111111

IPC-610

2025-01-15 b4083a6b047fc9e0964133c87227213c5154e37a

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

@@ -85,7 +85,7 @@
                result.Msg = "任务:" + models.TaskNo + ";已存在!";
                return result;
            }
            if (models.TaskType == "0")
            if (models.TaskType == "0" && models.TaskType == "0")
            {
                models.Order = 1;
            }
@@ -93,11 +93,30 @@
            {
                models.Order = 2;
            }
            Enum type;
            var bale = "0";
            if (models.TaskType == "0" )
            {
                type = TaskTypeEnum.In;
            }
            else if (models.TaskType == "1")
            {
                type = TaskTypeEnum.Out;
            }
            else if (models.TaskType == "3")
            {
                type = TaskTypeEnum.In;
                bale = "1";//裹包
            }
            else
            {
                type = TaskTypeEnum.Move;
            }
            //新增任务
            var taskAdd = new WcsTask()
            {
                TaskNo = models.TaskNo,
                TaskType = TaskTypeEnum.Out,
                TaskType = (TaskTypeEnum?)type,
                Status = TaskStatusEnum.Wait,
                //IsSuccess =TaskSuccessEnum.Success,
                Levels = 999,
@@ -107,6 +126,8 @@
                EndLocate = models.EndLocate,
                EndRoadway= models.EndRoadway,
                PalletNo = models.PalletNo,
                IsBale = bale,


                //LotNo =models.LotNo,
                //SkuNo=models.SkuNo,
@@ -124,7 +145,7 @@
    }

    /// <summary>
    /// WCS接收WMS下发的入库单任务
    /// WCS接收WMS下发的出入库单任务
    /// </summary>
    /// <param name="models"></param>
    /// <returns></returns>
@@ -137,12 +158,17 @@
        {
            foreach (var item in models)
            {
                string str = JsonConvert.SerializeObject(models);
                Log.Information("接收WMS推送的箱码信息：" + str);
                // 验证任务是否已存在
                //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()
                //var taskid = _db.Queryable<WcsOderTask>().OrderByDescending(w=>w.CreateTime).First();
                //int newid = (int)taskid.Id + 1;
                var orderAdd = new WcsOderTask()
                    {
                        
                        OrderNo = item.OrderNo,
                        TaskNo = "",
                        LotNo = item.LotNo,
@@ -151,6 +177,7 @@
                        BoxType = item.BoxType,
                        Qty = item.Qty,
                        TaskType = (TaskTypeEnum)item.TaskType,
                        CreateTime = DateTime.Now,
                    };
                    _db.Insertable(orderAdd).ExecuteCommand();
               //}
@@ -210,7 +237,7 @@
                }
                if (item.DelistList2.Count == 0)
                {
                    throw new Exception("值码集合不能为空");
                    throw new Exception("支码集合不能为空");
                }
                //二级码
                foreach (var item2 in item.DelistList2)
@@ -227,6 +254,11 @@
                    {
                        throw new Exception("生产日期或失效日期格式错误");
                    };
                    DateTime? stortime = null;
                    if (!string.IsNullOrWhiteSpace(models.StoreTime))
                    {
                        stortime = DateTime.Parse(models.StoreTime);
                    }

                    var boxAdd = new WcsBoxInfo()
                    {
@@ -244,7 +276,7 @@
                        //InspectStatus = models.InspectStatus，
                        ProductionTime = proTime,
                        ExpirationTime = expTime,
                        StoreTime = DateTime.Parse(models.StoreTime),
                        StoreTime = stortime,
                        EndLotFlag = string.IsNullOrWhiteSpace(models.EndBatchMark) ? "0" : models.EndBatchMark,

                        BoxNo2 = item.BoxNo2,
@@ -276,4 +308,42 @@
        }
    }

    /// <summary>
    /// WCS接受赋码系统推送的箱码移除
    /// </summary>
    /// <param name="models">箱码信息</param>
    /// <returns>反馈信息</returns>
    [HttpPost]
    [AllowAnonymous]
    public ResponseFuMaModel DelgatesHttpBoxInfo(FumaBoxInfoInput models)
    {

        try
        {
            string str = JsonConvert.SerializeObject(models);
            Log.Information("接收赋码推送的箱码移除：" + str);
            var num = _db.Queryable<WcsBoxInfo>().Where(m => m.BoxNo == models.BoxNo && m.IsDelete == false).ToList();
            if (num.Count > 0)
            {
                //WCS存在箱码信息，更新箱码信息(需判断箱码是否已组盘入库)
                var num2 = num.Count(m => m.Status != "0" || !string.IsNullOrWhiteSpace(m.PalletNo));
                if (num2 > 0)
                {
                    throw new Exception("该箱已盘入库，不可更新信息");
                }
            }
            if (num.Count == 0)
            {
                throw new Exception("未找到该箱码，箱码移除失败！");
            }

            _db.Deleteable(num).ExecuteCommand();
            return new ResponseFuMaModel() { Success = "0", Message = "移除箱码成功" };
        }
        catch (Exception ex)
        {
            return new ResponseFuMaModel() { Success = "-1", Message = ex.Message };
        }
    }

}