现场优化

lss

2025-06-19 ae75edc771b0161f90f3e5a596d13bee8a4b71cc

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

@@ -693,63 +693,23 @@
            try
            {
                string[] state = new string[] { "取消", "失败", "错误", "完成" };
                if (model.type == "1")
                {
                    //找到任务
                    var task = db.Queryable<WCSTask>().Where(a => a.S_START_LOC.Trim() == model.loc && !state.Contains(a.S_B_STATE)).ToList();
                    if (task.Count > 0)
                var task = db.Queryable<WCSTask>().Where(a => a.S_EQ_NO.Trim() == model.task_no && !state.Contains(a.S_B_STATE)).First();
                if (task != null)
                    {
                        foreach (var item in task)
                    if (model.type == "1" || model.type == "2")
                        {
                            var taskAction = db.Queryable<TaskAction>().Where(a => a.S_TASK_CODE == item.S_CODE).OrderByDescending(a => a.T_CREATE).First();
                            if (taskAction.N_ACTION_CODE == 1101)
                            {
                                NDCApi.ChangeOrderParam(item.S_CODE.Trim(), 6, "1");
                                return result;
                            }
                            result.code = "1";
                            result.msg = $"根据下发货位{model.loc}未找到对应申请取货状态任务";
                            AddErrorInfo("未找到任务", result.msg, "", model.task_no);
                            return result;
                        }
                    }
                    else
                    {
                        result.code = "1";
                        result.msg = $"根据下发货位{model.loc}未找到对应任务";
                        AddErrorInfo("未找到任务", result.msg, "", model.task_no);
                        return result;
                    }
                }
                else if (model.type == "2")
                {
                    //找到任务
                    var task = db.Queryable<WCSTask>().Where(a => a.S_END_LOC.Trim() == model.loc && !state.Contains(a.S_B_STATE)).ToList();
                    if (task.Count > 0)
                    {
                        foreach (var item in task)
                        {
                            var taskAction = db.Queryable<TaskAction>().Where(a => a.S_TASK_CODE == item.S_CODE).OrderByDescending(a => a.T_CREATE).First();
                            if (taskAction.N_ACTION_CODE == 1103)
                            {
                                NDCApi.ChangeOrderParam(item.S_CODE.Trim(), 6, "1");
                                return result;
                            }
                        }
                        result.code = "1";
                        result.msg = $"根据下发货位{model.loc}未找到对应申请卸货状态任务";
                        AddErrorInfo("未找到任务", result.msg, "", model.task_no);
                        return result;
                    }
                    else
                    {
                        result.code = "1";
                        result.msg = $"根据下发货位{model.loc}未找到对应任务";
                        AddErrorInfo("未找到任务", result.msg, "", model.task_no);
                        return result;
                    }
                        NDCApi.ChangeOrderParam(task.S_CODE.Trim(), 6, "1");
                }

                }
                else
                {
                    result.code = "1";
                    result.msg = $"根据下发任务号{model.task_no}未找到对应任务";
                    AddErrorInfo("未找到任务", result.msg, "", model.task_no);
                    return result;
                }
                return result;
            }
            catch (Exception ex)
@@ -1260,7 +1220,8 @@
                        if (startloc.N_LAYER == 3)
                        {
                            //叠盘货位计算叠盘货位
                            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 && a.C_ENABLE == "Y").ToList();
                           // 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 && a.C_ENABLE == "Y").ToList();
                            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)}");
@@ -1291,7 +1252,8 @@
                        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 && a.C_ENABLE == "Y").ToList();
                          //  var KjDploc = db.Queryable<Location>().Where(a => a.S_NOTE.Trim() == "片胶堆叠位" && a.S_WH_CODE.Trim() == startloc.S_WH_CODE && a.C_ENABLE == "Y").ToList();
                            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();
@@ -1413,6 +1375,12 @@
                            //  空托回库判断托盘有无绑定物料信息 如果有则删除
                            var itemcntr = db.Queryable<CntrItemDetail>().Where(a => a.S_CNTR_CODE.Trim() == model.Rfid).First();
                            if (itemcntr != null) { db.Deleteable<CntrItemDetail>().Where(a => a.S_CNTR_CODE.Trim() == model.Rfid).ExecuteCommand(); }
                            var container = db.Queryable<Container>().Where(a => a.S_CODE.Trim() == model.Rfid).First();
                            if (container == null)
                            {
                                container = new Container { S_CODE = model.Rfid };
                                db.Insertable<Container>(container).ExecuteCommand();
                            }
                            LogHelper.Info("创建任务成功");
                        }
                        else
@@ -2134,7 +2102,8 @@

                var startloc = db.Queryable<Location>().Where(a => a.S_CODE.Trim() == model.Data.start_loc_code).First();

                var endloc = db.Queryable<Location>().Where(a => a.S_AREA_CODE.Trim() == model.Data.end_loc_code && a.N_CURRENT_NUM == 0 && a.N_LOCK_STATE == 0 && a.C_ENABLE == "Y").First();
              //  var endloc = db.Queryable<Location>().Where(a => a.S_AREA_CODE.Trim() == model.Data.end_loc_code && a.N_CURRENT_NUM == 0 && a.N_LOCK_STATE == 0 && a.C_ENABLE == "Y").First();
                var endloc = db.Queryable<Location>().Where(a => a.S_AREA_CODE.Trim() == model.Data.end_loc_code && a.N_CURRENT_NUM == 0 && a.N_LOCK_STATE == 0).First();


                //判断楼层是否相等，如果不相同需要生成分段任务进行电梯调用
@@ -2587,6 +2556,7 @@
        internal static Location StorageCompute(string itemcode, string areacode)
        {
            var db = new SqlHelper<object>().GetInstance();
         //   Location result = db.Queryable<Location>().Where(a => a.N_CURRENT_NUM == 0 && a.S_AREA_CODE.Trim() == areacode && a.N_LOCK_STATE == 0 ).First();
            Location result = db.Queryable<Location>().Where(a => a.N_CURRENT_NUM == 0 && a.S_AREA_CODE.Trim() == areacode && a.N_LOCK_STATE == 0 && a.C_ENABLE == "Y").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();
@@ -2784,7 +2754,7 @@

            lock (_lockLocation)
            {
                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 && a.S_LOCK_STATE == "无" && a.C_ENABLE == "Y").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 && a.S_LOCK_STATE == "无").First();
                if (loc != null)
                {
                    End = loc;
@@ -2857,7 +2827,8 @@
                        Location other = null;
                        //当前排没有锁并且有空位置
                        //先找满位，然后后面一层要么是空，要么不存在
                        other = rowList.OrderBy(a => a.N_COL).Where(a => a.N_CURRENT_NUM == 0 && a.N_LOCK_STATE == 0 && a.C_ENABLE == "Y").FirstOrDefault();
                       /// other = rowList.OrderBy(a => a.N_COL).Where(a => a.N_CURRENT_NUM == 0 && a.N_LOCK_STATE == 0 && a.C_ENABLE == "Y").FirstOrDefault();
                        other = rowList.OrderBy(a => a.N_COL).Where(a => a.N_CURRENT_NUM == 0 && a.N_LOCK_STATE == 0 ).FirstOrDefault();
                        //if (full == null)
                        //{
                        //    //没有满位，那就找最小的空位