修改问题

chengsc

2025-05-07 48df8080d7befac9fff4f5345750699c592512f6

修改问题

 HTML/views/BaseSetting/Materials.html

@@ -398,7 +398,7 @@
                            field: 'Origin',title: '来源',align: 'center',width: 200
                        }, 
                        {
                            field: 'UnitName',title: '单位',align: 'center',width: 100
                            field: 'UnitNo',title: '单位',align: 'center',width: 100
                        },
                        {
                            field: 'PackagName',title: '包装',align: 'center',width: 100

 HTML/views/BaseSetting/MaterialsForm.html

@@ -124,10 +124,9 @@
            <!-- 单位 -->
            <div class="layui-inline">
                <label class="layui-form-label">单位</label>
                <div class="layui-input-block" style="width: 182px;">
                    <select name="UnitNo" id="UnitNo" lay-verify="" lay-search>
                        <option value=""></option>
                    </select>
                <div class="layui-input-block" style="width: 182px;"> 
                    <input type="text" name="UnitNo" id="UnitNo" placeholder="请输入单位" lay-verify="" autocomplete="off"
                        class="layui-input">
                </div>
            </div>
            <!-- 包装 -->
@@ -276,26 +275,26 @@
            });


            var sel1 = false;
            //获取单位下拉菜单 UnitNo
            synData(IP + "/Basis/GetUnitList", {}, 'get', function (res) {
                if (res.code == 0) //成功
                {
                    for (var i = 0; i < res.data.length; i++) {
                        $("#UnitNo").append('<option value =' + res.data[i].UnitNo + '>' + res.data[i].UnitName + '</option>');
                    }
                    form.render('select');
                    sel1 = true;
                }
                else //不成功
                {
                    layer.msg(res.msg, {
                        icon: 2,
                        time: 2000 //2秒关闭（如果不配置，默认是3秒）
                    }, function () { sel1 = true; });
                }
            var sel1 = true;
            // //获取单位下拉菜单 UnitNo
            // synData(IP + "/Basis/GetUnitList", {}, 'get', function (res) {
            //     if (res.code == 0) //成功
            //     {
            //         for (var i = 0; i < res.data.length; i++) {
            //             $("#UnitNo").append('<option value =' + res.data[i].UnitNo + '>' + res.data[i].UnitName + '</option>');
            //         }
            //         form.render('select');
            //         sel1 = true;
            //     }
            //     else //不成功
            //     {
            //         layer.msg(res.msg, {
            //             icon: 2,
            //             time: 2000 //2秒关闭（如果不配置，默认是3秒）
            //         }, function () { sel1 = true; });
            //     }

            });
            // });
            var sel2 = false;
            //获取包装下拉菜单 PackagNo
            synData(IP + "/Basis/GetPackagList", {}, 'get', function (res) {
@@ -352,7 +351,7 @@
                            $("#IsControlled option[value='" + res.data.IsControlled + "']").attr("selected", "selected"); // 是否受控
                            $("#IsInspect option[value='" + res.data.IsInspect + "']").attr("selected", "selected"); // 是否免检
                            $("#IsPasteCode option[value='" + res.data.IsPasteCode + "']").attr("selected", "selected"); // 是否贴标
                            $("#UnitNo option[value='" + res.data.UnitNo + "']").attr("selected", "selected");// 单位
                            $("input[name='UnitNo']").val(res.data.UnitNo); 
                            $("#PackagNo option[value='" + res.data.PackagNo + "']").attr("selected", "selected"); // 包装
                            // $("#PackagNo").attr("disabled", "disabled")
                            $("#Environment option[value='" + res.data.Environment + "']").attr("selected", "selected"); // 存储环境

 Wms/Model/InterFaceModel/HttpModel.cs

@@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Text;

namespace Model.InterFaceModel
@@ -80,6 +81,21 @@
        public int StatusCode { get; set; }
        public string Msg { get; set; }
    }

    public enum PLCTypeEnum
    {
        /// <summary>
        /// AGV小车
        /// </summary>
        [Description("AGV小车")]
        AGV = 2,
        /// <summary>
        /// 穿梭车
        /// </summary>
        [Description("穿梭车")]
        ShuttleCar = 7
    }

    /// <summary>
    /// Wms专用 下发指令Dto
    /// </summary>
@@ -95,6 +111,8 @@
        /// </summary>
        public string TaskType { get; set; }

        public PLCTypeEnum Type { get; set; }

        /// <summary>
        /// 托盘号
        /// </summary>

 Wms/Utility/Tools/HttpHelper.cs

@@ -4,7 +4,9 @@
using System.IO;
using System.Linq;
using System.Net;
using System.Net.Security;
using System.Reflection;
using System.Security.Cryptography.X509Certificates;
using System.Text;
using System.Xml;
using Newtonsoft.Json;
@@ -13,6 +15,11 @@
{
    public class HttpHelper
    {
        private static bool CheckValidationResult(object sender, X509Certificate certificate, X509Chain chain, SslPolicyErrors errors)
        {
            return true; //如果不希望验证证书有效性，直接返回 true
        }

        private static HttpWebRequest GetHttpWebRequest(string url, Dictionary<string, string> headerDic, string method)
        {
            HttpWebRequest request = WebRequest.Create(url) as HttpWebRequest;
@@ -105,6 +112,10 @@
            }
            try
            {
                if (url.Contains("https")) 
                {
                    ServicePointManager.ServerCertificateValidationCallback = new RemoteCertificateValidationCallback(CheckValidationResult);
                }
                var requestData = GetResponseString(request);
                LogFile.SaveLogToFile($"{logStr}反馈：( {requestData} ),", logStr2);
                return requestData;
@@ -463,4 +474,6 @@


    }

    
}

 Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs

@@ -1806,6 +1806,758 @@
        }

        /// <summary>
        /// 申请巷道(密集库)
        /// </summary>
        /// <param name="palletNo"></param>
        /// <param name="houseNo"></param>
        /// <returns></returns>
        /// <exception cref="Exception"></exception>
        public OutCommandDto RequestMiJiRoadWay(string palletNo, string houseNo)
        {
            try
            {
                #region 验证托盘合法性
                //验证托盘条码是否为空
                if (string.IsNullOrEmpty(palletNo))
                {
                    throw new Exception("请输入要申请的托盘条码");
                }
                //验证所属仓库是否为空
                if (string.IsNullOrEmpty(houseNo))
                {
                    throw new Exception("请选择所属仓库");
                }
                //获取仓库类型
                var houseType = Db.Queryable<SysWareHouse>().First(a => a.WareHouseNo == houseNo);
                //验证是否为密集库
                if (houseType.Type != "3")
                {
                    throw new Exception("仓库不是密集库");
                }

                var stock = Db.Queryable<SysPallets>().First(a => a.PalletNo == palletNo);//托盘信息
                //判断托盘条码是否有效
                if (stock == null)
                {
                    throw new Exception("托盘条码不受WMS管理，不可入库！");
                }
                #endregion


                OutCommandDto comDto;//返回wcs的入库命令
                #region 

                //查询托盘绑定信息(状态为等待入库/正在执行的)
                var palletBindList = Db.Queryable<BllPalletBind>()
                    .Where(m => m.IsDel == "0" && m.PalletNo == palletNo && (m.Status == "0" || m.Status == "1")).ToList();
                var haveLocate = palletBindList.FirstOrDefault(m => !string.IsNullOrWhiteSpace(m.LocatNo));

                var skuNo = ""; //入库物料
                var lotNo = ""; //入库批次

                var stockDetail = Db.Queryable<DataStockDetail>().Where(m => m.PalletNo == palletNo).ToList();
                if (palletBindList.Count >= 1) //正常入库
                {
                    var palletBind = palletBindList.FirstOrDefault(m => m.Status == "1");//查询是否有正在执行的托盘绑定
                    if (palletBind != null)
                    {
                        var beingTask = Db.Queryable<LogTask>().First(m => m.IsDel == "0" && m.TaskNo == palletBind.TaskNo);
                        if (beingTask == null)
                        {
                            throw new Exception("该托盘正在入库，但未查询到任务信息");
                        }

                        comDto = new OutCommandDto()
                        {
                            PalletNo = palletNo,//托盘号
                            StartRoadway = beingTask.StartRoadway, // 起始巷道
                            StartLocate = beingTask.StartLocat, // 起始位置
                            EndLocate = beingTask.EndLocat, // 目标位置
                            EndRoadway = beingTask.EndRoadway,                           //  目标巷道
                            TaskNo = beingTask.TaskNo, // 任务号
                            TaskType = "0",// 任务类型 (入库)
                            OutMode = "",  //目标地址
                            Order = 1
                        };
                        if (beingTask.IsSuccess == 0)
                        {
                            beingTask.IsSuccess = 1;
                            Db.Updateable(beingTask).ExecuteCommand();
                        }
                        return comDto;

                    }


                    //  验证是否关联单据，获取托盘上存放的物料
                    if (palletBindList.First().Type == "0") //物料托入库
                    {
                        //判断是否绑定单据及单据状态是否正常
                        foreach (var item in palletBindList)
                        {
                            var notice = Db.Queryable<BllArrivalNotice>().First(m => m.IsDel == "0" && m.ASNNo == item.ASNNo);
                            if (notice == null)
                            {
                                throw new Exception("托盘存在物料未绑定入库单，不可入库！");
                            }
                            if (notice.Status == "3" || notice.Status == "4")
                            {
                                throw new Exception($"入库单{item.ASNNo}已关闭，不可入库！");
                            }
                        }

                        //获取物料存放区域
                        var noticeDetail = Db.Queryable<BllArrivalNoticeDetail>().First(m =>
                            m.IsDel == "0" && m.Id == palletBindList.First().ASNDetailNo);
                        if (noticeDetail == null)
                        {
                            throw new Exception("托盘存在物料未绑定入库单明细，不可入库");
                        }

                        skuNo = noticeDetail.SkuNo;
                        lotNo = noticeDetail.LotNo;

                    }
                    else if (palletBindList.First().Type == "1")//空托盘
                    {
                        skuNo = "100099";
                    }
                }
                else //回流入库
                {
                    if (stockDetail.Count == 0)
                    {
                        throw new Exception($"{palletNo}托盘不存在库存信息，不可入库！");
                    }
                    if (stockDetail.Count(m => !string.IsNullOrWhiteSpace(m.LocatNo)) > 0)
                    {
                        throw new Exception("当前托盘已在库内，请核实");
                    }
                    skuNo = stockDetail.First().SkuNo;
                    lotNo = stockDetail.First().LotNo;

                    #region 判断任务是否已经存在，若存在直接返回任务；
                    var beingTask = Db.Queryable<LogTask>().First(m => m.IsDel == "0"
                    && (m.Status == "0" || m.Status == "1") && m.PalletNo == palletNo && m.Type == "0");
                    if (beingTask != null)
                    {
                        comDto = new OutCommandDto()
                        {
                            PalletNo = palletNo,//托盘号
                            StartRoadway = beingTask.StartRoadway, // 起始巷道
                            StartLocate = beingTask.StartLocat, // 起始位置
                            EndLocate = beingTask.EndLocat, // 目标位置
                            EndRoadway = beingTask.EndRoadway,  //  目标巷道
                            TaskNo = beingTask.TaskNo, // 任务号
                            TaskType = "0",// 任务类型 (出库)
                            OutMode = "",  //目标地址
                            Order = 1
                        };
                        if (beingTask.IsSuccess == 0)
                        {
                            beingTask.IsSuccess = 1;
                            beingTask.Status = "1";
                            Db.Updateable(beingTask).ExecuteCommand();
                        }

                        return comDto;
                    }
                    #endregion

                    #region 判断该托盘，是否符合回库功能设定的回库规则
                    //获取对应回库规则
                    var function = Db.Queryable<SysFunSetting>().First(a => a.IsDel == "0"
                    && a.FunSetNo == "Fun041" && a.IsEnable == "NO");
                    if (function != null)
                    {
                        //拣货完成后允许托盘回库
                        var allot = Db.Queryable<BllExportAllot>().First(a => a.IsDel == "0"
                        && a.LotNo == stockDetail[0].LotNo && a.PalletNo == palletNo && a.SkuNo == stockDetail[0].SkuNo);

                        //验证拣货明细是否存在
                        if (allot != null)
                        {
                            //验证当前托盘拣货信息是否已完成
                            if (allot.Status != "5")
                            {
                                throw new Exception("当前托盘拣货信息未完成，请完成后回库！");
                            }
                        }
                    }
                    #endregion
                }

                var allotLocate = new AllotLocation();

                SysStorageLocat locate;

                #region 根据sku确认区域划分

                //物料信息
                var sku = Db.Queryable<SysMaterials>().First(m => m.IsDel == "0" && m.SkuNo == skuNo);
                if (sku == null)
                {
                    throw new Exception("物料编码不存在，不可入库");
                }
                //判断物料是否含有类别信息
                if (string.IsNullOrWhiteSpace(sku.CategoryNo))
                {
                    throw new Exception($"物料：{sku.SkuNo}未设置类别,不可入库");
                }
                //物料类别信息
                var skuCategory = Db.Queryable<SysMaterialCategory>().First(m => m.IsDel == "0" && m.CategoryNo == sku.CategoryNo);
                if (skuCategory == null)
                {
                    throw new Exception($"{sku.SkuNo}物料类别不存在，不可入库");
                }
                //整理区域信息
                var areaStr = skuCategory.AreaNo.Split(",");
                var areaList = new List<string>();
                foreach (var item in areaStr)
                {
                    areaList.Add(item);
                }


                var roadList = Db.Queryable<SysStorageLocat>().Where(m => m.WareHouseNo == houseNo && areaList.Contains(m.AreaNo))
                    .GroupBy(m => m.RoadwayNo).OrderBy(m => m.RoadwayNo).Select(m => m.RoadwayNo).ToList();


                #endregion

                var roadNo = allotLocate.GetMiJiSuiTableRoad(houseNo, roadList, areaList, skuNo, lotNo);

                if (string.IsNullOrWhiteSpace(roadNo))
                {
                    throw new Exception("未查询到存在空储位巷道");
                }

                Db.BeginTran();
                try
                {
                    //添加巷道使用记录
                    var log = new SysRoadwayUseLog
                    {
                        RoadwayNo = roadNo,
                        WareHouseNo = houseNo,
                        Row = 0,
                        Column = 0,
                        Layer = 0,
                    };
                    Db.Insertable(log).ExecuteCommand();

                    // 添加入库日志记录
                    var taskNo = new Common().GetMaxNo("TK");
                    var exTask = new LogTask    //入库任务
                    {
                        TaskNo = taskNo,
                        Sender = "WMS",
                        Receiver = "WCS",
                        IsSuccess = 1, //是否下发成功 0失败 1成功
                        SendDate = DateTime.Now,  //发送时间
                        BackDate = DateTime.Now,  //返回时间
                        StartRoadway = "",            // 起始巷道
                        StartLocat = "",//起始位置
                        EndLocat = "",//目标位置
                        EndRoadway = roadNo,  // 目标巷道
                        PalletNo = palletNo,//托盘码
                        IsSend = 1,//是否可再次下发
                        IsCancel = 1,//是否可取消
                        IsFinish = 1,//是否可完成
                        Type = "0",//任务类型 0 入库任务 1 出库任务  2 移库任务
                        Status = "1",//任务状态0：等待执行1正在执行2执行完成
                        OrderType = "0",//0 入库单 1 出库单  2 盘点单  3 移库单
                        Msg = "入库口到=>>" + roadNo + "巷道的入库任务", //关键信息

                    };
                    Db.Insertable(exTask).ExecuteCommand();

                    var asnNo = "";
                    // 添加托盘绑定表托盘入库任务号  liudl
                    if (palletBindList.Count < 1)
                    {
                        foreach (DataStockDetail stockModel in stockDetail)
                        {
                            var bindModel = Db.Queryable<BllPalletBind>().First(m => m.IsDel == "0" && m.Status == "2"
                            && m.PalletNo == stockModel.PalletNo && m.ASNNo == stockModel.ASNNo && m.ASNDetailNo == stockModel.ASNDetailNo);
                            if (bindModel != null && string.IsNullOrWhiteSpace(bindModel.TaskNo))
                            {
                                bindModel.TaskNo = taskNo;
                                bindModel.WareHouseNo = houseNo;
                                bindModel.RoadwayNo = roadNo;
                                Db.Updateable(bindModel).ExecuteCommand();
                                asnNo = stockModel.ASNNo;
                            }


                        }
                    }
                    foreach (DataStockDetail stockModel in stockDetail)
                    {
                        //添加托盘上架记录
                        var upShelf = new BllPalletUpShelf()
                        {
                            TaskNo = exTask.TaskNo,
                            TraceNo = asnNo,
                            PalletNo = palletNo,
                            SkuNo = stockModel.SkuNo,
                            SkuName = stockModel.SkuName,
                            LotNo = stockModel.LotNo,
                            Status = "1",

                            WareHouseNo = houseNo,
                            RoadwayNo = roadNo,
                            AreaNo = "",
                            LocatNo = "",

                            CreateUser = 0,
                        };
                        Db.Insertable(upShelf).ExecuteCommand();
                    }


                    if (palletBindList.Count >= 1)
                    {
                        foreach (var item in palletBindList)
                        {
                            item.WareHouseNo = houseNo;
                            item.RoadwayNo = roadNo;
                            item.TaskNo = taskNo;
                        }
                        Db.Updateable(palletBindList).ExecuteCommand();
                    }
                    Db.CommitTran();

                    comDto = new OutCommandDto()
                    {
                        PalletNo = palletNo,//托盘号
                        StartRoadway = "",
                        StartLocate = "", // 起始位置
                        EndLocate = "", // 目标位置 
                        EndRoadway = roadNo,   // 目标巷道
                        TaskNo = taskNo, // 任务号
                        TaskType = "0",// 任务类型:入库任务
                        OutMode = "",  //目标地址
                        Order = 1
                    };
                }
                catch (Exception ex)
                {
                    Db.RollbackTran();
                    throw new Exception(ex.Message);
                }
                #endregion

                return comDto;
            }
            catch (Exception e)
            {
                throw new Exception(e.Message);
            }
        }

        /// <summary>
        /// 1 申请储位 2 申请巷道后 再申请储位储位 
        /// </summary>
        /// <param name="palletNo"></param>
        /// <param name="houseNo"></param>
        /// <param name="roadwayNo"></param>
        /// <returns></returns>
        /// <exception cref="Exception"></exception>
        public OutCommandDto RequestMiJiLocation(string palletNo, string houseNo, string roadwayNo)
        {
            try
            {
                //验证托盘条码是否为空
                if (string.IsNullOrEmpty(palletNo))
                {
                    throw new Exception("请输入要申请的托盘条码");
                }
                //验证所属仓库是否为空
                if (string.IsNullOrEmpty(houseNo))
                {
                    throw new Exception("请选择所属仓库");
                }
                //验证是否为平库入库
                if (houseNo == "W02")
                {
                    throw new Exception("平库请使用PDA手持进行平库入库");
                }

                OutCommandDto comDto;//返回wcs的入库命令
                var isHaveLocateNo = false; //托盘绑定信息中是否已有指定储位

                var stock = Db.Queryable<SysPallets>().First(a => a.PalletNo == palletNo);//托盘信息

                //判断托盘条码是否有效
                if (stock == null)
                    throw new Exception("托盘条码不受WMS管理，不可入库！");

                #region 

                //查询托盘绑定信息(状态为等待入库的)
                var palletBindList = Db.Queryable<BllPalletBind>().Where(m => m.IsDel == "0" && m.PalletNo == palletNo && (m.Status == "0" || m.Status == "1")).ToList();
                var haveLocate = palletBindList.FirstOrDefault(m => !string.IsNullOrWhiteSpace(m.LocatNo));

                var skuList = Db.Queryable<SysMaterials>().Where(m => m.IsDel == "0").ToList();
                //物料类别信息
                var skuCategoryList = Db.Queryable<SysMaterialCategory>().Where(m => m.IsDel == "0").ToList();

                var skuNo = ""; //入库物料
                var isAddTask = true; //是否添加新任务
                var oldTaskNo = "";  //旧任务号
                var stockDetail = Db.Queryable<DataStockDetail>().Where(m => m.PalletNo == palletNo).ToList();
                if (palletBindList.Count >= 1) //正常入库
                {
                    var palletBind = palletBindList.FirstOrDefault(m => m.Status == "1");
                    if (palletBind != null)
                    {
                        var beingTask = Db.Queryable<LogTask>().First(m => m.IsDel == "0" && m.TaskNo == palletBind.TaskNo);
                        if (beingTask == null)
                        {
                            throw new Exception("该托盘正在入库，但未查询到任务信息");
                        }
                        if (!string.IsNullOrWhiteSpace(beingTask.EndLocat))
                        {
                            comDto = new OutCommandDto()
                            {
                                PalletNo = palletNo,//托盘号
                                StartRoadway = beingTask.StartRoadway, // 起始巷道
                                StartLocate = "", // 起始位置
                                EndLocate = beingTask.EndLocat, // 目标位置
                                EndRoadway = beingTask.EndRoadway,                           //  目标巷道
                                TaskNo = beingTask.TaskNo, // 任务号
                                TaskType = "0",// 任务类型 (出库)
                                OutMode = "",  //目标地址
                                Order = 1
                            };
                            if (beingTask.IsSuccess == 0)
                            {
                                beingTask.IsSuccess = 1;
                                Db.Updateable(beingTask).ExecuteCommand();
                            }
                            return comDto;
                        }
                        else
                        {
                            if (string.IsNullOrWhiteSpace(roadwayNo))
                            {
                                roadwayNo = beingTask.EndRoadway;
                            }
                            isAddTask = false;
                            oldTaskNo = beingTask.TaskNo;
                        }
                    }
                    if (haveLocate != null)
                    {
                        isHaveLocateNo = true; //已有指定储位
                    }

                    if (palletBindList.First().Type == "0") //物料托入库
                    {
                        //判断是否绑定单据及单据状态是否正常
                        foreach (var item in palletBindList)
                        {
                            var notice = Db.Queryable<BllArrivalNotice>().First(m => m.IsDel == "0" && m.ASNNo == item.ASNNo);
                            if (notice == null)
                            {
                                throw new Exception("托盘存在物料未绑定入库单，不可入库！");
                            }
                            if (notice.Status == "3")
                            {
                                throw new Exception($"入库单{item.ASNNo}已关闭，不可入库！");
                            }
                        }

                        //获取物料存放区域
                        var noticeDetail = Db.Queryable<BllArrivalNoticeDetail>().First(m =>
                            m.IsDel == "0" && m.Id == palletBindList.First().ASNDetailNo);
                        if (noticeDetail == null)
                        {
                            throw new Exception("托盘存在物料未绑定入库单明细，不可入库");
                        }

                        skuNo = noticeDetail.SkuNo;

                    }
                    else if (palletBindList.First().Type == "1")//空托盘
                    {
                        skuNo = "100099";
                    }
                }
                else //回流入库
                {
                    if (stockDetail.Count == 0)
                    {
                        throw new Exception($"{palletNo}托盘条码不具有箱码信息，不可入库！");
                    }
                    if (stockDetail.Count(m => !string.IsNullOrWhiteSpace(m.LocatNo)) > 0)
                    {
                        throw new Exception("当前托盘已在库内，请核实");
                    }
                    skuNo = stockDetail.First().SkuNo;

                    var beingTask = Db.Queryable<LogTask>().First(m => m.IsDel == "0"
                    && (m.Status == "0" || m.Status == "1") && m.PalletNo == palletNo && m.Type == "0");
                    if (beingTask != null)
                    {
                        if (!string.IsNullOrWhiteSpace(beingTask.EndLocat))
                        {
                            comDto = new OutCommandDto()
                            {
                                PalletNo = palletNo,//托盘号
                                StartRoadway = beingTask.StartRoadway, // 起始巷道
                                StartLocate = "", // 起始位置
                                EndLocate = beingTask.EndLocat, // 目标位置
                                EndRoadway = beingTask.EndRoadway,                           //  目标巷道
                                TaskNo = beingTask.TaskNo, // 任务号
                                TaskType = "0",// 任务类型 (出库)
                                OutMode = "",  //目标地址
                                Order = 1
                            };
                            if (beingTask.IsSuccess == 0)
                            {
                                beingTask.IsSuccess = 1;
                                beingTask.Status = "1";
                                Db.Updateable(beingTask).ExecuteCommand();
                            }
                            return comDto;
                        }
                        else
                        {
                            if (string.IsNullOrWhiteSpace(roadwayNo))
                            {
                                roadwayNo = beingTask.EndRoadway;
                            }
                            isAddTask = false;
                            oldTaskNo = beingTask.TaskNo;
                        }
                    }

                    //获取对应回库规则
                    var function = Db.Queryable<SysFunSetting>().First(a => a.IsDel == "0" && a.FunSetName == "托盘回库验证" && a.IsEnable == "NO");
                    #region 托盘回库规则

                    if (function != null)
                    {
                        //拣货完成后允许托盘回库
                        if (function.SetValue == "CompletePick")
                        {
                            var allot = Db.Queryable<BllExportAllot>().First(a => a.IsDel == "0" && a.LotNo == stockDetail[0].LotNo && a.PalletNo == palletNo && a.SkuNo == stockDetail[0].SkuNo);

                            //验证拣货明细是否存在
                            if (allot != null)
                            {
                                //验证当前托盘拣货信息是否已完成
                                if (allot.Status != "5")
                                {
                                    throw new Exception("当前托盘拣货信息未完成，请完成后回库！");
                                }
                            }
                        }
                    }
                    #endregion
                }

                var allotLocate = new AllotLocation();

                #region 申请储位

                SysStorageLocat locate;
                if (isHaveLocateNo) //指定储位
                {
                    locate = Db.Queryable<SysStorageLocat>().First(m => m.LocatNo == haveLocate.LocatNo);
                }
                else
                {
                    var sku = skuList.FirstOrDefault(m => m.SkuNo == skuNo);
                    if (sku == null)
                    {
                        throw new Exception("物料信息中未查询到入库单明细包含的物料信息，不可入库");
                    }
                    //判断物料是否含有类别信息
                    if (string.IsNullOrWhiteSpace(sku.CategoryNo))
                    {
                        throw new Exception($"物料：{sku.SkuNo}未查询到类别信息");
                    }

                    var skuCategory = skuCategoryList.FirstOrDefault(m => m.CategoryNo == sku.CategoryNo);
                    if (skuCategory == null)
                    {
                        throw new Exception($"未在类别信息中查询到物料：{sku.SkuNo}包含的类别");
                    }

                    var areaStr = skuCategory.AreaNo.Split(",");
                    var areaList = new List<string>();
                    foreach (var item in areaStr)
                    {
                        areaList.Add(item);
                    }

                    locate = allotLocate.GetMiJiSuiTableLocate(roadwayNo, areaList);
                }

                #endregion

                Db.BeginTran();
                try
                {

                    if (isAddTask) // 正常入库
                    {
                        var taskNo = new Common().GetMaxNo("TK");
                        var exTask = new LogTask    //入库任务
                        {
                            TaskNo = taskNo,
                            Sender = "WMS",
                            Receiver = "WCS",
                            IsSuccess = 1, //是否下发成功 0失败 1成功
                            SendDate = DateTime.Now,  //发送时间
                            BackDate = DateTime.Now,  //返回时间
                            StartRoadway = "",            // 起始巷道
                            StartLocat = "",//起始位置
                            EndLocat = locate.LocatNo,//目标位置
                            EndRoadway = locate.RoadwayNo,  // 目标巷道
                            PalletNo = palletNo,//托盘码
                            IsSend = 1,//是否可再次下发
                            IsCancel = 1,//是否可取消
                            IsFinish = 1,//是否可完成
                            Type = "0",//任务类型 0 入库任务 1 出库任务  2 移库任务
                            Status = "1",//任务状态0：等待执行1正在执行2执行完成
                            OrderType = "0",//0 入库单 1 出库单  2 盘点单  3 移库单
                            Msg = "入库口到=>>" + locate.LocatNo + "的入库任务", //关键信息

                        };
                        Db.Insertable(exTask).ExecuteCommand();
                        var asnNo = "";
                        // 添加托盘绑定表托盘入库任务号 liudl
                        foreach (DataStockDetail stockModel in stockDetail)
                        {
                            var bindModel = Db.Queryable<BllPalletBind>().First(m => m.IsDel == "0" && m.Status == "2"
                            && m.PalletNo == stockModel.PalletNo && m.ASNNo == stockModel.ASNNo && m.ASNDetailNo == stockModel.ASNDetailNo);
                            if (bindModel != null && string.IsNullOrWhiteSpace(bindModel.TaskNo))
                            {
                                bindModel.TaskNo = taskNo;
                                bindModel.WareHouseNo = locate.WareHouseNo;
                                bindModel.RoadwayNo = locate.RoadwayNo;
                                bindModel.LocatNo = locate.LocatNo;
                                Db.Updateable(bindModel).ExecuteCommand();
                                asnNo = stockModel.ASNNo;
                            }
                        }
                        foreach (DataStockDetail stockModel in stockDetail)
                        {
                            //添加托盘上架记录
                            var upShelf = new BllPalletUpShelf()
                            {
                                TaskNo = exTask.TaskNo,
                                TraceNo = asnNo,
                                PalletNo = palletNo,
                                SkuNo = stockModel.SkuNo,
                                SkuName = stockModel.SkuName,
                                LotNo = stockModel.LotNo,
                                Status = "1",

                                WareHouseNo = houseNo,
                                RoadwayNo = locate.RoadwayNo,
                                AreaNo = locate.AreaNo,
                                LocatNo = locate.LocatNo,

                                CreateUser = 0,
                            };
                            Db.Insertable(upShelf).ExecuteCommand();
                        }

                        oldTaskNo = taskNo;
                    }
                    else
                    {
                        var oldTask = Db.Queryable<LogTask>().First(m => m.IsDel == "0" && m.TaskNo == oldTaskNo);
                        oldTask.EndLocat = locate.LocatNo;
                        oldTask.EndRoadway = locate.RoadwayNo;
                        if (oldTask.IsSuccess == 0)
                        {
                            oldTask.IsSuccess = 1;
                            oldTask.Status = "1";
                        }
                        Db.Updateable(oldTask).ExecuteCommand();


                        var bindModelList = Db.Queryable<BllPalletBind>().Where(m => m.IsDel == "0" && m.Status == "2"
                           && m.PalletNo == oldTask.PalletNo && m.TaskNo == oldTaskNo).ToList();
                        foreach (var bindModel in bindModelList)
                        {
                            if (string.IsNullOrWhiteSpace(bindModel.LocatNo))
                            {
                                bindModel.TaskNo = oldTask.TaskNo;
                                bindModel.WareHouseNo = locate.WareHouseNo;
                                bindModel.RoadwayNo = locate.RoadwayNo;
                                bindModel.LocatNo = locate.LocatNo;
                                Db.Updateable(bindModel).ExecuteCommand();

                            }
                        }
                        //更改上架信息
                        var upShelfList = Db.Queryable<BllPalletUpShelf>().Where(m => m.IsDel == "0" && m.TaskNo == oldTask.TaskNo && m.PalletNo == palletNo).ToList();
                        foreach (var upShelf in upShelfList)
                        {
                            upShelf.WareHouseNo = locate.WareHouseNo;
                            upShelf.RoadwayNo = locate.RoadwayNo;
                            upShelf.LocatNo = locate.LocatNo;
                            upShelf.Status = "1";
                            Db.Updateable(upShelf).ExecuteCommand();

                        }


                    }

                    locate.Status = "2";
                    Db.Updateable(locate).ExecuteCommand();
                    if (palletBindList.Count >= 1)
                    {
                        foreach (var item in palletBindList)
                        {
                            item.Status = "1";
                            item.WareHouseNo = locate.WareHouseNo;
                            item.RoadwayNo = locate.RoadwayNo;
                            item.LocatNo = locate.LocatNo;
                            item.TaskNo = oldTaskNo;
                        }
                        Db.Updateable(palletBindList).ExecuteCommand();
                    }
                    Db.CommitTran();
                    comDto = new OutCommandDto()
                    {
                        PalletNo = palletNo,//托盘号
                        StartRoadway = "",
                        StartLocate = "", // 起始位置
                        EndLocate = locate.LocatNo, // 目标位置 
                        EndRoadway = locate.RoadwayNo,   // 目标巷道
                        TaskNo = oldTaskNo, // 任务号
                        TaskType = "0",// 任务类型 (出库)
                        OutMode = "",  //目标地址
                        Order = 1
                    };

                }
                catch (Exception ex)
                {
                    Db.RollbackTran();
                    throw new Exception(ex.Message);
                }
                #endregion


                return comDto;
            }
            catch (Exception e)
            {
                throw new Exception(e.Message);
            }
        }

        /// <summary>
        /// 下发入库申请储位任务（下发==》AGV小车）
        /// </summary>
        /// <param name="model"></param>
@@ -2048,356 +2800,6 @@
        #region 申请储位、巷道  任务完成、取消


        /// <summary>
        /// 申请巷道(密集库)
        /// </summary>
        /// <param name="palletNo"></param>
        /// <param name="houseNo"></param>
        /// <returns></returns>
        /// <exception cref="Exception"></exception>
        public OutCommandDto RequestMiJiRoadWay(string palletNo, string houseNo)
        {
            try
            {
                #region 验证托盘合法性
                //验证托盘条码是否为空
                if (string.IsNullOrEmpty(palletNo))
                {
                    throw new Exception("请输入要申请的托盘条码");
                }
                //验证所属仓库是否为空
                if (string.IsNullOrEmpty(houseNo))
                {
                    throw new Exception("请选择所属仓库");
                }
                //获取仓库类型
                var houseType = Db.Queryable<SysWareHouse>().First(a => a.WareHouseNo == houseNo);
                //验证是否为密集库
                if (houseType.Type != "3")
                {
                    throw new Exception("仓库不是密集库");
                }

                var stock = Db.Queryable<SysPallets>().First(a => a.PalletNo == palletNo);//托盘信息
                //判断托盘条码是否有效
                if (stock == null)
                {
                    throw new Exception("托盘条码不受WMS管理，不可入库！");
                }
                #endregion


                OutCommandDto comDto;//返回wcs的入库命令
                #region 

                //查询托盘绑定信息(状态为等待入库/正在执行的)
                var palletBindList = Db.Queryable<BllPalletBind>()
                    .Where(m => m.IsDel == "0" && m.PalletNo == palletNo && (m.Status == "0" || m.Status == "1")).ToList();
                var haveLocate = palletBindList.FirstOrDefault(m => !string.IsNullOrWhiteSpace(m.LocatNo));
                
                var skuNo = ""; //入库物料
                var lotNo = ""; //入库批次

                var stockDetail = Db.Queryable<DataStockDetail>().Where(m => m.PalletNo == palletNo).ToList();
                if (palletBindList.Count >= 1) //正常入库
                {
                    var palletBind = palletBindList.FirstOrDefault(m => m.Status == "1");//查询是否有正在执行的托盘绑定
                    if (palletBind != null)
                    {
                        var beingTask = Db.Queryable<LogTask>().First(m => m.IsDel == "0" && m.TaskNo == palletBind.TaskNo);
                        if (beingTask == null)
                        {
                            throw new Exception("该托盘正在入库，但未查询到任务信息");
                        }

                        comDto = new OutCommandDto()
                        {
                            PalletNo = palletNo,//托盘号
                            StartRoadway = beingTask.StartRoadway, // 起始巷道
                            StartLocate = beingTask.StartLocat, // 起始位置
                            EndLocate = beingTask.EndLocat, // 目标位置
                            EndRoadway = beingTask.EndRoadway,                           //  目标巷道
                            TaskNo = beingTask.TaskNo, // 任务号
                            TaskType = "0",// 任务类型 (入库)
                            OutMode = "",  //目标地址
                            Order = 1
                        };
                        if (beingTask.IsSuccess == 0)
                        {
                            beingTask.IsSuccess = 1;
                            Db.Updateable(beingTask).ExecuteCommand();
                        }
                        return comDto;

                    }
                    

                    //  验证是否关联单据，获取托盘上存放的物料
                    if (palletBindList.First().Type == "0") //物料托入库
                    {
                        //判断是否绑定单据及单据状态是否正常
                        foreach (var item in palletBindList)
                        {
                            var notice = Db.Queryable<BllArrivalNotice>().First(m => m.IsDel == "0" && m.ASNNo == item.ASNNo);
                            if (notice == null)
                            {
                                throw new Exception("托盘存在物料未绑定入库单，不可入库！");
                            }
                            if (notice.Status == "3" || notice.Status == "4")
                            {
                                throw new Exception($"入库单{item.ASNNo}已关闭，不可入库！");
                            }
                        }

                        //获取物料存放区域
                        var noticeDetail = Db.Queryable<BllArrivalNoticeDetail>().First(m =>
                            m.IsDel == "0" && m.Id == palletBindList.First().ASNDetailNo);
                        if (noticeDetail == null)
                        {
                            throw new Exception("托盘存在物料未绑定入库单明细，不可入库");
                        }

                        skuNo = noticeDetail.SkuNo;
                        lotNo = noticeDetail.LotNo;

                    }
                    else if (palletBindList.First().Type == "1")//空托盘
                    {
                        skuNo = "100099";
                    }
                }
                else //回流入库
                {
                    if (stockDetail.Count == 0)
                    {
                        throw new Exception($"{palletNo}托盘不存在库存信息，不可入库！");
                    }
                    if (stockDetail.Count(m => !string.IsNullOrWhiteSpace(m.LocatNo)) > 0)
                    {
                        throw new Exception("当前托盘已在库内，请核实");
                    }
                    skuNo = stockDetail.First().SkuNo;
                    lotNo = stockDetail.First().LotNo;

                    #region 判断任务是否已经存在，若存在直接返回任务；
                    var beingTask = Db.Queryable<LogTask>().First(m => m.IsDel == "0"
                    && (m.Status == "0" || m.Status == "1") && m.PalletNo == palletNo && m.Type == "0");
                    if (beingTask != null)
                    {
                        comDto = new OutCommandDto()
                        {
                            PalletNo = palletNo,//托盘号
                            StartRoadway = beingTask.StartRoadway, // 起始巷道
                            StartLocate = beingTask.StartLocat, // 起始位置
                            EndLocate = beingTask.EndLocat, // 目标位置
                            EndRoadway = beingTask.EndRoadway,  //  目标巷道
                            TaskNo = beingTask.TaskNo, // 任务号
                            TaskType = "0",// 任务类型 (出库)
                            OutMode = "",  //目标地址
                            Order = 1
                        };
                        if (beingTask.IsSuccess == 0)
                        {
                            beingTask.IsSuccess = 1;
                            beingTask.Status = "1";
                            Db.Updateable(beingTask).ExecuteCommand();
                        }

                        return comDto;
                    }
                    #endregion

                    #region 判断该托盘，是否符合回库功能设定的回库规则
                    //获取对应回库规则
                    var function = Db.Queryable<SysFunSetting>().First(a => a.IsDel == "0"
                    && a.FunSetNo == "Fun041" && a.IsEnable == "NO");
                    if (function != null)
                    {
                        //拣货完成后允许托盘回库
                        var allot = Db.Queryable<BllExportAllot>().First(a => a.IsDel == "0"
                        && a.LotNo == stockDetail[0].LotNo && a.PalletNo == palletNo && a.SkuNo == stockDetail[0].SkuNo);

                        //验证拣货明细是否存在
                        if (allot != null)
                        {
                            //验证当前托盘拣货信息是否已完成
                            if (allot.Status != "5")
                            {
                                throw new Exception("当前托盘拣货信息未完成，请完成后回库！");
                            }
                        }
                    }
                    #endregion
                }

                var allotLocate = new AllotLocation();

                SysStorageLocat locate;

                #region 根据sku确认区域划分
                
                //物料信息
                var sku = Db.Queryable<SysMaterials>().First(m => m.IsDel == "0" && m.SkuNo == skuNo);
                if (sku == null)
                {
                    throw new Exception("物料编码不存在，不可入库");
                }
                //判断物料是否含有类别信息
                if (string.IsNullOrWhiteSpace(sku.CategoryNo))
                {
                    throw new Exception($"物料：{sku.SkuNo}未设置类别,不可入库");
                }
                //物料类别信息
                var skuCategory = Db.Queryable<SysMaterialCategory>().First(m => m.IsDel == "0" && m.CategoryNo == sku.CategoryNo);
                if (skuCategory == null)
                {
                    throw new Exception($"{sku.SkuNo}物料类别不存在，不可入库");
                }
                //整理区域信息
                var areaStr = skuCategory.AreaNo.Split(",");
                var areaList = new List<string>();
                foreach (var item in areaStr)
                {
                    areaList.Add(item);
                }

                
                var roadList = Db.Queryable<SysStorageLocat>().Where(m => m.WareHouseNo == houseNo && areaList.Contains(m.AreaNo))
                    .GroupBy(m => m.RoadwayNo).OrderBy(m => m.RoadwayNo).Select(m => m.RoadwayNo).ToList();

                 
                #endregion

                var roadNo = allotLocate.GetMiJiSuiTableRoad(houseNo, roadList, areaList,skuNo,lotNo);

                if (string.IsNullOrWhiteSpace(roadNo))
                {
                    throw new Exception("未查询到存在空储位巷道");
                }

                Db.BeginTran();
                try
                {
                    //添加巷道使用记录
                    var log = new SysRoadwayUseLog
                    {
                        RoadwayNo = roadNo,
                        WareHouseNo = houseNo,
                        Row = 0,
                        Column = 0,
                        Layer = 0,
                    };
                    Db.Insertable(log).ExecuteCommand();

                    // 添加入库日志记录
                    var taskNo = new Common().GetMaxNo("TK");
                    var exTask = new LogTask    //入库任务
                    {
                        TaskNo = taskNo,
                        Sender = "WMS",
                        Receiver = "WCS",
                        IsSuccess = 1, //是否下发成功 0失败 1成功
                        SendDate = DateTime.Now,  //发送时间
                        BackDate = DateTime.Now,  //返回时间
                        StartRoadway = "",            // 起始巷道
                        StartLocat = "",//起始位置
                        EndLocat = "",//目标位置
                        EndRoadway = roadNo,  // 目标巷道
                        PalletNo = palletNo,//托盘码
                        IsSend = 1,//是否可再次下发
                        IsCancel = 1,//是否可取消
                        IsFinish = 1,//是否可完成
                        Type = "0",//任务类型 0 入库任务 1 出库任务  2 移库任务
                        Status = "1",//任务状态0：等待执行1正在执行2执行完成
                        OrderType = "0",//0 入库单 1 出库单  2 盘点单  3 移库单
                        Msg = "入库口到=>>" + roadNo + "巷道的入库任务", //关键信息

                    };
                    Db.Insertable(exTask).ExecuteCommand();

                    var asnNo = "";
                    // 添加托盘绑定表托盘入库任务号  liudl
                    if (palletBindList.Count < 1)
                    {
                        foreach (DataStockDetail stockModel in stockDetail)
                        {
                            var bindModel = Db.Queryable<BllPalletBind>().First(m => m.IsDel == "0" && m.Status == "2"
                            && m.PalletNo == stockModel.PalletNo && m.ASNNo == stockModel.ASNNo && m.ASNDetailNo == stockModel.ASNDetailNo);
                            if (bindModel != null && string.IsNullOrWhiteSpace(bindModel.TaskNo))
                            {
                                bindModel.TaskNo = taskNo;
                                bindModel.WareHouseNo = houseNo;
                                bindModel.RoadwayNo = roadNo;
                                Db.Updateable(bindModel).ExecuteCommand();
                                asnNo = stockModel.ASNNo;
                            }


                        }
                    }
                    foreach (DataStockDetail stockModel in stockDetail)
                    {
                        //添加托盘上架记录
                        var upShelf = new BllPalletUpShelf()
                        {
                            TaskNo = exTask.TaskNo,
                            TraceNo = asnNo,
                            PalletNo = palletNo,
                            SkuNo = stockModel.SkuNo,
                            SkuName = stockModel.SkuName,
                            LotNo = stockModel.LotNo,
                            Status = "1",

                            WareHouseNo = houseNo,
                            RoadwayNo = roadNo,
                            AreaNo = "",
                            LocatNo = "",

                            CreateUser = 0,
                        };
                        Db.Insertable(upShelf).ExecuteCommand();
                    }


                    if (palletBindList.Count >= 1)
                    {
                        foreach (var item in palletBindList)
                        {
                            item.WareHouseNo = houseNo;
                            item.RoadwayNo = roadNo;
                            item.TaskNo = taskNo;
                        }
                        Db.Updateable(palletBindList).ExecuteCommand();
                    }
                    Db.CommitTran();

                    comDto = new OutCommandDto()
                    {
                        PalletNo = palletNo,//托盘号
                        StartRoadway = "",
                        StartLocate = "", // 起始位置
                        EndLocate = "", // 目标位置 
                        EndRoadway = roadNo,   // 目标巷道
                        TaskNo = taskNo, // 任务号
                        TaskType = "0",// 任务类型:入库任务
                        OutMode = "",  //目标地址
                        Order = 1
                    };
                }
                catch (Exception ex)
                {
                    Db.RollbackTran();
                    throw new Exception(ex.Message);
                }
                #endregion

                return comDto;
            }
            catch (Exception e)
            {
                throw new Exception(e.Message);
            }
        }

        /// <summary>
        /// 申请巷道 （立体库）
@@ -2880,406 +3282,6 @@
            }
        }

        /// <summary>
        /// 1 申请储位 2 申请巷道后 再申请储位储位
        /// </summary>
        /// <param name="palletNo"></param>
        /// <param name="houseNo"></param>
        /// <param name="roadwayNo"></param>
        /// <returns></returns>
        /// <exception cref="Exception"></exception>
        public OutCommandDto RequestLocation(string palletNo, string houseNo, string roadwayNo)
        {
            try
            {
                //验证托盘条码是否为空
                if (string.IsNullOrEmpty(palletNo))
                {
                    throw new Exception("请输入要申请的托盘条码");
                }
                //验证所属仓库是否为空
                if (string.IsNullOrEmpty(houseNo))
                {
                    throw new Exception("请选择所属仓库");
                }
                //验证是否为平库入库
                if (houseNo == "W02")
                {
                    throw new Exception("平库请使用PDA手持进行平库入库");
                }

                OutCommandDto comDto;//返回wcs的入库命令
                var isHaveLocateNo = false; //托盘绑定信息中是否已有指定储位

                var stock = Db.Queryable<SysPallets>().First(a => a.PalletNo == palletNo);//托盘信息

                //判断托盘条码是否有效
                if (stock == null)
                    throw new Exception("托盘条码不受WMS管理，不可入库！");

                #region 

                //查询托盘绑定信息(状态为等待入库的)
                var palletBindList = Db.Queryable<BllPalletBind>().Where(m => m.IsDel == "0" && m.PalletNo == palletNo && (m.Status == "0" || m.Status == "1")).ToList();
                var haveLocate = palletBindList.FirstOrDefault(m => !string.IsNullOrWhiteSpace(m.LocatNo));

                var skuList = Db.Queryable<SysMaterials>().Where(m => m.IsDel == "0").ToList();
                //物料类别信息
                var skuCategoryList = Db.Queryable<SysMaterialCategory>().Where(m => m.IsDel == "0").ToList();

                var skuNo = ""; //入库物料
                var isAddTask = true; //是否添加新任务
                var oldTaskNo = "";  //旧任务号
                var stockDetail = Db.Queryable<DataStockDetail>().Where(m => m.PalletNo == palletNo).ToList();
                if (palletBindList.Count >= 1) //正常入库
                {
                    var palletBind = palletBindList.FirstOrDefault(m => m.Status == "1");
                    if (palletBind != null)
                    {
                        var beingTask = Db.Queryable<LogTask>().First(m => m.IsDel == "0" && m.TaskNo == palletBind.TaskNo);
                        if (beingTask == null)
                        {
                            throw new Exception("该托盘正在入库，但未查询到任务信息");
                        }
                        if (!string.IsNullOrWhiteSpace(beingTask.EndLocat))
                        {
                            comDto = new OutCommandDto()
                            {
                                PalletNo = palletNo,//托盘号
                                StartRoadway = beingTask.StartRoadway, // 起始巷道
                                StartLocate = "", // 起始位置
                                EndLocate = beingTask.EndLocat, // 目标位置
                                EndRoadway = beingTask.EndRoadway,                           //  目标巷道
                                TaskNo = beingTask.TaskNo, // 任务号
                                TaskType = "0",// 任务类型 (出库)
                                OutMode = "",  //目标地址
                                Order = 1
                            };
                            if (beingTask.IsSuccess == 0)
                            {
                                beingTask.IsSuccess = 1;
                                Db.Updateable(beingTask).ExecuteCommand();
                            }
                            return comDto;
                        }
                        else
                        {
                            if (string.IsNullOrWhiteSpace(roadwayNo))
                            {
                                roadwayNo = beingTask.EndRoadway;
                            }
                            isAddTask = false;
                            oldTaskNo = beingTask.TaskNo;
                        }
                    }
                    if (haveLocate != null)
                    {
                        isHaveLocateNo = true; //已有指定储位
                    }

                    if (palletBindList.First().Type == "0") //物料托入库
                    {
                        //判断是否绑定单据及单据状态是否正常
                        foreach (var item in palletBindList)
                        {
                            var notice = Db.Queryable<BllArrivalNotice>().First(m => m.IsDel == "0" && m.ASNNo == item.ASNNo);
                            if (notice == null)
                            {
                                throw new Exception("托盘存在物料未绑定入库单，不可入库！");
                            }
                            if (notice.Status == "3")
                            {
                                throw new Exception($"入库单{item.ASNNo}已关闭，不可入库！");
                            }
                        }

                        //获取物料存放区域
                        var noticeDetail = Db.Queryable<BllArrivalNoticeDetail>().First(m =>
                            m.IsDel == "0" && m.Id == palletBindList.First().ASNDetailNo);
                        if (noticeDetail == null)
                        {
                            throw new Exception("托盘存在物料未绑定入库单明细，不可入库");
                        }

                        skuNo = noticeDetail.SkuNo;

                    }
                    else if (palletBindList.First().Type == "1")//空托盘
                    {
                        skuNo = "100099";
                    }
                }
                else //回流入库
                {
                    if (stockDetail.Count == 0)
                    {
                        throw new Exception($"{palletNo}托盘条码不具有箱码信息，不可入库！");
                    }
                    if (stockDetail.Count(m => !string.IsNullOrWhiteSpace(m.LocatNo)) > 0)
                    {
                        throw new Exception("当前托盘已在库内，请核实");
                    }
                    skuNo = stockDetail.First().SkuNo;

                    var beingTask = Db.Queryable<LogTask>().First(m => m.IsDel == "0"
                    && (m.Status == "0" || m.Status == "1") && m.PalletNo == palletNo && m.Type == "0");
                    if (beingTask != null)
                    {
                        if (!string.IsNullOrWhiteSpace(beingTask.EndLocat))
                        {
                            comDto = new OutCommandDto()
                            {
                                PalletNo = palletNo,//托盘号
                                StartRoadway = beingTask.StartRoadway, // 起始巷道
                                StartLocate = "", // 起始位置
                                EndLocate = beingTask.EndLocat, // 目标位置
                                EndRoadway = beingTask.EndRoadway,                           //  目标巷道
                                TaskNo = beingTask.TaskNo, // 任务号
                                TaskType = "0",// 任务类型 (出库)
                                OutMode = "",  //目标地址
                                Order = 1
                            };
                            if (beingTask.IsSuccess == 0)
                            {
                                beingTask.IsSuccess = 1;
                                beingTask.Status = "1";
                                Db.Updateable(beingTask).ExecuteCommand();
                            }
                            return comDto;
                        }
                        else
                        {
                            if (string.IsNullOrWhiteSpace(roadwayNo))
                            {
                                roadwayNo = beingTask.EndRoadway;
                            }
                            isAddTask = false;
                            oldTaskNo = beingTask.TaskNo;
                        }
                    }

                    //获取对应回库规则
                    var function = Db.Queryable<SysFunSetting>().First(a => a.IsDel == "0" && a.FunSetName == "托盘回库验证" && a.IsEnable == "NO");
                    #region 托盘回库规则

                    if (function != null)
                    {
                        //拣货完成后允许托盘回库
                        if (function.SetValue == "CompletePick")
                        {
                            var allot = Db.Queryable<BllExportAllot>().First(a => a.IsDel == "0" && a.LotNo == stockDetail[0].LotNo && a.PalletNo == palletNo && a.SkuNo == stockDetail[0].SkuNo);

                            //验证拣货明细是否存在
                            if (allot != null)
                            {
                                //验证当前托盘拣货信息是否已完成
                                if (allot.Status != "5")
                                {
                                    throw new Exception("当前托盘拣货信息未完成，请完成后回库！");
                                }
                            }
                        }
                    }
                    #endregion
                }

                var allotLocate = new AllotLocation();

                #region 申请储位

                SysStorageLocat locate;
                if (isHaveLocateNo) //指定储位
                {
                    locate = Db.Queryable<SysStorageLocat>().First(m => m.LocatNo == haveLocate.LocatNo);
                }
                else
                {
                    var sku = skuList.FirstOrDefault(m => m.SkuNo == skuNo);
                    if (sku == null)
                    {
                        throw new Exception("物料信息中未查询到入库单明细包含的物料信息，不可入库");
                    }
                    //判断物料是否含有类别信息
                    if (string.IsNullOrWhiteSpace(sku.CategoryNo))
                    {
                        throw new Exception($"物料：{sku.SkuNo}未查询到类别信息");
                    }

                    var skuCategory = skuCategoryList.FirstOrDefault(m => m.CategoryNo == sku.CategoryNo);
                    if (skuCategory == null)
                    {
                        throw new Exception($"未在类别信息中查询到物料：{sku.SkuNo}包含的类别");
                    }

                    var areaStr = skuCategory.AreaNo.Split(",");
                    var areaList = new List<string>();
                    foreach (var item in areaStr)
                    {
                        areaList.Add(item);
                    }

                    locate = allotLocate.GetSuiTableLocate(houseNo, areaList, roadwayNo);
                }

                #endregion

                Db.BeginTran();
                try
                {

                    if (isAddTask) // 正常入库
                    {
                        var taskNo = new Common().GetMaxNo("TK");
                        var exTask = new LogTask    //入库任务
                        {
                            TaskNo = taskNo,
                            Sender = "WMS",
                            Receiver = "WCS",
                            IsSuccess = 1, //是否下发成功 0失败 1成功
                            SendDate = DateTime.Now,  //发送时间
                            BackDate = DateTime.Now,  //返回时间
                            StartRoadway = "",            // 起始巷道
                            StartLocat = "",//起始位置
                            EndLocat = locate.LocatNo,//目标位置
                            EndRoadway = locate.RoadwayNo,  // 目标巷道
                            PalletNo = palletNo,//托盘码
                            IsSend = 1,//是否可再次下发
                            IsCancel = 1,//是否可取消
                            IsFinish = 1,//是否可完成
                            Type = "0",//任务类型 0 入库任务 1 出库任务  2 移库任务
                            Status = "1",//任务状态0：等待执行1正在执行2执行完成
                            OrderType = "0",//0 入库单 1 出库单  2 盘点单  3 移库单
                            Msg = "入库口到=>>" + locate.LocatNo + "的入库任务", //关键信息

                        };
                        Db.Insertable(exTask).ExecuteCommand();
                        var asnNo = "";
                        // 添加托盘绑定表托盘入库任务号 liudl
                        foreach (DataStockDetail stockModel in stockDetail)
                        {
                            var bindModel = Db.Queryable<BllPalletBind>().First(m => m.IsDel == "0" && m.Status == "2"
                            && m.PalletNo == stockModel.PalletNo && m.ASNNo == stockModel.ASNNo && m.ASNDetailNo == stockModel.ASNDetailNo);
                            if (bindModel != null && string.IsNullOrWhiteSpace(bindModel.TaskNo))
                            {
                                bindModel.TaskNo = taskNo;
                                bindModel.WareHouseNo = locate.WareHouseNo;
                                bindModel.RoadwayNo = locate.RoadwayNo;
                                bindModel.LocatNo = locate.LocatNo;
                                Db.Updateable(bindModel).ExecuteCommand();
                                asnNo = stockModel.ASNNo;
                            }
                        }
                        foreach (DataStockDetail stockModel in stockDetail)
                        {
                            //添加托盘上架记录
                            var upShelf = new BllPalletUpShelf()
                            {
                                TaskNo = exTask.TaskNo,
                                TraceNo = asnNo,
                                PalletNo = palletNo,
                                SkuNo = stockModel.SkuNo,
                                SkuName = stockModel.SkuName,
                                LotNo = stockModel.LotNo,
                                Status = "1",

                                WareHouseNo = houseNo,
                                RoadwayNo = locate.RoadwayNo,
                                AreaNo = locate.AreaNo,
                                LocatNo = locate.LocatNo,

                                CreateUser = 0,
                            };
                            Db.Insertable(upShelf).ExecuteCommand();
                        }
                            
                        oldTaskNo = taskNo;
                    }
                    else
                    {
                        var oldTask = Db.Queryable<LogTask>().First(m => m.IsDel == "0" && m.TaskNo == oldTaskNo);
                        oldTask.EndLocat = locate.LocatNo;
                        oldTask.EndRoadway = locate.RoadwayNo;
                        if (oldTask.IsSuccess == 0)
                        {
                            oldTask.IsSuccess = 1;
                            oldTask.Status = "1";
                        }
                        Db.Updateable(oldTask).ExecuteCommand();


                        var bindModelList = Db.Queryable<BllPalletBind>().Where(m => m.IsDel == "0" && m.Status == "2"
                           && m.PalletNo == oldTask.PalletNo && m.TaskNo == oldTaskNo).ToList();
                        foreach (var bindModel in bindModelList)
                        {
                            if (string.IsNullOrWhiteSpace(bindModel.LocatNo))
                            {
                                bindModel.TaskNo = oldTask.TaskNo;
                                bindModel.WareHouseNo = locate.WareHouseNo;
                                bindModel.RoadwayNo = locate.RoadwayNo;
                                bindModel.LocatNo = locate.LocatNo;
                                Db.Updateable(bindModel).ExecuteCommand();
                                
                            }
                        }
                        //更改上架信息
                        var upShelfList = Db.Queryable<BllPalletUpShelf>().Where(m => m.IsDel == "0" && m.TaskNo == oldTask.TaskNo && m.PalletNo == palletNo).ToList();
                        foreach (var upShelf in upShelfList)
                        {
                            upShelf.WareHouseNo = locate.WareHouseNo;
                            upShelf.RoadwayNo = locate.RoadwayNo;
                            upShelf.LocatNo = locate.LocatNo;
                            upShelf.Status = "1";
                            Db.Updateable(upShelf).ExecuteCommand();
                             
                        }


                    }

                    locate.Status = "2";
                    Db.Updateable(locate).ExecuteCommand();
                    if (palletBindList.Count >= 1)
                    {
                        foreach (var item in palletBindList)
                        {
                            item.Status = "1";
                            item.WareHouseNo = locate.WareHouseNo;
                            item.RoadwayNo = locate.RoadwayNo;
                            item.LocatNo = locate.LocatNo;
                            item.TaskNo = oldTaskNo;
                        }
                        Db.Updateable(palletBindList).ExecuteCommand();
                    }
                    Db.CommitTran();
                    comDto = new OutCommandDto()
                    {
                        PalletNo = palletNo,//托盘号
                        StartRoadway = "",
                        StartLocate = "", // 起始位置
                        EndLocate = locate.LocatNo, // 目标位置 
                        EndRoadway = locate.RoadwayNo,   // 目标巷道
                        TaskNo = oldTaskNo, // 任务号
                        TaskType = "0",// 任务类型 (出库)
                        OutMode = "",  //目标地址
                        Order = 1
                    };

                }
                catch (Exception ex)
                {
                    Db.RollbackTran();
                    throw new Exception(ex.Message);
                }
                #endregion


                return comDto;
            }
            catch (Exception e)
            {
                throw new Exception(e.Message);
            }
        }
         
        /// <summary>
        /// 入库完成(wcs反馈、wms手动完成)

 Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs

