11111111111

liudl

2025-01-20 b1404f7bc9945d91e292791a868cbb306cf7935d

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

@@ -1,4 +1,5 @@
using DocumentFormat.OpenXml.Presentation;
using Dm.filter;
using DocumentFormat.OpenXml.Presentation;
using Elastic.Clients.Elasticsearch;
using Furion.Logging;
using Newtonsoft.Json;
@@ -158,12 +159,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,
@@ -172,6 +178,8 @@
                        BoxType = item.BoxType,
                        Qty = item.Qty,
                        TaskType = (TaskTypeEnum)item.TaskType,
                        CreateTime = DateTime.Now,
                        Status = TaskStatusEnum.Wait,
                    };
                    _db.Insertable(orderAdd).ExecuteCommand();
               //}
@@ -262,6 +270,7 @@
                        SkuName = models.SkuName,
                        Standard = models.Standard,
                        LotNo = models.LotNo,
                        LineNo = models.LineNo,                 // 产线号或产线名称
                        Qty = item2.Qty,
                        FullQty = models.FullQty,
                        //SupplierLot = models.SupplierLot,
@@ -277,7 +286,7 @@
                        BoxNo3 = item2.BoxNo3,
                        QtyCount = item2.QtyCount,
                        QtyOrd = item2.QtyOrd,

                        
                        Status = "0",
                        Level = level,

@@ -340,4 +349,53 @@
        }
    }

    /// <summary>
    /// WCS接受赋码系统推送的结批总数量
    /// </summary>
    /// <param name="models">结批数量信息</param>
    /// <returns>反馈信息</returns>
    [HttpPost]
    [AllowAnonymous]
    public ResponseFuMaModel HttpTotalNum(FumaJiepiModel models)
    {

        try
        {
            string str = JsonConvert.SerializeObject(models);
            Log.Information("接收赋码推送的完工结批总数量：" + str);
            //查看赋码下发的任务信息是否正在分拣
            var num = _db.Queryable<WcsCheckTask>().Where(m => m.SkuNo == models.SkuNo &&m.LotNo == models.LotNo && m.Status == "1").ToList();
            if (num.Count < 1)
            {
                return new ResponseFuMaModel() { Success = "-1", Message = "该批次未进行分拣或已结批" };
            }

            //获取包装数量
            int Fqty = int.Parse(models.FinishQty);
            var boxinfolog = _db.Queryable<WcsBoxInfoLog>().Where(m => m.SkuNo == models.SkuNo && m.LotNo == models.LotNo && m.BitBoxMark == "0").First();
            if (boxinfolog == null)
            {
                var boxinfo = _db.Queryable<WcsBoxInfo>().Where(m => m.SkuNo == models.SkuNo && m.LotNo == models.LotNo && m.BitBoxMark == "0").First();
                Fqty = (int)(Fqty /boxinfo.QtyCount);
            }
            else
            {
                Fqty = (int)(Fqty / boxinfolog.QtyCount);
            }
            
            //写入该任务完成数量
            foreach (var item in num)
            {
                item.FinishQty = Fqty;
            }
            _db.Updateable(num).ExecuteCommand();

            return new ResponseFuMaModel() { Success = "0", Message = "接受完工结批数量成功" };
        }
        catch (Exception ex)
        {
            return new ResponseFuMaModel() { Success = "-1", Message = ex.Message };
        }
    }

}