合肥佳通优化

lss

2025-05-27 59f836bf0eb00b7707c74fe8edb8fa7662c871ab

 HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/api/ApiHelper.cs

@@ -6,6 +6,7 @@
using HH.WCS.JiaTong.wms;
using Newtonsoft.Json;
using NLog.Fluent;
using S7.Net;
using SqlSugar;
using System;
using System.Collections.Generic;
@@ -52,62 +53,61 @@
            try
            {
                var db = new SqlHelper<object>().GetInstance();
                string CntrCode = "";//托盘编码
                string ItemCode = "";//物料编码
                if (partData != null)
                {
                    CntrCode = partData.rfid;//托盘编码
                    ItemCode = partData.partNumber;//物料编码
                }
                string Start = ""; //取货点
                string CntrCode = partData.rfid;//托盘编码
                string ItemCode = partData.partNumber;//物料编码
                string End = "";
                string areacode = "";
                string note = ""; //立库下发任务需要通知mes接口物料到位，用备注自动进行区分
                                  //根据物料获取对应库区
                #region 根据物料确认出库来源
                var iteminfo = db.Queryable<TN_Material>().Where(a => a.S_ITEM_CODE.Trim() == ItemCode).First();
                if (iteminfo != null)
                {
                    //LogHelper.Info($"Createtask==>物料数据:{JsonConvert.SerializeObject(iteminfo)}");
                    areacode = iteminfo.S_WH_CODE;
                }

                if (string.IsNullOrEmpty(areacode))
                {
                    LogHelper.Info($"Createtask==>根据物料编码:{ItemCode}未能找到物料来源，需同步物料数据");
                    result.code = "1";
                    result.msg = $"根据物料编码:{ItemCode}未能找到物料来源，需同步物料数据";
                    AddErrorInfo("寻找出库区失败", result.msg);
                    return result;
                }
                //var task = db.Queryable<WCSTask>().Where(a => a.S_EQ_NO.Trim() == taskData.taskNum).First();
                //if (task != null)
                #region 根据任务来源字段判断库区来源来源
                //var iteminfo = db.Queryable<TN_Material>().Where(a => a.S_ITEM_CODE.Trim() == ItemCode).First();
                //if (iteminfo != null)
                //{
                //    LogHelper.Info($"Createtask==> 任务号{taskData.taskNum},该任务已经存在，不允许创建任务");
                //    //LogHelper.Info($"Createtask==>物料数据:{JsonConvert.SerializeObject(iteminfo)}");
                //    areacode = iteminfo.S_WH_CODE;
                //}

                //if (string.IsNullOrEmpty(areacode))
                //{
                //    LogHelper.Info($"Createtask==>根据物料编码:{ItemCode}未能找到物料来源，需同步物料数据");
                //    result.code = "1";
                //    result.msg = $"任务号{taskData.taskNum},该任务已经存在，不允许创建任务";
                //    result.msg = $"根据物料编码:{ItemCode}未能找到物料来源，需同步物料数据";
                //    AddErrorInfo("寻找出库区失败", result.msg);
                //    return result;
                //}
                int n_type = 0;  //任务来源 1.钢丝立库  2.胶片库  3.预备库 ,4.原材料库,通过物料确认任务来源

                switch (areacode)
                int n_type = 0;  //任务来源 1.密炼立库  3.预备库 ,4.原材料库
                string Source = "";
                switch (taskData.source)
                {
                    case "ML":
                        n_type = 1;
                        break;
                    case "JP":
                        n_type = 2;
                        Source = "密炼";
                        break;
                    case "YBK":
                        n_type = 3;
                        Source = "预备库";
                        break;
                    case "wmwhse1":
                    case "YCL":
                        n_type = 4;
                        Source = "原材料";
                        break;
                }
                LogHelper.Info($"Createtask==>任务类型:{n_type}");
                Console.WriteLine($"Createtask==>任务来源:{n_type}");
                if (n_type == 0)
                {
                    result.code = "1";
                    result.msg = $"物料库区:{areacode}属于未定义库区，请检查物料表重新定义物料库区";
                    AddErrorInfo("物料库区未定义", result.msg);
                    result.msg = $"任务来源:{taskData.source}属于未定义库区，请检查物料来源是否属于约定字段";
                    AddErrorInfo("任务来源未定义", result.msg);
                    return result;
                }


                #endregion

                Location endloc = new Location();
@@ -121,7 +121,7 @@
                    {
                        //创建托盘物料绑定信息，并计算终点货位
                        Start = taskData.pickStation;
                        if (CreateCntrIteminfo(Start, CntrCode, ItemCode, partData.partDesc, partData.partType, partData.lotNumber, partData.unit, partData.weight, taskData.carrierType, taskData.grade))
                        if (CreateCntrIteminfo(partData, taskData))
                        {
                            endloc = Computeloc(CntrCode, taskData.dropStation, taskData.carrierType);
                            if (endloc != null)
@@ -132,7 +132,7 @@
                            {
                                result.code = "1";
                                result.msg = $"机台编码:{taskData.dropStation}，未找到可用货位";
                                AddErrorInfo("寻找出库货位失败", result.msg);
                                AddErrorInfo("寻找出库货位失败", result.msg, Source);
                                return result;
                            }
                        }
@@ -140,19 +140,20 @@
                        {
                            result.code = "1";
                            result.msg = "创建托盘物料信息失败";
                            AddErrorInfo("创建托盘失败", result.msg);
                            AddErrorInfo("创建托盘失败", result.msg, Source);
                            return result;
                        }
                    }
                    else
                    {
                        LogHelper.Info($"Putin==> 任务起点:{taskData.pickStation}找不到对应货位，请检查货位表");

                        result.code = "1";
                        result.msg = $"Putin==> 任务起点:{taskData.pickStation}找不到对应货位，请检查货位表";
                        AddErrorInfo("货位查找失败", result.msg);
                        LogHelper.Info($"Putin==> {result.msg}");
                        AddErrorInfo("货位查找失败", result.msg, Source);
                    }
                }
                else if (taskData.taskType == 2)//入库流程，直接使用起点货位和终点货位生成任务
                else if (taskData.taskType == 2)//入库流程，直接使用起点货位和终点货位生成任务，起点需要有托盘
                {
                    startloc = db.Queryable<Location>().Where(a => a.S_CODE.Trim() == taskData.pickStation).First();
                    if (startloc != null)
@@ -167,10 +168,16 @@
                        {
                            result.code = "1";
                            result.msg = $"根据起点{Start},未找到托盘货位绑定关系";
                            AddErrorInfo("托盘查找失败", result.msg);
                            AddErrorInfo("托盘查找失败", result.msg, Source);
                            return result;
                        }

                    }
                    //判断是否是空托回库
                    var CntrItem = db.Queryable<CntrItemDetail>().Where(a => a.S_CNTR_CODE.Trim() == CntrCode).First();
                    if (CntrItem == null)
                    {
                        note = "空托回库";//井松空托回库，需要与叠盘机安全交互
                    }
                    endloc = db.Queryable<Location>().Where(a => a.S_CODE.Trim() == taskData.dropStation).First();
                    if (endloc != null)
@@ -181,7 +188,7 @@
                    {
                        result.code = "1";
                        result.msg = $"根据终点{End},找不到对应货位，请检查货位表";
                        AddErrorInfo("货位查找失败", result.msg);
                        AddErrorInfo("货位查找失败", result.msg, Source);
                        return result;
                    }
                }
@@ -194,10 +201,24 @@
                    {
                        Start = taskData.pickStation;
                    }
                    else
                    {
                        result.code = "1";
                        result.msg = $"根据起点{taskData.pickStation},找不到对应货位，请检查货位表";
                        AddErrorInfo("货位查找失败", result.msg, Source);
                        return result;
                    }
                    endloc = db.Queryable<Location>().Where(a => a.S_CODE.Trim() == taskData.dropStation).First();
                    if (endloc != null)
                    {
                        End = taskData.dropStation;
                    }
                    else
                    {
                        result.code = "1";
                        result.msg = $"根据终点{taskData.dropStation},找不到对应货位，请检查货位表";
                        AddErrorInfo("货位查找失败", result.msg, Source);
                        return result;
                    }
                }
                else if (taskData.taskType == 4)//原材料库需要判断是否需要分配电梯任务,创建分档任务