@@ -1797,21 +1797,22 @@
                foreach (var s in stockDetail)
                {
                    //获取储位信息
                    var locat = await Db.Queryable<SysStorageLocat>().FirstAsync(l => l.LocatNo == s.LocatNo && l.IsDel == "0" && l.WareHouseNo == "W01");
                    var locat = await Db.Queryable<SysStorageLocat>().FirstAsync(l => l.LocatNo == s.LocatNo && l.IsDel == "0" && l.WareHouseNo == "W02");

                    if (locat != null)
                    if (locat == null)
                    {
                        if (locat.Status != "1")
                        {
                            continue;
                        }
                        //更改储位状态为出库中
                        locat.Status = "3"; //3 出库中
                        locat.UpdateTime = serverTime; //修改时间
                        locat.UpdateUser = userId; //修改人
                        //修改储位信息
                        await Db.Updateable(locat).ExecuteCommandAsync();
                        throw new Exception("储位上没有空托盘跺");
                    }
                    if (locat.Status != "1")
                    {
                        continue;
                    }
                    //更改储位状态为出库中
                    locat.Status = "3"; //3 出库中
                    locat.UpdateTime = serverTime; //修改时间
                    locat.UpdateUser = userId; //修改人
                                               //修改储位信息
                    await Db.Updateable(locat).ExecuteCommandAsync();

                    //增加库存锁定数量
                    //stock.AllotQty +=
@@ -1897,7 +1898,8 @@
                        TaskNo = exTask.TaskNo, // 任务号
                        TaskType = "1",// 任务类型 (出库)
                        OutMode = model.OutMode,  //目标地址
                        Order = 1
                        Order = 1,
                        Type = PLCTypeEnum.AGV
                    });
                    await Db.Insertable(exTask).ExecuteCommandAsync();

