修改密集库申请入库

chengsc

2025-05-10 3d6ef3897a77dec54be7057299e1be1d10589336

修改密集库申请入库

 HTML/views/QualityControl/InspectionRequest.html

@@ -245,9 +245,9 @@
                            var html = ''; 
                            switch (d.Status) {
                                case "0" :
                                    html += `<a class="layui-btn layui-btn-normal layui-btn-xs addClass" lay-event="upImage">
                                    html += `<a class="layui-btn layui-btn-normal layui-btn-xs shangClass" lay-event="upImage">
                                    <i class="layui-icon layui-icon-add"></i>上传</a> `;
                                    html += `<a class="layui-btn layui-btn-normal layui-btn-xs addClass" lay-event="ViewImage">
                                    html += `<a class="layui-btn layui-btn-normal layui-btn-xs chaClass" lay-event="ViewImage">
                                        <i class="layui-icon layui-icon-add"></i>查看</a> `;
                                    html += `<a class="layui-btn layui-btn-normal layui-btn-xs addClass" lay-event="add">
                                            <i class="layui-icon layui-icon-add"></i>请验</a> `;
@@ -418,7 +418,7 @@
                { field: 'UpdateTime', title: '完成日期', align: 'center', width: 165, templet: '#templetUpdateTime' },
                { field: 'UpdateUserName', title: '关单人', align: 'center', width: 165 },

                { field: 'caozuo', title: '操作', fixed: 'right', width: 180, align: 'center', toolbar: '#InspectionRequestList', "disabled": true }
                { field: 'caozuo', title: '操作', fixed: 'right', width: 270, align: 'center', toolbar: '#InspectionRequestList', "disabled": true }
            ]];
            var TotalColsSysArr = encodeURIComponent(encodeURIComponent(JSON.stringify(TotalColsArr)))//将表头数据进行url编码
            //#endregion