@@ -222,7 +243,7 @@
                        {
                            result.code = "1";
                            result.msg = $"创建任务失败，起点:{startloc.S_AREA_CODE},终点：{endloc.S_AREA_CODE}未找到对应库区";
                            AddErrorInfo("货位查找失败", result.msg);
                            AddErrorInfo("货位查找失败", result.msg, Source);
                            return result;
                        }
                        if (startArea.N_FLOOR == endArea.N_FLOOR)
@@ -246,7 +267,9 @@
                                N_START_LAYER = 1,
                                N_END_LAYER = 1,
                                S_WMS_NO = taskData.wmsTaskNo,
                                Z_TYPE = n_type
                                Z_TYPE = n_type,


                            };
                            LogHelper.Info("创建任务：" + JsonConvert.SerializeObject(wcsTask), "CreateTask");
                            if (WCSHelper.CreateTask(wcsTask))
@@ -281,7 +304,8 @@
                                N_START_LAYER = 1,
                                N_END_LAYER = 1,
                                S_WMS_NO = taskData.wmsTaskNo,
                                Z_TYPE = n_type
                                Z_TYPE = n_type,
                                S_MES_NO = taskData.mesTaskNo
                            };
                            var wcsTask1 = new WCSTask
                            {
@@ -301,8 +325,8 @@
                                S_WMS_NO = taskData.wmsTaskNo,
                                N_START_LAYER = 1,
                                N_END_LAYER = 1,
                                Z_TYPE = n_type

                                Z_TYPE = n_type,
                                S_MES_NO = taskData.mesTaskNo

                            };

@@ -322,27 +346,41 @@
                        return result;
                    }
                }
                else if (taskData.taskType == 5)//移库流程，直接使用起点货位和终点货位生成任务，
                else if (taskData.taskType == 5)//移库流程，直接使用起点货位和终点货位生成任务，并绑定托盘
                {
                    //创建托盘物料绑定信息，并计算终点货位
                    if (CreateCntrIteminfo(taskData.pickStation, CntrCode, ItemCode, partData.partDesc, partData.partType, partData.lotNumber, partData.unit, partData.weight, taskData.carrierType, taskData.grade))
                    if (CreateCntrIteminfo(partData, taskData))
                    {
                        startloc = db.Queryable<Location>().Where(a => a.S_CODE.Trim() == taskData.pickStation).First();
                        if (startloc != null)
                        {
                            Start = taskData.pickStation;
                        }
                        else
                        {
                            result.code = "1";
                            result.msg = $"根据起点{taskData.pickStation},找不到对应货位，请检查货位表";
                            AddErrorInfo("货位查找失败", result.msg, Source);
                            return result;
                        }
                        endloc = db.Queryable<Location>().Where(a => a.S_CODE.Trim() == taskData.dropStation).First();
                        if (endloc != null)
                        {
                            End = taskData.dropStation;
                        }
                        else
                        {
                            result.code = "1";
                            result.msg = $"根据终点{taskData.dropStation},找不到对应货位，请检查货位表";
                            AddErrorInfo("货位查找失败", result.msg, Source);
                            return result;
                        }
                    }
                    else
                    {
                        result.code = "1";
                        result.msg = "创建托盘物料信息失败";
                        AddErrorInfo("创建托盘失败", result.msg);
                        AddErrorInfo("创建托盘失败", result.msg, Source);
                        return result;
                    }

@@ -364,7 +402,7 @@
                        {
                            result.code = "1";
                            result.msg = $"根据托盘{partData.rfid},未找到托盘货位绑定关系";
                            AddErrorInfo("货位查找失败", result.msg);
                            AddErrorInfo("货位查找失败", result.msg, Source);
                            return result;
                        }
                    }
@@ -377,7 +415,7 @@
                    {
                        result.code = "1";
                        result.msg = $"根据终点{End},找不到对应货位，请检查货位表";
                        AddErrorInfo("货位查找失败", result.msg);
                        AddErrorInfo("货位查找失败", result.msg, Source);
                        return result;
                    }
                }
@@ -386,7 +424,7 @@
                {
                    note = "异常库区入库";
                    //创建托盘物料绑定信息，并计算终点货位
                    if (CreateCntrIteminfo(taskData.pickStation, CntrCode, ItemCode, partData.partDesc, partData.partType, partData.lotNumber, partData.unit, partData.weight, taskData.carrierType, taskData.grade))
                    if (CreateCntrIteminfo(partData, taskData))
                    {
                        startloc = db.Queryable<Location>().Where(a => a.S_CODE.Trim() == taskData.pickStation).First();
                        if (startloc != null)
@@ -405,7 +443,7 @@
                            {
                                result.code = "1";
                                result.msg = $"终点库区：{taskData.dropStation}无可用货位";
                                AddErrorInfo("查找库区失败", result.msg);
                                AddErrorInfo("查找库区失败", result.msg, Source);
                                return result;
                            }

@@ -414,7 +452,7 @@
                        {
                            result.code = "1";
                            result.msg = $"根据终点库区：{taskData.dropStation},未找到对应货位";
                            AddErrorInfo("查找库区失败", result.msg);
                            AddErrorInfo("查找库区失败", result.msg, Source);
                            return result;
                        }
                    }
@@ -422,7 +460,35 @@
                    {
                        result.code = "1";
                        result.msg = "创建托盘物料信息失败";
                        AddErrorInfo("创建托盘失败", result.msg);
                        AddErrorInfo("创建托盘失败", result.msg, Source);
                        return result;
                    }
                }
                else if (taskData.taskType == 8)//叠盘机空托回库
                {
                    note = "空托回库";//井松空托回库，需要与叠盘机安全交互
                    startloc = db.Queryable<Location>().Where(a => a.S_CODE.Trim() == taskData.pickStation).First();
                    if (startloc != null)
                    {
                        Start = startloc.S_CODE;
                    }
                    else
                    {
                        result.code = "1";
                        result.msg = $"根据起点:{taskData.pickStation},找不到对应货位，请检查货位表";
                        AddErrorInfo("货位查找失败", result.msg, Source);
                        return result;
                    }
                    endloc = db.Queryable<Location>().Where(a => a.S_CODE.Trim() == taskData.dropStation).First();
                    if (endloc != null)
                    {
                        End = taskData.dropStation;
                    }
                    else
                    {
                        result.code = "1";
                        result.msg = $"根据终点:{End},找不到对应货位，请检查货位表";
                        AddErrorInfo("货位查找失败", result.msg, Source);
                        return result;
                    }
                }
@@ -431,7 +497,7 @@
                    LogHelper.Info($"Createtask==> 任务类型有误");
                    result.code = "1";
                    result.msg = "任务类型：{taskData.taskType}不在规定范围内";
                    AddErrorInfo("任务类型错误", result.msg);
                    AddErrorInfo("任务类型错误", result.msg, Source);
                }
                if (taskData.taskType != 4)
                {
@@ -474,7 +540,8 @@
                            N_START_LAYER = 1,
                            N_END_LAYER = 1,
                            S_WMS_NO = taskData.wmsTaskNo,
                            S_NOTE = note
                            S_NOTE = note,
                            S_MES_NO = taskData.mesTaskNo

                        };
                        LogHelper.Info("创建任务：" + JsonConvert.SerializeObject(wcsTask), "CreateTask");
@@ -565,7 +632,7 @@
                LogHelper.Info($"AllowThrough==> 参数为null");
                result.code = "1";
                result.msg = "参数为null值，请检查参数格式";
                AddErrorInfo("参数为空", result.msg);
                AddErrorInfo("参数为空", result.msg, "", model.task_no);
                return result;
            }