@@ -1952,13 +1954,13 @@
                var k = new OperationSOServer().AddLogOperationSo("PDA模块", "空托出库", i + "", "下发", $"用PDA下发了 {i} 个空托垛", userId);
                Db.CommitTran();

                return "";
                return "成功";

            }
            catch (Exception e)
            {
                Db.RollbackTran();
                return "";
                return e.Message;
            }

        }

 Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs

@@ -3347,7 +3347,8 @@

                #endregion
                var com = new Common();
                
                var allot = new AllotLocation();

                var notice = Db.Queryable<BllExportNotice>().First(m => m.SONo == soNo && m.IsDel == "0");
                if (notice == null)
                {
@@ -3524,10 +3525,11 @@
                                                PalletNo = item.PalletNo,//托盘号
                                                StartLocate = locate.LocatNo, // 起始位置
                                                StartRoadway = locate.RoadwayNo,//其实巷道
                                                EndLocate = toLocation,//outMode, // 目标位置 
                                                EndLocate = moveAddress,//outMode, // 目标位置 
                                                TaskNo = ykTaskNo, // 任务号
                                                TaskType = "1",// 任务类型 (出库)0入 1出 2移  
                                                TaskType = "2",// 任务类型 (出库)0入 1出 2移  
                                                Order = Math.Abs(row2 - rows),
                                                Type = PLCTypeEnum.ShuttleCar

                                            }); 
                                            var slotChange = Db.Queryable<SysStorageLocat>().First(m => m.LocatNo == s);