@@ -480,6 +480,8 @@
            // 添加按钮权限
            function setRight() {
                $(function () {
                    $(".shangClass").hide();
                    $(".chaClass").hide();
                    $(".addClass").hide();
                    $(".editClass").hide();
                    $(".delClass").hide();
@@ -488,6 +490,17 @@
                sendData(IP + "/Basis/GetRoleRightList", {}, 'get', function (res) {
                    if (res.code == 0) { //成功 
                        for (var k = 0; k < res.data.length; k++) {
							
                            if (res.data[k].MenuName == "上传") {
                                $(function () {
                                    $(".shangClass").show();
                                });
                            }
                            if (res.data[k].MenuName == "查看") {
                                $(function () {
                                    $(".chaClass").show();
                                });
                            }
                            if (res.data[k].MenuName == "请验") {
                                $(function () {
                                    $(".addClass").show();

 Wms/Model/InterFaceModel/HttpModel.cs

@@ -93,6 +93,12 @@

    public enum PLCTypeEnum
    {

        /// <summary>
        /// 输送线
        /// </summary>
        [Description("输送线")]
        ConveyorLine = 1,
        /// <summary>
        /// AGV小车
        /// </summary>
@@ -156,24 +162,7 @@
        /// 顺序-优先级
        /// </summary>
        public int Order { get; set; }


        /// <summary>
        /// 托盘类型，0:物料  1:托盘
        /// </summary>
        public string PalletType { get; set; }
        /// <summary>
        /// 拣货方式，0:机器人拆垛 1:PDA拆垛
        /// </summary>
        public string UnstackingMode { get; set; }
        /// <summary>
        /// 托盘上总数量
        /// </summary>
        public decimal? BoxexQty { get; set; }
        /// <summary>
        /// 拣货数量
        /// </summary>
        public decimal? CompleteQty { get; set; }
         
    }
    /// <summary>
    /// 接受wcs任务反馈信息Model

 Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs

@@ -2589,21 +2589,21 @@
                try
                {
                    var time1 = DateTime.Now;//发送时间 .ToString("yyyy-MM-dd HH:mm:ss")
                    //response = HttpHelper.DoPost(url, jsonData, "下发给WCS入库命令", "WCS");
                    response = HttpHelper.DoPost(url, jsonData, "下发给WCS入库命令", "WCS");
                    var time2 = DateTime.Now;//返回时间 .ToString("yyyy-MM-dd HH:mm:ss")
                    var list = new List<string>() { model.TaskNo };
                    ////解析返回数据 
                    //var wcsModel = JsonConvert.DeserializeObject<WcsModel2>(response);
                    //if (wcsModel.code == 200)
                    //{
                    //解析返回数据 
                    var wcsModel = JsonConvert.DeserializeObject<WcsModel2>(response);
                    if (wcsModel.code == 200)
                    {
                        //更改任务的发送返回时间//
                        new TaskServer().EditTaskIssueOk(list, time1, time2);

                    //}else
                    //{
                    //    new TaskServer().EditTaskIssueNo(list, time1, time2, wcsModel.message);
                    //    throw new Exception("WCS反馈："+wcsModel.message);
                    //}
                    }
                    else
                    {
                        new TaskServer().EditTaskIssueNo(list, time1, time2, wcsModel.message);
                        throw new Exception("WCS反馈：" + wcsModel.message);
                    }
                }
                catch (Exception ex)
                {

 Wms/WMS.BLL/HttpServer.cs

@@ -61,7 +61,7 @@
                    throw new Exception("托盘条码不受WMS管理，不可入库！");

                #region 
                var upShelfOld = Db.Queryable<BllPalletUpShelf>().First(m => m.IsDel == "0" && m.PalletNo == palletNo && (m.Status == "0" || m.Status == "1"));
                
                
                var skuList = Db.Queryable<SysMaterials>().Where(m => m.IsDel == "0").ToList();
                //物料类别信息
@@ -79,8 +79,10 @@
                        throw new Exception("成品物料请入成品库");
                    }
                }
                if (upShelfOld != null) //查询到入库信息
                var upShelfOldList = Db.Queryable<BllPalletUpShelf>().Where(m => m.IsDel == "0" && m.PalletNo == palletNo && (m.Status == "0" || m.Status == "1")).ToList();
                if (upShelfOldList != null) //查询到入库信息
                {
                    var upShelfOld = upShelfOldList.First();
                    var beingTask = Db.Queryable<LogTask>().First(m => m.IsDel == "0" && m.TaskNo == upShelfOld.TaskNo);
                    if (beingTask == null)
                    {
@@ -90,15 +92,17 @@
                    {
                        comDto = new OutCommandDto()
                        {
                            TaskNo = beingTask.TaskNo, // 任务号
                            TaskType = "0",// 任务类型 
                            PalletNo = palletNo,//托盘号

                            StartRoadway = beingTask.StartRoadway, // 起始巷道
                            StartLocate = beingTask.StartLocat, // 起始位置
                            EndLocate = beingTask.EndLocat, // 目标位置
                            EndRoadway = beingTask.EndRoadway,                           //  目标巷道
                            TaskNo = beingTask.TaskNo, // 任务号
                            TaskType = "0",// 任务类型 (出库)
                            OutMode = "",  //目标地址
                            Order = 1
                            
                            Order = 999,
                            Type = PLCTypeEnum.AGV
                        };
                        if (beingTask.IsSuccess == 0)
                        {
@@ -106,11 +110,16 @@
                        }
                        beingTask.Status = "1";
                        Db.Updateable(beingTask).ExecuteCommand();
                        if (upShelfOld.Status == "0")

                        foreach (var item in upShelfOldList)
                        {
                            upShelfOld.Status = "1";
                            Db.Updateable(upShelfOld).ExecuteCommand();
                            if (item.Status == "0")
                            {
                                upShelfOld.Status = "1";
                                Db.Updateable(upShelfOld).ExecuteCommand();
                            }
                        }
                        
                        return comDto;
                    }
                    else
@@ -251,7 +260,7 @@
                    };
                    Db.Insertable(log).ExecuteCommand();
                    var taskNo = new Common().GetMaxNo("TK");
                    var exTask = new LogTask    //入库任务
                    var inTask = new LogTask    //入库任务
                    {
                        TaskNo = taskNo,
                        Sender = "WMS",
@@ -273,7 +282,7 @@
                        Msg = "入库口到=>>" + locate.LocatNo + "的入库任务", //关键信息

                    };
                    Db.Insertable(exTask).ExecuteCommand();
                    Db.Insertable(inTask).ExecuteCommand();
                    var asnNo = "";
                    // 添加托盘绑定表托盘入库任务号 liudl
                    foreach (DataStockDetail stockModel in stockDetail)
@@ -295,7 +304,7 @@
                        //添加托盘上架记录
                        var upShelf = new BllPalletUpShelf()
                        {
                            TaskNo = exTask.TaskNo,
                            TaskNo = inTask.TaskNo,
                            TraceNo = asnNo,
                            PalletNo = palletNo,
                            SkuNo = stockModel.SkuNo,
@@ -320,16 +329,649 @@
                    Db.CommitTran();
                    comDto = new OutCommandDto()
                    {
                        TaskNo = taskNo, // 任务号
                        TaskType = "0",// 任务类型
                        PalletNo = palletNo,//托盘号

                        StartRoadway = inTask.StartRoadway,
                        StartLocate = inTask.StartLocat, // 起始位置
                        EndLocate = inTask.EndLocat, // 目标位置 
                        EndRoadway = inTask.EndRoadway,   // 目标巷道
                        
                        Order = 999,
                        Type = PLCTypeEnum.AGV
                    };

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


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

        /// <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 skuNo = ""; //入库物料
                var lotNo = ""; //入库批次
                
                //物料信息
                var skuList = Db.Queryable<SysMaterials>().Where(m => m.IsDel == "0").ToList();
                //物料类别信息
                var skuCategoryList = Db.Queryable<SysMaterialCategory>().Where(m => m.IsDel == "0").ToList();
                //托盘库存信息
                var stockDetail = Db.Queryable<DataStockDetail>().Where(m => m.PalletNo == palletNo).ToList();
                //验证物料是否有成品
                foreach (var item in stockDetail)
                {
                    var skuItem = skuList.First(m => m.SkuNo == item.SkuNo);
                    if (skuItem.Type != "2")
                    {
                        throw new Exception("托盘上有不是成品的物料");
                    }
                }
                var upShelfOld = Db.Queryable<BllPalletUpShelf>().First(m => m.IsDel == "0" && m.PalletNo == palletNo && (m.Status == "0" || m.Status == "1"));

                if (upShelfOld != null) //正常入库
                {
                    var beingTask = Db.Queryable<LogTask>().First(m => m.IsDel == "0" && m.TaskNo == upShelfOld.TaskNo);
                    if (beingTask == null)
                    {
                        throw new Exception("该托盘正在入库，但未查询到任务信息");
                    }
                    if (!string.IsNullOrWhiteSpace(beingTask.EndRoadway))
                    {
                        comDto = new OutCommandDto()
                        {
                            TaskNo = beingTask.TaskNo, // 任务号
                            TaskType = "0",// 任务类型
                            PalletNo = palletNo,//托盘号

                            StartRoadway = beingTask.StartRoadway, // 起始巷道
                            StartLocate = beingTask.StartLocat, // 起始位置
                            EndLocate = beingTask.EndLocat, // 目标位置
                            EndRoadway = beingTask.EndRoadway, //  目标巷道

                            Order = 999,
                            Type = PLCTypeEnum.ConveyorLine
                        };
                        if (beingTask.IsSuccess == 0)
                        {
                            beingTask.IsSuccess = 1;
                        }
                        beingTask.Status = "1";
                        Db.Updateable(beingTask).ExecuteCommand();
                        if (upShelfOld.Status == "0")
                        {
                            upShelfOld.Status = "1";
                            Db.Updateable(upShelfOld).ExecuteCommand();
                        }
                        return comDto;
                    }
                    else
                    {
                        throw new Exception("查询到任务但目的巷道为空");
                    }
                }
                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 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();
                
                #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 inTask = new LogTask    //入库任务
                    {
                        TaskNo = taskNo,
                        Sender = "WMS",
                        Receiver = "WCS",
                        IsSuccess = 0, //是否下发成功 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(inTask).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 = houseNo;
                            bindModel.RoadwayNo = roadNo;
                            Db.Updateable(bindModel).ExecuteCommand();
                            asnNo = stockModel.ASNNo;
                        }

                    }
                    
                    foreach (DataStockDetail stockModel in stockDetail)
                    {
                        //添加托盘上架记录
                        var upShelf = new BllPalletUpShelf()
                        {
                            TaskNo = inTask.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();
                    }

                    Db.CommitTran();

                    comDto = new OutCommandDto()
                    {
                        TaskNo = taskNo, // 任务号
                        TaskType = "0",// 任务类型:入库任务
                        PalletNo = palletNo,//托盘号

                        StartRoadway = inTask.StartRoadway,// 起始巷道
                        StartLocate = inTask.StartLocat, // 起始位置
                        EndLocate = inTask.EndLocat, // 目标位置 
                        EndRoadway = inTask.EndRoadway,   // 目标巷道
                       
                        Order = 999,
                        Type = PLCTypeEnum.ConveyorLine
                    };
                }
                catch (Exception ex)
                {
                    Db.RollbackTran();
                    throw new Exception(ex.Message);
                }
                #endregion

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

        /// <summary>
        /// 1 申请储位 （申请巷道后 再申请储位储位 ）
        /// </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
            {
                #region 验证

                //验证托盘条码是否为空
                if (string.IsNullOrEmpty(palletNo))
                {
                    throw new Exception("请输入要申请的托盘条码");
                }
                //验证所属仓库是否为空
                if (string.IsNullOrEmpty(houseNo))
                {
                    throw new Exception("请选择所属仓库");
                }
                //验证所属仓库是否为空
                if (string.IsNullOrEmpty(roadwayNo))
                {
                    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 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();
                //验证物料是否有成品
                foreach (var item in stockDetail)
                {
                    var skuItem = skuList.First(m => m.SkuNo == item.SkuNo);
                    if (skuItem.Type != "2")
                    {
                        throw new Exception("托盘上有不是成品的物料");
                    }
                }
                
                var upShelfOld = Db.Queryable<BllPalletUpShelf>().First(m => m.IsDel == "0" && m.PalletNo == palletNo && (m.Status == "0" || m.Status == "1"));

                if (upShelfOld != null) //有上架入库信息
                {
                    
                    var beingTask = Db.Queryable<LogTask>().First(m => m.IsDel == "0" && m.TaskNo == upShelfOld.TaskNo);
                    if (beingTask == null)
                    {
                        throw new Exception("该托盘正在入库，但未查询到任务信息");
                    }
                    if (!string.IsNullOrWhiteSpace(beingTask.EndLocat))
                    {
                        comDto = new OutCommandDto()
                        {
                            TaskNo = beingTask.TaskNo, // 任务号
                            TaskType = "0",// 任务类型 
                            PalletNo = palletNo,//托盘号

                            StartRoadway = beingTask.StartRoadway, // 起始巷道
                            StartLocate = beingTask.StartRoadway, // 起始位置
                            EndLocate = beingTask.EndLocat, // 目标位置
                            EndRoadway = beingTask.EndRoadway, // 目标巷道
                                 
                            Order = 999,
                            Type = PLCTypeEnum.ShuttleCar,
                        };
                        if (beingTask.IsSuccess == 0)
                        {
                            beingTask.IsSuccess = 1;
                            Db.Updateable(beingTask).ExecuteCommand();
                        }
                        if (upShelfOld.Status == "0")
                        {
                            upShelfOld.Status = "1";
                            Db.Updateable(upShelfOld).ExecuteCommand();
                        }
                        return comDto;
                    }
                    else
                    {
                        isAddTask = false;
                        oldTaskNo = beingTask.TaskNo;
                        skuNo = upShelfOld.SkuNo;//入库物料
                    }
                    
                }
                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 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;
               
                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 inTask = 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(inTask).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 = inTask.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();
                   
                    Db.CommitTran();
                    comDto = new OutCommandDto()
                    {
                        TaskNo = oldTaskNo, // 任务号
                        TaskType = "0",// 任务类型
                        PalletNo = palletNo,//托盘号

                        StartRoadway = "",
                        StartLocate = starLocate, // 起始位置
                        StartLocate = "", // 起始位置
                        EndLocate = locate.LocatNo, // 目标位置 
                        EndRoadway = locate.RoadwayNo,   // 目标巷道
                        TaskNo = taskNo, // 任务号
                        TaskType = "0",// 任务类型 (出库)
                        OutMode = "",  //目标地址
                        Order = 1,
                        Type = PLCTypeEnum.AGV

                        Order = 999,  //目标地址
                        Type = PLCTypeEnum.ShuttleCar
                    };

                }
@@ -442,7 +1084,7 @@
                }

                //判断是否是回流入库完成
                if (stockDetail.Any())
                if (!stockDetail.Any())
                {
                    throw new Exception("没有查询到库存信息");
                }
@@ -470,6 +1112,7 @@
            }
            catch (Exception e)
            {
                Db.RollbackTran();
                throw new Exception(e.Message);
            }
        }

 Wms/WMS.BLL/Logic/AllotLocation.cs

@@ -56,7 +56,6 @@
            //获取库存内已有物料的巷道
            var dataStockRoad = db.Queryable<DataStockDetail>().Where(m => m.IsDel == "0" && m.WareHouseNo == house).GroupBy(m => m.RoadwayNo).OrderBy(m => m.RoadwayNo).Select(m => m.RoadwayNo).ToList();
            //排除掉已有物料的巷道
            
            roadways = roadways.Where(m => !dataStockRoad.Contains(m)).ToList();
            foreach (var l in roadways)
            {

 Wms/WMS.IBLL/IHttpServer.cs

@@ -17,6 +17,23 @@
        OutCommandDto RequestLocation(string palletNo, string houseNo);

        /// <summary>
        /// 申请巷道(密集库)
        /// </summary>
        /// <param name="palletNo"></param>
        /// <param name="houseNo"></param>
        /// <returns></returns>
        OutCommandDto RequestMiJiRoadWay(string palletNo, string houseNo);

        /// <summary>
        /// 1 申请储位 （申请巷道后 再申请储位储位 ）
        /// </summary>
        /// <param name="palletNo"></param>
        /// <param name="houseNo"></param>
        /// <param name="roadwayNo"></param>
        /// <returns></returns>
        OutCommandDto RequestMiJiLocation(string palletNo, string houseNo, string roadwayNo);

        /// <summary>
        /// agv走出储位修改储位信息，仅限平库储位
        /// </summary>
        /// <param name="taskNo"></param>

 Wms/Wms/Controllers/DownApiController.cs

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

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

                LogFile.SaveLogToFile($"WCS申请巷道返回：( {JsonConvert.SerializeObject(list)} ),", logStr);
                //new OperationASNServer().AddLogOperationAsn("入库作业", "入库日志", model.PalletNo.Substring(0, 8), 
                //    "申请巷道", $"申请巷道托盘号：{model.PalletNo.Substring(0, 8)}的成功信息", 2);

                return Ok(new { Success = 0, Message = "申请巷道成功", TaskList = list });
            }
            catch (Exception e)
            {
                LogFile.SaveLogToFile($"WCS申请巷道返回：( {e.Message} ),", logStr);
                //new OperationASNServer().AddLogOperationAsn("入库作业", "入库日志", model.PalletNo.Substring(0, 8),
                //"申请巷道", $"申请巷道托盘号：{model.PalletNo.Substring(0, 8)}的失败信息", 2);

                return Ok(new ErpModel { Success = -1, Message = e.Message });
            }
@@ -361,37 +357,19 @@
        [HttpPost]
        public IActionResult RequestMiJiLocation(RequestLocate model)
        {

            //获取当前登录的用户ID
            //var claimsIdentity = this.User.Identity as ClaimsIdentity;
            //if (claimsIdentity == null)
            //{
            //    return Ok(new { code = 1, msg = "未获取到当前操作人信息" });
            //}
            //var userId = claimsIdentity.FindFirst(ClaimTypes.Name)?.Value;
            //if (string.IsNullOrWhiteSpace(userId))
            //{
            //    return Ok(new { code = 1, msg = "未获取到当前操作人信息" });
            //}

            //string palletno = model.PalletNo;
            var logStr = "";
            
            logStr = $@".\log\WCS\WCS申请储位" + DateTime.Now.ToString("yyyyMMdd") + ".txt";
            

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

                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 });
            }