@@ -587,7 +654,7 @@
                {
                    result.code = "1";
                    result.msg = $"根据下发任务号{model.task_no}未找到对应任务";
                    AddErrorInfo("未找到任务", result.msg);
                    AddErrorInfo("未找到任务", result.msg, "", model.task_no);
                    return result;
                }
                return result;
@@ -620,7 +687,7 @@
            try
            {
                //创建托盘数据绑定关系
                if (ContainerHelper.CreateCntrItem(model.Rfid, model.PartNumber, model.PartDesc, model.LotNumber, model.Weight))
                if (ContainerHelper.CreateCntrItem(model.Rfid, model.PartNumber, model.PartDesc, model.LotNumber, model.Weight, model.Qty, model.ProductionTime, model.MaturityTime))
                {
                    //创建成功流程
                }
@@ -628,7 +695,7 @@
                {
                    result.code = "1";
                    result.msg = "产出信息下发失败，托盘物料绑定关系创建失败";
                    AddErrorInfo("创建绑定关系失败", result.msg);
                    AddErrorInfo("创建绑定关系失败", result.msg, "Mes");
                    return result;
                }
                return result;
@@ -653,40 +720,49 @@
        internal static Result Putin(Putin model, int n_type)
        {
            Result result = new Result() { code = "200", msg = "入平库任务下发成功" };
            string Source = "Mes";
            if (n_type == 0)
            {
                Source = "PDA";
            }
            if (model == null)
            {
                result.code = "1";
                result.msg = "参数为null";
                AddErrorInfo("参数为空", result.msg);
                AddErrorInfo("参数为空", result.msg, Source);
                return result;
            }
            var db = new SqlHelper<object>().GetInstance();
            Location loc = new Location();

            string Start = model.InitialLocation;  //起点货位
            string itemcode = model.PartNumber;    //物料编码
            string areacode = "";
            try
            {
                #region 判断托盘绑定货位是否和下发绑定起点相同

                #region 判断托盘绑定货位是否和下发绑定起点相同,如果没绑定托盘则绑定托盘
                var CntrLoc = db.Queryable<LocCntrRel>().Where(a => a.S_CNTR_CODE.Trim() == model.Rfid).First();
                if (CntrLoc != null)
                {
                    if (CntrLoc.S_LOC_CODE != Start)
                    {
                        LogHelper.Info($"ItemBack：创建任务失败，托盘:{model.Rfid}绑定位置不是起点：{Start}");

                        result.code = "1";
                        result.msg = $"创建任务失败，托盘:{model.Rfid}绑定位置不是起点：{Start}";
                        AddErrorInfo("托盘绑定位置不同", result.msg);
                        LogHelper.Info($"ItemBack：{result.msg}");
                        AddErrorInfo("托盘绑定位置不同", result.msg, Source);
                        return result;
                    }
                }
                else
                {
                    LogHelper.Info($"ItemBack：创建任务失败，托盘:{model.Rfid}未找到绑定货位");
                    result.code = "1";
                    result.msg = $"创建任务失败，托盘:{model.Rfid}未找到绑定货位";
                    AddErrorInfo("查找托盘货位失败", result.msg);
                    return result;
                    LocationHelper.BindingLoc(Start, new List<string> { model.Rfid });
                    //LogHelper.Info($"ItemBack：创建任务失败，托盘:{model.Rfid}未找到绑定货位");
                    //result.code = "1";
                    //result.msg = $"创建任务失败，托盘:{model.Rfid}未找到绑定货位";
                    //AddErrorInfo("查找托盘货位失败", result.msg);
                    //return result;
                }
                // Console.WriteLine("查询货位绑定关系");
                //判断托盘与货位是否有绑定关系，如果没有则进行绑定
@@ -713,48 +789,52 @@
                //}
                #endregion


                #region 根据起点货位的仓库编码 获取平库编码,并计算入库货位
                string End = "";
                var startloc = db.Queryable<Location>().Where(a => a.S_CODE.Trim() == Start).First();
                if (startloc != null)
                {
                    //根据仓库 计算库区
                    if (startloc.S_WH_CODE == "101")
                    var whcode = Settings.wareLoc.Where(a => a.AreaCode == startloc.S_WH_CODE).FirstOrDefault();
                    if (whcode != null)
                    {
                        areacode = "PMGQ";
                        areacode = whcode.PMK;
                    }
                    else
                    {
                        areacode = "PK2";
                        result.code = "1";
                        result.msg = $"根据起点仓库编码：{startloc.S_WH_CODE}未找到对应配置文件";
                        LogHelper.Info($"Putin==> {result.msg}");
                        AddErrorInfo("查找库区失败", result.msg, Source);
                    }
                    areacode = "FLPK";

                    //判断有无相同物料排
                    loc = StorageCompute(itemcode, areacode);
                    if (loc == null)
                    {
                        //无相同物料排找空排
                        loc = emptyRow(areacode);
                    }
                    //if (loc == null)
                    //{
                    //    //无相同物料排找空排
                    //    loc = emptyRow(areacode);
                    //}
                    if (loc != null)
                    {
                        End = loc.S_CODE;
                    }
                    else
                    {
                        LogHelper.Info($"Putin==>库区:{areacode}无可用货位");

                        result.code = "1";
                        result.msg = $"库区:{areacode}无可用货位";
                        AddErrorInfo("查找库区失败", result.msg);
                        LogHelper.Info($"Putin==> {result.msg}");
                        AddErrorInfo("查找库区失败", result.msg, Source);
                    }
                }
                else
                {
                    LogHelper.Info($"Putin==> 任务起点:{Start}找不到对应货位，请检查货位表");

                    result.code = "1";
                    result.msg = $"任务起点:{Start}找不到对应货位，请检查货位表";
                    AddErrorInfo("查找货位失败", result.msg);
                    LogHelper.Info($"Putin==> {result.msg}");
                    AddErrorInfo("查找货位失败", result.msg, Source);
                }
                #endregion

@@ -765,7 +845,7 @@
                    {
                        result.code = "1";
                        result.msg = $"创建任务失败，起点:{Start}有锁";
                        AddErrorInfo("货位有锁", result.msg);
                        AddErrorInfo("货位有锁", result.msg, Source);
                        return result;
                    }
                    //创建wcs任务
@@ -802,6 +882,7 @@
                    return result;
                }
                #endregion

                return result;
            }
            catch (Exception ex)
@@ -811,7 +892,6 @@
                LogHelper.Error("Putin Error：" + ex.ToString(), ex);
                return result;
            }

        }

        /// <summary>