@@ -3573,17 +3575,19 @@
                            };
                            Db.Insertable(exTask).ExecuteCommand();
                            logTaskList.Add(exTask);

                            var endroad = allot.RoadwayToStationNum(locate.RoadwayNo, toLocation);
                            outDto1.Add(new OutCommandDto()
                            {
                                PalletNo = item.PalletNo,//托盘号
                                StartLocate = locate.LocatNo, // 起始位置
                                StartRoadway = locate.RoadwayNo,//其实巷道
                                EndLocate = toLocation,//outMode, // 目标位置 
                                StartRoadway = locate.RoadwayNo,//起始巷道
                                EndLocate = outMode,//, // 目标位置 
                                EndRoadway = endroad,
                                TaskNo = exTask.TaskNo, // 任务号
                                TaskType = "1",// 任务类型 (出库)0入 1出 2移 
                                OutMode = toLocation,  //出库口 
                                OutMode = outMode,  //出库口 
                                Order = Math.Abs(row2 - row1),
                                Type = PLCTypeEnum.ShuttleCar

                            });
                            taskNoStr = exTask.TaskNo;

 Wms/WMS.BLL/Logic/AllotLocation.cs

@@ -105,16 +105,16 @@
        /// <param name="areaList">区域集合</param>
        /// <param name="lotNo">批次号</param>
        /// <returns></returns>
        public SysStorageLocat GetMiJiSuiTableLocate(SysStorageRoadway roadway, List<string> areaList, string sku, string lotNo = "")
        public SysStorageLocat GetMiJiSuiTableLocate(string roadwayNo, List<string> areaList)
        {

            var db = DataContext.Db;
            
            // 判断当前巷道(组)是否有空余储位
            var locateList = db.Queryable<SysStorageLocat>().Where(m => m.IsDel == "0" && m.RoadwayNo == roadway.RoadwayNo && areaList.Contains(m.AreaNo)).ToList();
            var locateList = db.Queryable<SysStorageLocat>().Where(m => m.IsDel == "0" && m.RoadwayNo == roadwayNo && areaList.Contains(m.AreaNo)).ToList();
            if (locateList.Count(m => m.Status == "0") > 0)
            {
                var bl = GetLocateASCOrDesc(roadway.RoadwayNo);
                var bl = GetLocateASCOrDesc(roadwayNo);

                var locate = locateList.OrderBy(m => m.LocatNo).First();

@@ -191,6 +191,102 @@
        }

        /// <summary>
        /// 根据起始组获取位置最优的四项车取货工位
        /// </summary>
        /// <param name="straRoadway">起始组</param>
        /// <param name="outModel">出库口工位 9、 17、 18</param>
        /// <returns></returns>
        public string RoadwayToStationNum(string straRoadway, string outModel)
        {
            var db = DataContext.Db;
            string stationNum = "";

            string[] lists = straRoadway.Split("MR");
            var model = db.Queryable<SysStorageLocat>().First(m => m.RoadwayNo == straRoadway && m.IsDel == "0");
            string stat = model.AisleOne;

            if (model.Layer == 1)
            {   // 一层
                switch (outModel)       // 申请的入库口
                {
                    case "9":

                        var path13 = Math.Abs(19 - int.Parse(stat.Substring(0, 2))) + Math.Abs(6 - int.Parse(stat.Substring(2, 2)));
                        var path14 = Math.Abs(19 - int.Parse(stat.Substring(0, 2))) + Math.Abs(12 - int.Parse(stat.Substring(2, 2)));

                        if (path13 <= path14)
                        {
                            stationNum = "190601";
                        }
                        else
                        {
                            stationNum = "191201";
                        }
                        break;
                    case "17":
                        stationNum = "030401";
                        break;
                    case "18":
                        var path03 = Math.Abs(03 - int.Parse(stat.Substring(0, 2))) + Math.Abs(06 - int.Parse(stat.Substring(2, 2)));
                        var path05 = Math.Abs(03 - int.Parse(stat.Substring(0, 2))) + Math.Abs(12 - int.Parse(stat.Substring(2, 2)));

                        if (path03 <= path05)
                        {
                            stationNum = "030601";
                        }
                        else
                        {
                            stationNum = "031201";
                        }
                        break;
                    default: break;
                }
            }
            else
            {  // 二层
                switch (outModel)       // 申请的入库口
                {
                    case "9":

                        var path15 = Math.Abs(19 - int.Parse(stat.Substring(0, 2))) + Math.Abs(6 - int.Parse(stat.Substring(2, 2)));
                        var path16 = Math.Abs(19 - int.Parse(stat.Substring(0, 2))) + Math.Abs(12 - int.Parse(stat.Substring(2, 2)));

                        if (path15 <= path16)
                        {
                            stationNum = "190602";
                        }
                        else
                        {
                            stationNum = "191202";
                        }

                        break;
                    case "17":
                        stationNum = "030402";
                         break;
                    case "18":
                        var path03 = Math.Abs(03 - int.Parse(stat.Substring(0, 2))) + Math.Abs(06 - int.Parse(stat.Substring(2, 2)));
                        var path05 = Math.Abs(03 - int.Parse(stat.Substring(0, 2))) + Math.Abs(12 - int.Parse(stat.Substring(2, 2)));

                        if (path03 <= path05)
                        {
                            stationNum = "030602";
                        }
                        else
                        {
                            stationNum = "031202";
                        }

                        break;
                    default: break;
                }
            }

            return stationNum;
        }


        /// <summary>
        /// 获取合适的库位
        /// </summary>
        /// <param name="houseNo">仓库号</param>

 Wms/WMS.BLL/SysServer/MaterialsServer.cs

@@ -55,12 +55,12 @@
        /// <returns></returns>
        public Task<List<MaterialsDto>> GetMateList(string skuNo, string skuName, string auditStatusNo, string type, string isControlled, string isInspect, string environment, string categoryNo)
        {
            return Db.Queryable<SysMaterials>()
            var DA =  Db.Queryable<SysMaterials>()
                     .LeftJoin<SysUserInfor>((a, b) => a.CreateUser == b.Id)
                     .LeftJoin<SysPackag>((a, b,c) => a.PackagNo == c.PackagNo)
                     .LeftJoin<SysUnit> ((a,b,c,d)=>a.UnitNo == d.UnitNo)
                     .LeftJoin<SysMaterialCategory>((a,b,c,d,e)=>a.CategoryNo == e.CategoryNo)
                     .Where((a,b,c,d,e) => d.IsDel == "0" && e.IsDel =="0")
                     //.LeftJoin<SysUnit> ((a,b,c,d)=>a.UnitNo == d.UnitNo)
                     .LeftJoin<SysMaterialCategory>((a,b,c,d)=>a.CategoryNo == d.CategoryNo)
                     .Where((a,b,c,d) => a.IsDel == "0" && d.IsDel == "0" )
                     .WhereIF(!string.IsNullOrEmpty(skuNo), a => a.SkuNo.Contains(skuNo))
                     .WhereIF(!string.IsNullOrEmpty(skuName), a => a.SkuName.Contains(skuName))
                     .WhereIF(!string.IsNullOrEmpty(auditStatusNo), a => a.AuditStatusNo == auditStatusNo)
@@ -69,9 +69,9 @@
                     .WhereIF(!string.IsNullOrEmpty(isInspect), a => a.IsInspect == isInspect)
                     .WhereIF(!string.IsNullOrEmpty(environment), a => a.Environment == environment)
                     .WhereIF(!string.IsNullOrEmpty(categoryNo), a => a.CategoryNo == categoryNo)
                     .Where(a => a.IsDel == "0" )
                     .Select<MaterialsDto>((a, b, c,d,e) => new MaterialsDto() { CreateUserName = b.RealName,PackagName = c.PackagName }, true)
                     .Select<MaterialsDto>((a, b, c,d) => new MaterialsDto() { CreateUserName = b.RealName,PackagName = c.PackagName }, true)
                     .ToListAsync();
            return DA;
        }

        /// <summary>

 Wms/WMS.IBLL/IBllAsnServer/IPalletBindServer.cs

@@ -100,7 +100,7 @@
        /// <param name="palletNo">托盘号</param>
        /// <param name="houseNo">仓库号</param>
        /// <returns></returns>
        OutCommandDto RequestRoadWay(string palletNo, string houseNo);
        OutCommandDto RequestMiJiRoadWay(string palletNo, string houseNo);
        /// <summary>
        /// 申请空储位
        /// </summary>
@@ -108,7 +108,7 @@
        /// <param name="houseNo">仓库号</param>
        /// <param name="roadwayNo">巷道号</param>
        /// <returns></returns>
        OutCommandDto RequestLocation(string palletNo, string houseNo, string roadwayNo);
        OutCommandDto RequestMiJiLocation(string palletNo, string houseNo, string roadwayNo);

        /// <summary>
        /// 入库完成

 Wms/Wms/Controllers/DownApiController.cs

@@ -20,6 +20,7 @@
using System.Threading.Tasks;
using Model.ModelVm.BllCheckVm;
using System.Collections.Generic;
using System.Security.Policy;

namespace Wms.Controllers
{
@@ -276,32 +277,32 @@
        /// </summary>
        /// <param name="model">入库单信息</param>
        /// <returns></returns>
        [AllowAnonymous]
        [HttpPost]
        public IActionResult BindRequestRoadWay(BoxPalletBindVm model)
        {
            var logStr = $@".\log\WCS\WCS托盘绑定-申请巷道" + DateTime.Now.ToString("yyyyMMdd") + ".txt";
        //[AllowAnonymous]
        //[HttpPost]
        //public IActionResult BindRequestRoadWay(BoxPalletBindVm model)
        //{
        //    var logStr = $@".\log\WCS\WCS托盘绑定-申请巷道" + DateTime.Now.ToString("yyyyMMdd") + ".txt";

            try
            {
        //    try
        //    {

                var jsonData = JsonConvert.SerializeObject(model);
                LogFile.SaveLogToFile($"WCS托盘绑定-申请巷道：( {jsonData} ),", logStr);
        //        var jsonData = JsonConvert.SerializeObject(model);
        //        LogFile.SaveLogToFile($"WCS托盘绑定-申请巷道：( {jsonData} ),", logStr);

                _asnPalletBindSvc.BindPalletStock(model, 0);
                //申请巷道
                var list = _asnPalletBindSvc.RequestRoadWay(model.PalletNo, "W01");
                LogFile.SaveLogToFile($"WCS托盘绑定-申请巷道返回：( {JsonConvert.SerializeObject(list)} ),", logStr);
        //        _asnPalletBindSvc.BindPalletStock(model, 0);
        //        //申请巷道
        //        var list = _asnPalletBindSvc.RequestRoadWay(model.PalletNo, "W01");
        //        LogFile.SaveLogToFile($"WCS托盘绑定-申请巷道返回：( {JsonConvert.SerializeObject(list)} ),", logStr);

                return Ok(new { Success = 0, Message = "托盘绑定-申请巷道成功", TaskList = list });
            }
            catch (Exception e)
            {
                LogFile.SaveLogToFile($"WCS托盘绑定-申请巷道返回：( {e.Message} ),", logStr);
        //        return Ok(new { Success = 0, Message = "托盘绑定-申请巷道成功", TaskList = list });
        //    }
        //    catch (Exception e)
        //    {
        //        LogFile.SaveLogToFile($"WCS托盘绑定-申请巷道返回：( {e.Message} ),", logStr);

                return Ok(new ErpModel { Success = -1, Message = e.Message });
            }
        }
        //        return Ok(new ErpModel { Success = -1, Message = e.Message });
        //    }
        //}

        /// <summary>
        /// PDA 人工申请储位 （立体库）
@@ -350,7 +351,7 @@
        /// <returns></returns>
        [AllowAnonymous]
        [HttpPost]
        public IActionResult RequestRoadWay(RequestLocate model)
        public IActionResult RequestMiJiRoadWay(RequestLocate model)
        {
            var logStr = "";

@@ -362,7 +363,7 @@
                var jsonData = JsonConvert.SerializeObject(model);
                LogFile.SaveLogToFile($"WCS申请巷道：( {jsonData} ),", logStr);

                var list = _asnPalletBindSvc.RequestRoadWay(model.PalletNo, model.HouseNo);
                var list = _asnPalletBindSvc.RequestMiJiRoadWay(model.PalletNo, model.HouseNo);

                LogFile.SaveLogToFile($"WCS申请巷道返回：( {JsonConvert.SerializeObject(list)} ),", logStr);
                //new OperationASNServer().AddLogOperationAsn("入库作业", "入库日志", model.PalletNo.Substring(0, 8), 
@@ -404,59 +405,29 @@

            //string palletno = model.PalletNo;
            var logStr = "";
            if (model.PalletNo.Length == 9)
            {
                logStr = $@".\log\WCS\WMS申请储位" + DateTime.Now.ToString("yyyyMMdd") + ".txt";
            }
            else if (model.PalletNo.Length == 8)
            {
                logStr = $@".\log\WCS\WCS申请储位" + DateTime.Now.ToString("yyyyMMdd") + ".txt";
            }
            
            logStr = $@".\log\WCS\WCS申请储位" + DateTime.Now.ToString("yyyyMMdd") + ".txt";
            

            try
            {
                if (model.PalletNo.Length == 9)
                {
                    var jsonData = JsonConvert.SerializeObject(model);
                    LogFile.SaveLogToFile($"WMS申请储位：( {jsonData} ),", logStr);
                }
                else if (model.PalletNo.Length == 8)
                {
                    var jsonData = JsonConvert.SerializeObject(model);
                    LogFile.SaveLogToFile($"WCS申请储位：( {jsonData} ),", logStr);
                }

                
                var jsonData = JsonConvert.SerializeObject(model);
                LogFile.SaveLogToFile($"WCS申请储位：( {jsonData} ),", logStr);
                
                string pallet = model.PalletNo.Substring(0, 8);
                var list = _asnPalletBindSvc.RequestLocation(pallet, model.HouseNo, model.RoadwayNo);
                var list = _asnPalletBindSvc.RequestMiJiLocation(pallet, model.HouseNo, model.RoadwayNo);

                if (model.PalletNo.Length == 9)
                {
                    new OperationASNServer().AddLogOperationAsn("入库作业", "入库日志", model.PalletNo.Substring(0, 8), "申请储位", $"申请储位托盘号：{model.PalletNo.Substring(0, 8)}的成功信息", 2);// int.Parse(userId)
                    LogFile.SaveLogToFile($"WMS申请储位成功：( {JsonConvert.SerializeObject(list)} ),", logStr);
                }
                else if (model.PalletNo.Length == 8)
                {
                    LogFile.SaveLogToFile($"WCS申请储位返回：( {JsonConvert.SerializeObject(list)} ),", logStr);
                }
                if (model.PalletNo.Length == 9)
                {

                }

                LogFile.SaveLogToFile($"WCS申请储位返回：( {JsonConvert.SerializeObject(list)} ),", logStr);
                //new OperationASNServer().AddLogOperationAsn("入库作业", "入库日志", model.PalletNo.Substring(0, 8), "申请储位", $"申请储位托盘号：{model.PalletNo.Substring(0, 8)}的成功信息", 2);// int.Parse(userId)
                //LogFile.SaveLogToFile($"WMS申请储位成功：( {JsonConvert.SerializeObject(list)} ),", logStr);
                
                return Ok(new { Success = 0, Message = "申请储位成功", TaskList = list });
            }
            catch (Exception e)
            {
                if (model.PalletNo.Length == 9)
                {
                    new OperationASNServer().AddLogOperationAsn("入库作业", "入库日志", model.PalletNo.Substring(0, 8), "申请储位", $"申请储位托盘号：{model.PalletNo.Substring(0, 8)}的失败信息", 2);//int.Parse(userId)
                    LogFile.SaveLogToFile($"WMS申请储位失败返回：( {e.Message} ),", logStr);
                }
                else if (model.PalletNo.Length == 8)
                {
                    LogFile.SaveLogToFile($"WCS申请储位返回：( {e.Message} ),", logStr);
                }

                LogFile.SaveLogToFile($"WCS申请储位返回：( {e.Message} ),", logStr);
                
                return Ok(new ErpModel { Success = -1, Message = e.Message });
            }
        }
@@ -742,5 +713,39 @@

        #endregion

        /// <summary>
        /// PDA 人工申请储位 （立体库）
        /// </summary>
        /// <param name="model">入库单信息</param>
        /// <returns></returns>
        [AllowAnonymous]
        [HttpPost]
        public IActionResult ceshiapi()
        {
            try
            {
                var url = "https://10.26.200.25/rcs/rtas/api/robot/controller/carrier/unbind";

                var requestId = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds().ToString();
                var dic = new Dictionary<string, string>()
                    {
                        {"X-lr-request-id",requestId },
                        {"X-lr-version","4.2" },
                    };
                var mod = new
                {
                    carrierCode = "palletNo",
                    siteCode = "locateNo"
                };
                var jsonData = JsonConvert.SerializeObject(mod);
                HttpHelper.DoPost(url, jsonData, "下发给AGV解绑", "AGV",dic);

                return Ok(new HttpReturnModel { Success = "0", Message = "申请储位成功", Data = "list" });
            }
            catch (Exception e)
            { 
                return Ok(new HttpReturnModel { Success = "-1", Message = e.Message });
            }
        }
    }
}

 Wms/Wms/appsettings.json

@@ -24,7 +24,7 @@
  },
  "ApiUrlConfig": {
    "ErpHost": "http://10.110.24.30:8081", //erpIP
    "WcsHost": "http://localhost:57061", //wcsIPhttp://localhost:57061/
    "WcsHost": "http://10.26.254.34:5005", //wcsIPhttp://localhost:57061/
    "BoxHost": "http://10.110.24.30:8081", //boxIP

    "IssueComApiUrl": "/api/WCSApi/AddTasks", //下发命令(出库、移库)