111

lss

2025-07-03 2f8733caf7ae5c94483fa332e0d3af69b61a0eb0

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

@@ -2176,8 +2176,8 @@
                    string[] state = new string[] { "执行中", "开始取货", "取货完成", "开始卸货", "卸货完成" };


                    var elevatorLoc = db.Queryable<Location>().Where(a =>  a.S_CODE == eleLoc.TN_Location).First();
                    if (elevatorLoc==null)
                    var elevatorLoc = db.Queryable<Location>().Where(a => a.S_CODE == eleLoc.TN_Location).First();
                    if (elevatorLoc == null)
                    {
                        result.code = "1";
                        result.msg = $"根据电梯配置文件货位：{eleLoc.TN_Location}未找到对于货位数据，请检查货位表";
@@ -2269,6 +2269,47 @@

        }


        /// <summary>
        /// 电梯任务推送
        /// </summary>
        /// <param name="model"></param>
        /// <returns></returns>
        internal static Result DT(DTModel model)
        {
            Result result = new Result() { code = "200", msg = "电梯任务推送成功" };
            string Source = "WMS";
            if (model == null)
            {
                result.code = "1";
                result.msg = "参数为null";
                AddErrorInfo("参数为空", result.msg, Source);
                return result;
            }
            try
            {
                if (model.prepare=="1")
                {
                    var db = new SqlHelper<object>().GetInstance();
                    //修改对应电梯任务进行推送
                    return result;
                }
                else
                {
                    result.code = "1";
                    result.msg = $"一楼电梯搬运任务推送失败 prepare{model.prepare}不为1";
                    LogHelper.Info(result.msg);
                    return result;
                }     
            }
            catch(Exception ex)
            {
                result.code = "1";
                result.msg = $"电梯任务推送失败 错误信息：{ex}";
                LogHelper.Error("点对点任务 Error：" + ex.ToString(), ex);
                return result;
            }
        }
        /// <summary>
        /// 货位信息上传
        /// </summary>
@@ -2834,14 +2875,14 @@
                {

                    var rowList = locations.Where(r => r.N_ROW == rows[i]).ToList();
                    LogHelper.Info($"当前排:{rows[i]},获得货位{JsonConvert.SerializeObject(rowList)}");
                    //  LogHelper.Info($"当前排:{rows[i]},获得货位{JsonConvert.SerializeObject(rowList)}");
                    if (rowList.Count(a => a.N_CURRENT_NUM == 0) > 0)
                    {
                        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 && !string.IsNullOrEmpty(a.S_CODE.Trim()) && !string.IsNullOrWhiteSpace(a.S_CODE.Trim())).FirstOrDefault();
                        other = rowList.OrderBy(a => a.N_COL).Where(a => a.N_CURRENT_NUM == 0 && a.N_LOCK_STATE == 0).FirstOrDefault();
                        //if (full == null)
                        //{
                        //    //没有满位，那就找最小的空位
@@ -3012,7 +3053,6 @@
        {
            lock (AGVDeviceReceiveLock)
            {

                var db = new SqlHelper<HangChaAGV>().GetInstance();
                var agvDeviceInfo = db.Queryable<HangChaAGV>().Where(a => a.agvNo.Trim() == forkliftNo).First();
                if (agvDeviceInfo == null)