@@ -823,11 +903,16 @@
        internal static Result PutOut(PutOut model, int n_type)
        {
            Result result = new Result() { code = "200", msg = "出平库任务下发成功" };
            string Source = "Mes";
            if (n_type == 0)
            {
                Source = "PDA";
            }
            if (model == null)
            {
                result.code = "1";
                result.msg = "参数为null";
                AddErrorInfo("参数为空", result.msg);
                AddErrorInfo("参数为空", result.msg, Source);
                return result;
            }

@@ -835,6 +920,7 @@
            string Start = "";
            string End = "";
            string CntrCode = "";

            string itemcode = model.PartNumber;
            string cntrType = "";
            string areacode = "";
@@ -846,46 +932,48 @@

                #region 根据物料编码规则 计算出库库区
                //粉料从平库出库，其他物料需要从暂存区出库
                if (model.PartNumber.StartsWith("4X"))
                var locJt = db.Queryable<Location>().Where(a => a.S_AREA_CODE == model.WorkCenter).First();
                if (locJt == null)
                {
                    areacode = "FLPK";
                    cntrType = "PM";
                    result.code = "1";
                    result.msg = $"根据机台编码：{model.WorkCenter}未找到对应货位";
                    LogHelper.Info($"Putin==> {result.msg}");
                    AddErrorInfo("查找库区失败", result.msg, Source);
                }
                else
                //根据仓库 计算库区
                var whcode = Settings.wareLoc.Where(a => a.AreaCode == locJt.S_WH_CODE).FirstOrDefault();
                if (whcode != null)
                {

                    if (model.PartNumber.StartsWith("3"))
                    if (model.PartNumber.StartsWith("4X"))
                    {
                        cntrType = "RC";
                        areacode = "KJZCW";
                        areacode = whcode.PMK;
                        cntrType = "PM";
                    }
                    else
                    {
                        LogHelper.Info($"ItemBack：创建任务失败，物料号{model.PartNumber}不属于规定物料");
                        result.code = "1";
                        result.msg = $"创建任务失败，物料号{model.PartNumber}不属于规定物料";
                        AddErrorInfo("物料编码格式错误", result.msg);
                        return result;
                        if (model.PartNumber.StartsWith("3"))
                        {
                            cntrType = "RC";
                            areacode = whcode.ZCW;
                        }
                        else
                        {

                            result.code = "1";
                            result.msg = $"创建任务失败，物料号{model.PartNumber}不属于规定物料";
                            LogHelper.Info($"ItemBack：{result.msg}");
                            AddErrorInfo("物料编码格式错误", result.msg, Source);
                            return result;
                        }
                    }
                }
                //根据物料获取对应库区
                //    var iteminfo = db.Queryable<TN_Material>().Where(a => a.S_ITEM_CODE.Trim() == itemcode).First();
                //if (iteminfo != null)
                //{
                //    areacode = iteminfo.S_WH_CODE;
                //}
                //areacode = computeArea(itemcode);
                //if (string.IsNullOrEmpty(areacode))
                //{
                //    LogHelper.Info($"PutOut==> 根据物料编码:{itemcode}找不到对应库区，请检查配置文件");
                //    result.code = "1";
                //    result.msg = $"根据物料编码:{itemcode}找不到对应库区，物料表配置";
                //    AddErrorInfo("查找库区失败", result.msg);
                //}
                //if (itemcode == "测试1")
                //{
                //    areacode = "PMJP";
                //}
                else
                {
                    result.code = "1";
                    result.msg = $"根据终点库区仓库编码：{locJt.S_WH_CODE}未找到对应配置文件";
                    LogHelper.Info($"Putin==> {result.msg}");
                    AddErrorInfo("查找库区失败", result.msg, Source);
                }
                #endregion

                #region 根据物料编码计算出库货位，送往线边位置
@@ -906,10 +994,11 @@
                }
                else
                {
                    LogHelper.Info($"PutOut==> 任务物料:{itemcode}找不到对应库存");

                    result.code = "1";
                    result.msg = $"任务物料:{itemcode}找不到对应库存";
                    AddErrorInfo("查找库区失败", result.msg);
                    LogHelper.Info($"ItemBack：{result.msg}");
                    AddErrorInfo("查找库区失败", result.msg, Source);
                }
                #endregion

@@ -920,7 +1009,7 @@
                    {
                        result.code = "1";
                        result.msg = $"创建任务失败，起点{Start}有锁";
                        AddErrorInfo("货位有锁", result.msg);
                        AddErrorInfo("货位有锁", result.msg, Source);
                        return result;
                    }
                    //创建wcs任务
@@ -978,11 +1067,12 @@
        internal static Result Empty(Empty model)
        {
            Result result = new Result() { code = "200", msg = "空工装回库任务下发成功" };
            string Source = "MES";
            if (model == null)
            {
                result.code = "1";
                result.msg = "参数为null";
                AddErrorInfo("参数为空", result.msg);
                AddErrorInfo("参数为空", result.msg, Source);
                return result;
            }

@@ -1000,26 +1090,26 @@
            try
            {
                #region 判断托盘绑定货位是否和下发绑定起点相同
                var CntrLoc = db.Queryable<LocCntrRel>().Where(a => a.S_CNTR_CODE.Trim() == model.Rfid).First();
                if (CntrLoc != null)
                {
                    if (CntrLoc.S_LOC_CODE != Start)
                    {
                        LogHelper.Info($"ItemBack：创建任务失败，托盘:{model.Rfid}绑定位置不是起点：{Start}");
                        result.code = "1";
                        result.msg = $"创建任务失败，托盘:{model.Rfid}绑定位置不是起点：{Start}";
                        AddErrorInfo("托盘绑定位置不同", result.msg);
                        return result;
                    }
                }
                else
                {
                    LogHelper.Info($"ItemBack：创建任务失败，托盘:{model.Rfid}未找到绑定货位");
                    result.code = "1";
                    result.msg = $"创建任务失败，托盘:{model.Rfid}未找到绑定货位";
                    AddErrorInfo("查找托盘货位失败", result.msg);
                    return result;
                }
                //var CntrLoc = db.Queryable<LocCntrRel>().Where(a => a.S_CNTR_CODE.Trim() == model.Rfid).First();
                //if (CntrLoc != null)
                //{
                //    if (CntrLoc.S_LOC_CODE != Start)
                //    {
                //        LogHelper.Info($"ItemBack：创建任务失败，托盘:{model.Rfid}绑定位置不是起点：{Start}");
                //        result.code = "1";
                //        result.msg = $"创建任务失败，托盘:{model.Rfid}绑定位置不是起点：{Start}";
                //        AddErrorInfo("托盘绑定位置不同", result.msg);
                //        return result;
                //    }
                //}
                //else
                //{
                //    LogHelper.Info($"ItemBack：创建任务失败，托盘:{model.Rfid}未找到绑定货位");
                //    result.code = "1";
                //    result.msg = $"创建任务失败，托盘:{model.Rfid}未找到绑定货位";
                //    AddErrorInfo("查找托盘货位失败", result.msg);
                //    return result;
                //}
                #endregion

                #region 根据货位楼层判断，3楼去往叠盘位 其他的回库
@@ -1032,13 +1122,13 @@
                        var dploc = db.Queryable<Location>().Where(a => a.S_NOTE.Trim() == "叠盘" && a.N_LAYER == startloc.N_LAYER && a.S_WH_CODE.Trim() == startloc.S_WH_CODE).ToList();
                        if (dploc.Count > 0)
                        {
                            LogHelper.Info($"获取叠盘货位:{JsonConvert.SerializeObject(dploc)}");
                            // LogHelper.Info($"获取叠盘货位:{JsonConvert.SerializeObject(dploc)}");
                            loc = dploc.FindAll(a => a.N_LOCK_STATE == 0 && a.N_CURRENT_NUM < 6).OrderByDescending(a => a.N_CURRENT_NUM).FirstOrDefault();
                            if (loc == null)
                            {
                                result.code = "1";
                                result.msg = $"叠盘货位不可用";
                                AddErrorInfo("查找库区失败", result.msg);
                                AddErrorInfo("查找库区失败", result.msg, Source);
                                return result;
                            }
                            else
@@ -1048,83 +1138,103 @@
                        }
                        else
                        {
                            LogHelper.Info($"根据货位备注：叠盘，货位楼层:{startloc.N_LAYER},货位仓库:{startloc.S_WH_CODE}，找不到叠盘货位");

                            result.code = "1";
                            result.msg = $"叠盘货位不可用";
                            AddErrorInfo("查找货位失败", result.msg);
                            LogHelper.Info($"根据货位备注：叠盘，货位楼层:{startloc.N_LAYER},货位仓库:{startloc.S_WH_CODE}，找不到叠盘货位");
                            AddErrorInfo("查找货位失败", result.msg, Source);
                            return result;
                        }
                    }
                    else if (startloc.S_NOTE == "PB")
                    {
                        //找块胶堆叠区
                        var KjDploc = db.Queryable<Location>().Where(a => a.S_NOTE.Trim() == "片胶堆叠位" && a.S_WH_CODE.Trim() == startloc.S_WH_CODE).ToList();
                        if (KjDploc.Count > 0)
                        {
                            loc = KjDploc.FindAll(a => a.N_LOCK_STATE == 0 && a.N_CURRENT_NUM < 6).OrderByDescending(a => a.N_CURRENT_NUM).FirstOrDefault();
                            if (loc == null)
                            {
                                result.code = "1";
                                result.msg = $"叠盘货位不可用";
                                AddErrorInfo("查找库区失败", result.msg, Source);
                                return result;
                            }
                            else
                            {
                                endlayer = loc.N_CURRENT_NUM + 1;
                            }
                        }
                        else
                        {
                            LogHelper.Info($"根据货位备注：片胶堆叠位,货位仓库:{startloc.S_WH_CODE}，找不到叠盘货位");
                            result.code = "1";
                            result.msg = $"叠盘货位不可用";
                            AddErrorInfo("查找货位失败", result.msg, Source);
                            return result;
                        }
                    }
                    else
                    {
                        #region 根据托盘找呼叫空托任务，并获得出库库区
                        msts = WCSHelper.GetTaskBycntrcode(model.Rfid.Trim());
                        if (msts.Count() > 0)
                        #region 根据起点货位类型，获得回库库区
                        //根据仓库 计算库区
                        var whcode = Settings.wareLoc.Where(a => a.AreaCode == startloc.S_WH_CODE).FirstOrDefault();
                        if (whcode != null)
                        {
                            msts.RemoveAll(a => string.IsNullOrEmpty(a.S_CNTR_CODE));
                            mst = msts.OrderByDescending(a => a.T_CREATE).FirstOrDefault();
                        }
                        if (mst != null)
                        {
                            LogHelper.Info($"找到出库任务：{JsonConvert.SerializeObject(mst)}");
                            areacode = mst.S_START_AREA;
                            if (startloc.S_NOTE == "PM" || string.IsNullOrEmpty(startloc.S_NOTE))
                            {
                                areacode = whcode.PMK;
                            }
                        }
                        else
                        {
                            LogHelper.Info($"创建任务失败，根据托盘编码{model.Rfid}未找到托盘出库任务");
                            result.code = "1";
                            result.msg = $"创建任务失败，根据托盘编码{model.Rfid}未找到托盘出库任务";
                            AddErrorInfo("查找任务失败", result.msg);
                            return result;
                        }
                        if (string.IsNullOrEmpty(areacode))
                        {
                            LogHelper.Info($"创建任务失败，根据托盘编码{model.Rfid}找到出库任务{mst.S_CODE}的起点库区为空");
                            result.code = "1";
                            result.msg = $"创建任务失败，根据托盘编码{model.Rfid}找到出库任务{mst.S_CODE}的起点库区为空";
                            AddErrorInfo("查找库区失败", result.msg);
                            return result;
                            result.msg = $"根据起点仓库编码：{startloc.S_WH_CODE}未找到对应配置文件";
                            LogHelper.Info($"Putin==> {result.msg}");
                            AddErrorInfo("查找库区失败", result.msg, Source);
                        }
                        #endregion

                        //回库货位计算库区货位
                        loc = StorageCompute(itemcode, areacode);
                        if (loc == null)
                        {
                            loc = emptyRow(areacode);
                            if (loc == null)
                            {
                                LogHelper.Info($"库区：{areacode}没有空排");
                            }
                        }
                        else
                        {
                            LogHelper.Info($"库区:{areacode}无可用货位");
                            result.code = "1";
                            result.msg = $"库区:{areacode}无可用货位";
                            AddErrorInfo("查找货位失败", result.msg);
                            return result;
                        }
                        //if (loc == null)
                        //{
                        //    loc = emptyRow(areacode);
                        //    if (loc == null)
                        //    {
                        //        LogHelper.Info($"库区：{areacode}没有空排");
                        //    }
                        //}
                        //else
                        //{

                        //    result.code = "1";
                        //    result.msg = $"库区:{areacode}无可用货位";
                        //    LogHelper.Info($"{result.msg}");
                        //    AddErrorInfo("查找货位失败", result.msg, Source);
                        //    return result;
                        //}
                    }

                }
                else
                {
                    LogHelper.Info($"Empty==> 任务起点:{Start}找不到对应货位，请检查货位表");

                    result.code = "1";
                    result.msg = $"Empty==> 任务起点:{Start}找不到对应货位，请检查货位表";
                    AddErrorInfo("查找货位失败", result.msg);
                    LogHelper.Info($"{result.msg}");
                    AddErrorInfo("查找货位失败", result.msg, Source);
                    return result;
                }
                #endregion

                #region 创建任务
                if (!string.IsNullOrEmpty(Start) && loc != null)
                if (startloc != null && loc != null)
                {
                    if (startloc.N_LOCK_STATE != 0)
                    if (startloc.N_LOCK_STATE != 0 && loc.N_LOCK_STATE != 0)
                    {
                        result.code = "1";
                        result.msg = $"创建任务失败，起点{Start}有锁";
                        result.msg = $"创建任务失败，起点货位状态{startloc.N_LOCK_STATE},起点货位状态：{loc.N_LOCK_STATE}";
                        AddErrorInfo("货位有锁", result.msg);
                        return result;
                    }
@@ -1134,7 +1244,7 @@
                        S_CODE = WCSHelper.GenerateTaskNo(),
                        S_TYPE = "空工装回库",
                        S_EQ_NO = model.TaskNumber,
                        S_START_LOC = Start,
                        S_START_LOC = startloc.S_CODE,
                        S_END_LOC = loc.S_CODE,
                        S_START_WH = startloc.S_WH_CODE,
                        S_START_AREA = startloc.S_AREA_CODE,
@@ -1150,7 +1260,7 @@
                    LogHelper.Info("创建出平库任务：" + JsonConvert.SerializeObject(wcsTask));
                    if (WCSHelper.CreateTask(wcsTask))
                    {
                        LocationHelper.LockLoc(Start, 2);
                        LocationHelper.LockLoc(startloc.S_CODE, 2);
                        LocationHelper.LockLoc(loc.S_CODE, 1);
                        //  空托回库判断托盘有无绑定物料信息 如果有则删除
                        var itemcntr = db.Queryable<CntrItemDetail>().Where(a => a.S_CNTR_CODE.Trim() == model.Rfid).First();
@@ -1186,11 +1296,12 @@
        {
            var db = new SqlHelper<object>().GetInstance();
            Result result = new Result() { code = "200", msg = "空工装呼叫任务下发成功" };
            string Source = "MES";
            if (model == null)
            {
                result.code = "1";
                result.msg = "参数为null";
                AddErrorInfo("参数为空", result.msg);
                AddErrorInfo("参数为空", result.msg, Source);
                return result;
            }

@@ -1207,19 +1318,24 @@
            {
                #region 根据仓库编码判断库区 并计算出库货位
                var endloc = db.Queryable<Location>().Where(a => a.S_CODE.Trim() == End).First();
                //根据仓库 计算库区

                if (endloc != null)
                {
                    if (endloc.S_WH_CODE == "101")
                    var whcode = Settings.wareLoc.Where(a => a.AreaCode == endloc.S_WH_CODE).FirstOrDefault();
                    if (whcode != null)
                    {
                        // itemcode = "TP";
                        areacode = "PMGQ";
                        areacode = whcode.PMK;
                    }
                    else
                    {
                        //itemcode = "TP";
                        areacode = "PK2";
                        result.code = "1";
                        result.msg = $"根据起点仓库编码：{endloc.S_WH_CODE}未找到对应配置文件";
                        LogHelper.Info($"Putin==> {result.msg}");
                        AddErrorInfo("查找库区失败", result.msg, Source);
                    }
                    areacode = "FLPK";


                    //计算出库托盘
                    startloc = airlift(areacode, itemcode);
                    if (startloc != null)
@@ -1232,10 +1348,10 @@
                        }
                        else
                        {
                            LogHelper.Info($"callfixture:创建空工装呼叫任务==>根据货位{endloc.S_CODE}未找到托盘货位绑定关系");
                            result.code = "1";
                            result.msg = $"创建空工装呼叫任务==>根据货位{endloc.S_CODE}未找到托盘货位绑定关系";
                            AddErrorInfo("查找托盘失败", result.msg);
                            LogHelper.Info($"callfixture:{result.msg}");
                            AddErrorInfo("查找托盘失败", result.msg, Source);
                            return result;
                        }

@@ -1244,10 +1360,11 @@
                }
                else
                {
                    LogHelper.Info($"callfixture==> 任务起点:{End}找不到对应货位，请检查货位表");

                    result.code = "1";
                    result.msg = $"任务起点:{End}找不到对应货位，请检查货位表";
                    AddErrorInfo("查找货位失败", result.msg);
                    LogHelper.Info($"callfixture:{result.msg}");
                    AddErrorInfo("查找货位失败", result.msg, Source);

                }
                #endregion
@@ -1320,11 +1437,12 @@
        internal static Result ItemBack(ItemBack model)
        {
            Result result = new Result() { code = "200", msg = "余料返回任务下发成功" };
            string Source = "MES";
            if (model == null)
            {
                result.code = "1";
                result.msg = "参数为null";
                AddErrorInfo("参数为空", result.msg);
                AddErrorInfo("参数为空", result.msg, Source);
                return result;

            }
@@ -1342,28 +1460,7 @@

            try
            {
                #region 判断托盘绑定货位是否和下发绑定起点相同
                var CntrLoc = db.Queryable<LocCntrRel>().Where(a => a.S_CNTR_CODE.Trim() == model.Rfid).First();
                if (CntrLoc != null)
                {
                    if (CntrLoc.S_LOC_CODE != Start)
                    {
                        LogHelper.Info($"ItemBack：创建任务失败，托盘:{model.Rfid}绑定位置不是起点：{Start}");
                        result.code = "1";
                        result.msg = $"创建任务失败，托盘:{model.Rfid}绑定位置不是起点：{Start}";
                        AddErrorInfo("托盘绑定位置不同", result.msg);
                        return result;
                    }
                }
                else
                {
                    LogHelper.Info($"ItemBack：创建任务失败，托盘:{model.Rfid}未找到绑定货位");
                    result.code = "1";
                    result.msg = $"创建任务失败，托盘:{model.Rfid}未找到绑定货位";
                    AddErrorInfo("查找托盘货位失败", result.msg);
                    return result;
                }
                #endregion


                #region 余料返回根据托盘找出库任务
                //余料返回根据托盘找出库任务
@@ -1398,79 +1495,118 @@
                var startloc = db.Queryable<Location>().Where(a => a.S_CODE.Trim() == Start).First();
                if (startloc != null)
                {
                    //粉料直接回库，其他物料需要去对应的暂存区
                    if (model.PartNumber.StartsWith("4X"))
                    var whcode = Settings.wareLoc.Where(a => a.AreaCode == startloc.S_WH_CODE).FirstOrDefault();
                    if (whcode != null)
                    {
                        areacode = "FLPK";
                        loc = StorageCompute(itemcode, areacode);
                        if (loc == null)
                        //粉料直接回库，其他物料需要去对应的暂存区
                        if (model.PartNumber.StartsWith("4X"))
                        {
                            loc = emptyRow(areacode);
                        }
                    }
                    else
                    {
                        if (model.PartNumber.StartsWith("3"))
                        {
                            areacode = "KJYLZCW";
                            areacode = whcode.PMK;
                            loc = StorageCompute(itemcode, areacode);
                            //if (loc == null)
                            //{
                            //    loc = emptyRow(areacode);
                            //}
                        }
                        else
                        {
                            LogHelper.Info($"ItemBack：创建任务失败，物料号{model.PartNumber}不属于规定物料");
                            result.code = "1";
                            result.msg = $"创建任务失败，物料号{model.PartNumber}不属于规定物料";
                            AddErrorInfo("物料编码格式错误", result.msg);
                            return result;
                        }
                        var EndLocs = db.Queryable<Location>().Where(a => a.S_AREA_CODE.Trim() == areacode).ToList();
                        if (EndLocs.Count > 0)
                        {
                            loc = EndLocs.Find(a => a.N_CURRENT_NUM == 0 && a.N_LOCK_STATE == 0);
                            if (loc != null)
                            #region 判断托盘绑定货位是否和下发绑定起点相同
                            var CntrLoc = db.Queryable<LocCntrRel>().Where(a => a.S_CNTR_CODE.Trim() == model.Rfid).First();
                            if (CntrLoc != null)
                            {
                                End = loc.S_CODE;
                                if (CntrLoc.S_LOC_CODE != Start)
                                {

                                    result.code = "1";
                                    result.msg = $"创建任务失败，托盘:{model.Rfid}绑定位置不是起点：{Start}";
                                    LogHelper.Info($"ItemBack：{result.msg}");
                                    AddErrorInfo("托盘绑定位置不同", result.msg, Source);
                                    return result;
                                }
                            }
                            else
                            {

                                result.code = "1";
                                result.msg = $"创建任务失败，托盘:{model.Rfid}未找到绑定货位";
                                LogHelper.Info($"ItemBack：{result.msg}");
                                AddErrorInfo("查找托盘货位失败", result.msg, Source);
                                return result;
                            }
                            #endregion

                            if (model.PartNumber.StartsWith("3"))
                            {
                                areacode = whcode.ZCW;
                            }
                            else
                            {

                                result.code = "1";
                                result.msg = $"创建任务失败，物料号{model.PartNumber}不属于规定物料";
                                LogHelper.Info($"ItemBack：{result.msg}");
                                AddErrorInfo("物料编码格式错误", result.msg, Source);
                                return result;
                            }
                            var EndLocs = db.Queryable<Location>().Where(a => a.S_AREA_CODE.Trim() == areacode).ToList();
                            if (EndLocs.Count > 0)
                            {
                                loc = EndLocs.Find(a => a.N_CURRENT_NUM == 0 && a.N_LOCK_STATE == 0);
                                if (loc != null)
                                {
                                    End = loc.S_CODE;
                                }
                                else
                                {
                                    result.code = "1";
                                    result.msg = $"终点库区：{areacode}无可用货位";
                                    AddErrorInfo("查找库区失败", result.msg, Source);
                                    return result;
                                }

                            }
                            else
                            {
                                result.code = "1";
                                result.msg = $"终点库区：{areacode}无可用货位";
                                AddErrorInfo("查找库区失败", result.msg);
                                result.msg = $"根据终点库区：{areacode},未找到对应货位";
                                AddErrorInfo("查找库区失败", result.msg, Source);
                                return result;
                            }

                            //loc = StorageCompute(itemcode, areacode);
                            //if (loc == null)
                            //{
                            //    loc = emptyRow(areacode);
                            //}
                        }
                        if (loc != null)
                        {
                            End = loc.S_CODE;
                        }
                        else
                        {

                            result.code = "1";
                            result.msg = $"根据终点库区：{areacode},未找到对应货位";
                            AddErrorInfo("查找库区失败", result.msg);
                            result.msg = $"库区:{areacode}无可用货位";
                            AddErrorInfo("查找货位失败", result.msg, Source);
                            return result;
                        }
                        //loc = StorageCompute(itemcode, areacode);
                        //if (loc == null)
                        //{
                        //    loc = emptyRow(areacode);
                        //}
                    }
                    if (loc != null)
                    {
                        End = loc.S_CODE;
                    }
                    else
                    {
                        LogHelper.Info($"库区:{areacode}无可用货位");

                        result.code = "1";
                        result.msg = $"库区:{areacode}无可用货位";
                        AddErrorInfo("查找货位失败", result.msg);
                        return result;
                        result.msg = $"根据起点仓库编码：{startloc.S_WH_CODE}未找到对应配置文件";
                        LogHelper.Info($"Putin==> {result.msg}");
                        AddErrorInfo("查找库区失败", result.msg, Source);
                    }

                }
                else
                {
                    LogHelper.Info($"货位:{Start}找不到对应货位");

                    result.code = "1";
                    result.msg = $"货位:{Start}找不到对应货位";
                    AddErrorInfo("查找货位失败", result.msg);
                    AddErrorInfo("查找货位失败", result.msg, Source);
                    return result;
                }

@@ -1560,11 +1696,12 @@
                msg = "线边库存查询成功"

            };
            string Source = "MES";
            if (model == null)
            {
                result.code = "1";
                result.msg = "参数为null";
                AddErrorInfo("参数为空", result.msg);
                AddErrorInfo("参数为空", result.msg, Source);
                return result;

            }
@@ -1611,11 +1748,12 @@
        internal static Result add(add model)
        {
            Result result = new Result() { code = "200", msg = "物料主数据创建成功" };
            string Source = "MES";
            if (model == null)
            {
                result.code = "1";
                result.msg = "参数为null";
                AddErrorInfo("参数为空", result.msg);
                AddErrorInfo("参数为空", result.msg, Source);
                return result;
            }
            try
@@ -1624,24 +1762,27 @@
                if (db.Queryable<TN_Material>().Where(a => a.S_ITEM_CODE == model.PartNumber).Count() > 0)
                {
                    result.code = "1";
                    result.msg = "物料主数据已存在";
                    AddErrorInfo("物料主数据已存在", result.msg);
                    result.msg = $"物料编码:{model.PartNumber}的物料主数据已存在";
                    //  AddErrorInfo("物料主数据已存在", result.msg, Source);
                    LogHelper.Info($"add:{result.msg}");
                    return result;
                }
                TN_Material itemInfo = new TN_Material();
                itemInfo.S_ITEM_CODE = model.PartNumber;
                itemInfo.ITEM_TYPE = model.PartClass;
                itemInfo.S_ITEM_NAME = model.PartDesc;
                itemInfo.REMARK1 = model.StewingTime.ToString("yyyy-MM-dd");
                itemInfo.REMARK2 = model.OverdueTime.ToString("yyyy-MM-dd");
                itemInfo.REMARK1 = model.StewingTime;
                itemInfo.REMARK2 = model.OverdueTime;
                itemInfo.S_MP_TYPE = model.Unit;

                db.Insertable<TN_Material>(itemInfo).ExecuteCommand();
                if (db.Insertable<TN_Material>(itemInfo).ExecuteCommand() > 0)
                {
                    LogHelper.Info($"add:物料编码:{model.PartNumber}的物料主数据已同步");
                }
                ;
                return result;
            }
            catch (Exception ex)
            {

                result.code = "1";
                result.msg = $"物料主数据创建失败 错误信息：{ex}";
                LogHelper.Error("add Error：" + ex.ToString(), ex);
@@ -1657,11 +1798,12 @@
        internal static Result CreatTask(CreatTask model)
        {
            Result result = new Result() { code = "200", msg = "点对点任务创建成功" };
            string Source = "MES";
            if (model == null)
            {
                result.code = "1";
                result.msg = "参数为null";
                AddErrorInfo("参数为空", result.msg);
                AddErrorInfo("参数为空", result.msg, Source);
                return result;
            }
            string Start = ""; //取货点
@@ -1687,7 +1829,7 @@
                    {
                        result.code = "1";
                        result.msg = $"创建任务失败，根据起点{model.InitialLocation}未找到对应货位绑定托盘托盘";
                        AddErrorInfo("查找托盘失败", result.msg);
                        AddErrorInfo("查找托盘失败", result.msg, Source);
                        return result;
                    }
                }
@@ -1765,11 +1907,12 @@
        internal static Result CreatelevatorTask(Elevator model)
        {
            Result result = new Result() { code = "200", msg = "点对点任务创建成功" };
            string Source = "MES";
            if (model == null)
            {
                result.code = "1";
                result.msg = "参数为null";
                AddErrorInfo("参数为空", result.msg);
                AddErrorInfo("参数为空", result.msg, Source);
                return result;
            }

@@ -1789,17 +1932,18 @@
                    {
                        result.code = "1";
                        result.msg = $"创建任务失败，起点{startloc.S_CODE}有锁";
                        AddErrorInfo("货位有锁", result.msg);
                        AddErrorInfo("货位有锁", result.msg, Source);
                        return result;
                    }

                    var cntr = db.Queryable<LocCntrRel>().Where(a => a.S_LOC_CODE.Trim() == startloc.S_CODE).First();
                    if (cntr == null)
                    {
                        LogHelper.Info($"callfixture:创建空工装呼叫任务==>根据货位{endloc.S_CODE}未找到托盘货位绑定关系");

                        result.code = "1";
                        result.msg = $"起点{model.Data.start_loc_code}未查询绑定托盘";
                        AddErrorInfo("查找托盘失败", result.msg);
                        LogHelper.Info($"callfixture:创建空工装呼叫任务==>{result.msg}");
                        AddErrorInfo("查找托盘失败", result.msg, Source);
                        return result;
                    }

@@ -1813,7 +1957,7 @@
                    {
                        result.code = "1";
                        result.msg = $"创建任务失败，根据货位编码:{dtcode}未找到电梯货位";
                        AddErrorInfo("查找货位失败", result.msg);
                        AddErrorInfo("查找货位失败", result.msg, Source);
                        return result;
                    }

@@ -1886,8 +2030,6 @@

        }



        /// <summary>
        /// 货位信息上传
        /// </summary>
@@ -1897,6 +2039,7 @@
        {

            Result result = new Result() { code = "200", msg = "货位信息上传成功" };
            String Source = "MES";
            RequestList<UploadLoc> result1 = new RequestList<UploadLoc>();
            List<UploadLoc> listuploadloc = new List<UploadLoc>();
            var db = new SqlHelper<object>().GetInstance();
@@ -1920,7 +2063,7 @@
                {
                    result.code = "1";
                    result.msg = $"货位上传失败，根据货位编码{item.Location}未找到对应的货位信息";
                    AddErrorInfo("查找货位失败", result.msg);
                    AddErrorInfo("查找货位失败", result.msg, Source);
                    return result;
                }
            }
@@ -1951,7 +2094,7 @@
                LogHelper.Info($"物料到位回报失败=>回报地址没有配置");
                result.code = "1";
                result.msg = $"物料到位回报失败=>回报地址没有配置";
                AddErrorInfo("地址错误", result.msg);
                AddErrorInfo("地址错误", result.msg, Source);
            }
            return result;
        }
@@ -1965,11 +2108,12 @@
        internal static Result ClearLoc(ClearTask model)
        {
            Result result = new Result() { code = "200", msg = "库位清除成功" };
            string Source = "MES";
            if (model == null)
            {
                result.code = "1";
                result.msg = "参数为null";
                AddErrorInfo("参数为空", result.msg);
                AddErrorInfo("参数为空", result.msg, Source);
                return result;
            }
            string loc = model.LocationNum;
@@ -2009,7 +2153,7 @@
                {
                    result.code = "1";
                    result.msg = $"根据货位:{loc}找不到货位关系";
                    AddErrorInfo("货位为空", result.msg);
                    AddErrorInfo("货位为空", result.msg, Source);
                    return result;
                }
            }
@@ -2038,51 +2182,52 @@
        internal static Location StorageCompute(string itemcode, string areacode)
        {
            var db = new SqlHelper<object>().GetInstance();
            Location result = null;
            //查询所有有托盘的排
            var list = db.Queryable<Location>().Where(a => a.N_CURRENT_NUM > 0 && a.S_AREA_CODE.Trim() == areacode).OrderByDescending(a => a.N_COL).Take(1).PartitionBy(a => a.N_ROW).ToList();
            if (list.Count > 0)
            {
                for (int i = 0; i < list.Count; i++)
                {
                    LogHelper.Info($"有托盘排号{list[i].N_ROW}，物料编码{itemcode},库区{areacode}");
                    //判断托盘物料是否相同物料信息相同
                    var cntr = db.Queryable<LocCntrRel>().Where(a => a.S_LOC_CODE.Trim() == list[i].S_CODE).First();
                    if (cntr != null)
                    {
                        if (string.IsNullOrEmpty(itemcode))//空托入库
                        {
                            var iteminfo = ContainerHelper.GetCntrItemRel(cntr.S_CNTR_CODE).FirstOrDefault();
                            if (iteminfo == null)
                            {
                                //物料相同入货位后一位货位
                                result = db.Queryable<Location>().OrderBy(a => a.N_COL).Where(a => a.S_AREA_CODE.Trim() == areacode && a.N_ROW == list[i].N_ROW && a.N_COL > list[i].N_COL).First();
                            }
                        }
                        else//满拖入库
                        {
                            var iteminfo = ContainerHelper.GetCntrItemRel(cntr.S_CNTR_CODE).FirstOrDefault();
                            if (iteminfo != null)
                            {
                                if (iteminfo.S_ITEM_CODE == itemcode)
                                {
                                    //物料相同入货位后一位货位
                                    result = db.Queryable<Location>().OrderBy(a => a.N_COL).Where(a => a.S_AREA_CODE.Trim() == areacode && a.N_ROW == list[i].N_ROW && a.N_COL > list[i].N_COL).First();
            Location result = db.Queryable<Location>().Where(a => a.N_CURRENT_NUM == 0 && a.S_AREA_CODE.Trim() == areacode && a.N_LOCK_STATE == 0).First();
            //查询所有有托盘的排没锁的排
            // var list = db.Queryable<Location>().Where(a => a.N_CURRENT_NUM > 0 && a.S_AREA_CODE.Trim() == areacode && a.N_LOCK_STATE == 0).OrderByDescending(a => a.N_COL).Take(1).PartitionBy(a => a.N_ROW).ToList();
            // if (list.Count > 0)
            //{
            //    for (int i = 0; i < list.Count; i++)
            //    {
            //        LogHelper.Info($"有托盘排号{list[i].N_ROW}，物料编码{itemcode},库区{areacode}");
            //        //查询货位绑定托盘
            //        var cntr = db.Queryable<LocCntrRel>().Where(a => a.S_LOC_CODE.Trim() == list[i].S_CODE).First();
            //        if (cntr != null)
            //        {
            //            //查询托盘物料信息
            //            var iteminfo = ContainerHelper.GetCntrItemRel(cntr.S_CNTR_CODE).FirstOrDefault();

                                }
                            }
                        }
                        if (result != null)
                        {
                            return result;
                        }
                    }
                    else
                    {
                        LogHelper.Info($"根据货物编码{list[i].S_CODE}未找到托盘货位绑定关系");
                    }
                }
            }
            //            if (string.IsNullOrEmpty(itemcode))//空托入库
            //            {
            //                if (iteminfo == null)
            //                {
            //                    //物料相同入货位后一位货位
            //                    result = db.Queryable<Location>().OrderBy(a => a.N_COL).Where(a => a.S_AREA_CODE.Trim() == areacode && a.N_ROW == list[i].N_ROW && a.N_COL > list[i].N_COL && a.N_LOCK_STATE == 0 && a.N_CURRENT_NUM == 0).First();
            //                }
            //            }
            //            else//满拖入库
            //            {
            //                if (iteminfo != null)
            //                {
            //                    if (iteminfo.S_ITEM_CODE == itemcode)
            //                    {
            //                        //物料相同入货位后一位货位
            //                        result = db.Queryable<Location>().OrderBy(a => a.N_COL).Where(a => a.S_AREA_CODE.Trim() == areacode && a.N_ROW == list[i].N_ROW && a.N_COL > list[i].N_COL && a.N_LOCK_STATE == 0 && a.N_CURRENT_NUM == 0).First();

            //                    }
            //                }
            //            }
            //            if (result != null)
            //            {
            //                return result;
            //            }
            //        }
            //        else
            //        {
            //            LogHelper.Info($"根据货物编码{list[i].S_CODE}未找到托盘货位绑定关系");
            //        }
            //    }
            //}
            return result;
        }

@@ -2151,7 +2296,9 @@

            #endregion
            var loc = LocationHelper.GetLocByItemCode(areacode, itemcode, level);
            LogHelper.Info($"airlift=>根据库区编码:{areacode}，物料编码:{itemcode},物料等级计算出有托盘货位{JsonConvert.SerializeObject(loc)}");
            result = FindStartcolByLoclist(loc);
            LogHelper.Info($"airlift=>可用货位为：{JsonConvert.SerializeObject(result)}");
            return result;
        }

@@ -2175,26 +2322,31 @@
            }
            return result;
        }

        /// <summary>
        /// 创建托盘物料绑定关系
        /// 立库任务下发创建托盘物料绑定关系
        /// </summary>
        /// <param name="loc">货位编码</param>
        /// <param name="cntr">托盘编码</param>
        /// <param name="partNumber">物料编码</param>
        /// <param name="partDesc">物料描述</param>
        /// <param name="partType">物料类型</param>
        /// <param name="cntrtype">托盘类型</param>
        /// <param name="unit">物料单位</param>
        /// <param name="weight">物料重量</param>
        internal static bool CreateCntrIteminfo(string loc, string cntr, string partNumber, string partDesc, string partType, string batch, string unit, string weight, string cntrtype = "1", string level = "")
        internal static bool CreateCntrIteminfo(partData partData, taskData taskData)
        {
            return ContainerHelper.CreateCntrItem(loc, cntr, partNumber, partDesc, partType, cntrtype, batch, weight, unit, level);
            if (partData == null && taskData == null)
            {
                LogHelper.Info($"CreateCntrIteminfo==> 立库任务下发参数有空，创建物料托盘绑定关系失败");
                return false;
            }
            else
            {
                return ContainerHelper.CreateCntrItem(taskData.pickStation, partData.rfid, partData.partNumber, partData.partDesc, partData.partType, taskData.carrierType, partData.lotNumber, taskData.wmsLot, partData.weight, partData.unit,
                    taskData.tyreType, taskData.supplier, taskData.receiveLot, taskData.subpool, partData.productionTime, partData.maturityTime, taskData.level);
            }

        }
        private static object _lockLocation = new object();
        /// <summary>
        /// 根据托盘编码，机台编码，工装类型计算机台线边区域
        /// </summary>
        /// <param name="cntrcode">托盘编码</param>
        /// <param name="jtcode">机台编码</param>
        /// <param name="cntrType">托盘类型</param>
        /// <returns></returns>
        internal static Location Computeloc(string cntrcode, string jtcode, string cntrType)
        {
@@ -2204,17 +2356,19 @@

            //  var location = db.Queryable<CntrItemDetail>().Where(a => a.S_CNTR_CODE.Trim() == cntrcode).First();


            var loc = db.Queryable<Location>().Where(a => a.S_AREA_CODE.Trim() == jtcode.Trim() && a.S_NOTE == cntrType && a.N_CURRENT_NUM == 0 && a.N_LOCK_STATE == 0).First();
            if (loc != null)
            lock (_lockLocation)
            {
                End = loc;
            }
            else
            {
                LogHelper.Info($"Computeloc==》根据机台分组：{jtcode},工装类型：{cntrType} 未找到空货位数据，请检查货位表");
            }
                var loc = db.Queryable<Location>().Where(a => a.S_AREA_CODE.Trim() == jtcode.Trim() && a.S_NOTE == cntrType && a.N_CURRENT_NUM == 0 && a.N_LOCK_STATE == 0).First();
                if (loc != null)
                {
                    End = loc;
                }
                else
                {
                    LogHelper.Info($"Computeloc==》根据机台分组：{jtcode},工装类型：{cntrType} 未找到空货位数据，请检查货位表");
                }

            }
            return End;
        }

@@ -2234,7 +2388,7 @@
            {
                var error = new ErrorInfo
                {
                    EEEORMESSAGE = errorInfo,
                    ERRORMESSAGE = errorInfo,
                    TASKNO = taskno,
                    AREACODE = areacode,
                    REMAKE = remake,