问题修改

zhaowc

2025-04-07 b9f7560cbe0e562a40e9515a0559a3e951f0fee6

 Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs

@@ -24,6 +24,12 @@
using WMS.IBLL.IBllSoServer;
using Model.ModelVm;
using System.Runtime.Intrinsics.X86;
using WMS.Entity.BllAsnEntity;
using Model.ModelDto;
using WMS.BLL.BllPdaServer;
using WMS.IBLL.IPdaServer;
using System.DirectoryServices.Protocols;
using Model.ModelDto.SysDto;

namespace WMS.BLL.BllSoServer
{
@@ -49,11 +55,11 @@
                {
                    throw new Exception("单据类型不可为空!");
                }
                if (string.IsNullOrEmpty(model.Customer))
                {
                    throw new Exception("客户不可为空!");
                }
                if (string.IsNullOrEmpty(model.OrderCode))
                //if (string.IsNullOrEmpty(model.Customer))
                //{
                //    throw new Exception("客户不可为空!");
                //}
                if (string.IsNullOrEmpty(model.OrderNo))
                {
                    throw new Exception("系统单号不可为空!");
                }
@@ -68,10 +74,10 @@

                //客户信息
                var customer = Db.Queryable<SysCustomer>().First(m => m.IsDel == "0" && m.CustomerNo == model.Customer);
                if (customer == null)
                {
                    throw new Exception("客户不可为空!");
                }
                //if (customer == null)
                //{
                //    throw new Exception("客户不可为空!");
                //}
                var logistics = Db.Queryable<SysLogisticsInfo>().First(m => m.IsDel == "0" && m.CarrierName == model.LogisticsNo);
                int? logisticsId = null;
                if (logistics != null)
@@ -127,8 +133,9 @@
                            }
                            if (qty > d.Qty - q1)
                            {
                                q1 += d.Qty - q1;
                                dic.Add(stocks.First().Id, d.Qty - q1);

                                q1 += d.Qty - q1;
                            }
                            else
                            {
@@ -149,10 +156,11 @@
                                }
                                var q2 = demo.Qty - demo.LockQty - demo.FrozenQty;

                                if (q2 > d.Qty - q1)
                                if (q2 >= d.Qty - q1)
                                {
                                    q1 += d.Qty - q1;
                                    dic.Add(demo.Id, d.Qty - q1);

                                    q1 += d.Qty - q1;
                                }
                                else
                                {
@@ -161,7 +169,7 @@
                                }

                            }
                            if (d.Qty >= q1)
                            if (d.Qty > q1)
                            {
                                stocks = stockList.Where(s => s.SkuNo == d.SkuNo && string.IsNullOrWhiteSpace(s.LotNo)).ToList();
                                if (stocks.Count == 0)
@@ -169,10 +177,11 @@
                                    throw new Exception($"总库存中出库物料信息:{d.SkuNo}库存数量不足");
                                }
                                var q2 = stocks.First().Qty - stocks.First().LockQty - stocks.First().FrozenQty;
                                if (q2 > d.Qty - q1)
                                if (q2 >= d.Qty - q1)
                                {
                                    q1 += d.Qty - q1;
                                    dic.Add(stocks.First().Id, d.Qty - q1);

                                    q1 += d.Qty - q1;
                                }
                                else
                                {
@@ -227,8 +236,9 @@
                        Type = model.SoType,
                        Status = "0",
                        Origin = model.Origin,
                        CustomerNo = model.Customer,
                        CustomerName = customer.CustomerName,
                        OrderCode = model.OrderNo,
                        //CustomerNo = model.Customer,
                        //CustomerName = customer.CustomerName,
                        LogisticsId = logisticsId,
                        IsWave = "0",
                        WaveNo = "",
@@ -296,6 +306,10 @@
                {
                    throw new Exception("复核失败，复核人员和关闭订单人员不能相同！");
                }
                if (date.Id == notice.CreateUser)
                {
                    throw new Exception("复核失败，复核人员和创建订单人员不能相同！");
                }
                var list = new List<SoDetail>();
                foreach (var d in detail)
                {
@@ -309,7 +323,7 @@
                }
                var soInfo = new SoInfo()
                {
                    OrderCode = notice.OrderCode,
                    OrderNo = notice.OrderCode,
                    SoDetails = list
                };
                #region 通过接口发送至erp
@@ -450,7 +464,7 @@
                        break;
                    case "5"://中间品出库
                        skuType = "(4)";
                        inspectStatus = "1";
                        inspectStatus = "0,1";
                        break;
                    case "6"://代储出库
                        skuType = "(0,1,2,3,4)";
@@ -591,7 +605,7 @@
                    //添加出库单
                    foreach (var d in model.Detail)
                    {
                        if (d.Qty < 1)
                        if (d.Qty <=0)
                        {
                            throw new Exception("出库数量必须大于0");
                        }
@@ -1243,9 +1257,9 @@
                {
                    throw new Exception("未查询到出库单据信息");
                }
                if (notice.Status != "4")
                if (notice.Status != "4" && notice.Status != "3")
                {
                    throw new Exception("参数异常,请检查状态是否为执行完成或订单关闭");
                    throw new Exception("参数异常,请检查状态是否为正在执行或执行完成");
                }
                //总库存信息
                var stockList = Db.Queryable<DataStock>().ToList();
@@ -1266,64 +1280,66 @@

                    foreach (var d in noticeDetail)
                    {
                        //更改库存明细锁定数量
                        //var orders = dataContext.WmsExportOrder.Where(o => o.ExportDetailId == d.Id
                        //                && o.ExportExecuteFlag != "4" && o.ExportExecuteFlag == "3" && o.pickingType == 0).ToList();
                        //foreach (var o in orders)
                        //{
                        //    if (o.ExportQuantity > o.PickedNum) //判断拣货是否已拣完
                        //    {
                        //        var pq = dataContext.WmsStockTray.Where(t => t.StockGoodId == o.ExportGoodsCode && t.StockStockCode == o.ExportStockCode);

                        //        if (string.IsNullOrWhiteSpace(o.ExportLotNo))
                        //        {
                        //            pq = pq.Where(t => t.StockLotNo == null || t.StockLotNo == "");
                        //        }
                        //        else
                        //        {
                        //            pq = pq.Where(t => t.StockLotNo == o.ExportLotNo);
                        //        }
                        //        var pallet = pq.FirstOrDefault();
                        //        //库存托盘信息锁定数量还原为未锁定
                        //        if (pq != null)
                        //        {
                        //            pallet.LockQuantity -= o.ExportQuantity.Value - o.PickedNum;
                        //            pallet.StockQuantity += o.ExportQuantity.Value - o.PickedNum;
                        //        }
                        //    }
                        //}

                        if (d.Qty != d.CompleteQty)
                        if (notice.Type == "0")//成品出库
                        {
                            throw new Exception("当前单据明细中计划数量与拣货数量不符，请核实");
                        }
                        #region 库存表减去锁定数量与总数量(PDA拣货的时候已经减去数量了)
                        /*var sq = stocks.Where(s => s.SkuNo == d.SkuNo);
                        if (!string.IsNullOrWhiteSpace(d.LotNo))
                        {
                            sq = sq.Where(s => s.LotNo == d.LotNo);
                        }
                        else
                        {
                            sq = sq.Where(s => string.IsNullOrWhiteSpace(s.LotNo));
                        }
                        var st = sq.FirstOrDefault();
                        if (st != null)
                        {
                            if (d.CompleteQty <= d.Qty)
                            if (d.Qty != d.CompleteQty)
                            {
                                st.Qty += d.Qty - d.CompleteQty.Value;
                                throw new Exception("当前单据明细中计划数量与拣货数量不符，请核实");
                            }
                        }
                       
                            //更改库存明细锁定数量
                            var allotList = Db.Queryable<BllExportAllot>().Where(o => o.SODetailNo == d.Id && o.Status == "3" && o.IsDel == "0").ToList();
                            foreach (var o in allotList)
                            {
                                if (o.Qty > o.CompleteQty) //判断拣货是否已拣完
                                {
                                    var pq = Db.Queryable<DataStockDetail>().Where(t => t.IsDel == "0" && t.Id == o.StockId && t.SkuNo == o.SkuNo);

                                    if (string.IsNullOrWhiteSpace(o.LotNo))
                                    {
                                        pq = pq.Where(t => string.IsNullOrWhiteSpace(t.LotNo));
                                    }
                                    else
                                    {
                                        pq = pq.Where(t => t.LotNo == o.LotNo);
                                    }
                                    var pallet = pq.First();
                                    //库存托盘信息锁定数量还原为未锁定
                                    if (pq != null)
                                    {
                                        //pallet.Qty -= o.CompleteQty.Value - o.Qty;
                                        pallet.LockQty -= o.Qty - o.CompleteQty.Value;
                                        Db.Updateable(pallet).UpdateColumns(it => new { it.LockQty }).ExecuteCommand();
                                    }
                                }
                            }


                            #region 库存表减去锁定数量与总数量(PDA拣货的时候已经减去数量了)
                            var sq = stocks.Where(s => s.SkuNo == d.SkuNo);
                            if (!string.IsNullOrWhiteSpace(d.LotNo))
                            {
                                sq = sq.Where(s => s.LotNo == d.LotNo);
                            }
                            else
                            {
                                st.Qty -= d.CompleteQty.Value - d.Qty;
                                sq = sq.Where(s => string.IsNullOrWhiteSpace(s.LotNo));
                            }
                            st.LockQty -= d.Qty;
                            st.Qty -= d.Qty;
                            //修改总库存表
                            Db.Updateable(st).UpdateColumns(it => new { it.Qty, it.LockQty }).ExecuteCommand();
                        }*/
                        #endregion
                            if (notice.Type == "6")//代储
                            {
                                sq = sq.Where(s => s.OwnerNo == notice.CustomerNo);
                            }
                            var st = sq.FirstOrDefault();
                            if (st != null)
                            {
                                st.LockQty -= d.Qty - d.CompleteQty.Value;
                                //修改总库存表
                                Db.Updateable(st).UpdateColumns(it => new { it.LockQty }).ExecuteCommand();
                            }
                            #endregion
                        

                    }
                    //添加操作日志记录
                    var k = new OperationSOServer().AddLogOperationSo("出库作业", "出库单据", notice.SONo, "关单", $"关闭了单据号为{notice.SONo}的单据信息", userId);
@@ -1674,7 +1690,7 @@
        #region 下发出库、出库完成、重新下发任务、取消任务、异常处理

        // 下发出库（调用cs接口给他库位地址）
        public List<OutCommandDto> IssueOutHouse(string soNo, string unstackingMode, string outMode, string loadingAddre, int userId, string url, out string str)
        public List<OutCommandDto> IssueOutHouse(string soNo, string unstackingMode, string outMode,string checkmode, string loadingAddre, int userId, string url, out string str)
        {
            try
            {
@@ -1694,8 +1710,11 @@
                {
                    throw new Exception($"未找到{soNo}出库单信息");
                }
                //所有要出库的出库分配信息(未下发的信息和待拣货的信息)
                var list = Db.Queryable<BllExportAllot>().Where(a => a.IsDel == "0" && a.SONo == soNo && a.Status == "0").ToList();
                //更新出库单拣选方式
                notice.UDF1 = checkmode; 
                Db.Updateable(notice).ExecuteCommand();
                //所有要出库的出库分配信息(未下发的信息和待拣货的信息和部分拣货后回流入库的托盘)
                var list = Db.Queryable<BllExportAllot>().Where(a => a.IsDel == "0" && a.SONo == soNo && (a.Status == "0" || a.Status == "3")).ToList();
                if (list.Count == 0) //判断是否有需要下发的出库流水
                {
                    throw new Exception("当前出库单据无需要下发的托盘");
@@ -1745,7 +1764,7 @@
                            if (isChai == "0")
                            {
                                var boxInfo = Db.Queryable<DataBoxInfo>().Where(w => w.IsDel == "0" && w.PalletNo == item.PalletNo && w.BitBoxMark == "1").ToList();
                                if (boxInfo != null)//托盘上有零箱需要拆箱
                                if (boxInfo.Count>0)//托盘上有零箱需要拆箱
                                {
                                    isChai = "1";
                                    unstackingMode2 = "1";//需要拆箱需走PDA拆垛
@@ -1754,7 +1773,7 @@

                            if (unstackingMode2 == "0")//机器人拆垛
                            {
                                toLocation = loadingAddre;//装车口
                                toLocation = "009";//机器人拆垛统一发送到009工位，由PLC自动分配拆垛位
                            }
                            else //PDA拆垛
                            {
@@ -2228,16 +2247,24 @@
            }
        }

        //wcs返回的成功信号（出库成功）
        public void ExportSuccess(string taskNo, int userId)
        //wcs返回的成功信号（出库成功） 
        public void ExportSuccess(string taskNo, int userId,string url)
        {
            try
            {
                //出库任务号更改，如果由PLC出库，则PLC回传任务号为：任务号+实际出库口
                var TtaskNo = taskNo;
                var outLine = "";
                if (taskNo.Length == 18)
                {
                    TtaskNo = taskNo.Substring(0, taskNo.Length - 3);
                    outLine = taskNo.Substring(taskNo.Length - 3, 3);
                }
                //当前任务信息
                var task = Db.Queryable<LogTask>().First(m => m.TaskNo == taskNo && m.IsDel == "0");
                var task = Db.Queryable<LogTask>().First(m => m.TaskNo == TtaskNo && m.IsDel == "0");
                if (task == null)
                {
                    throw new Exception($"未查询到任务号为：‘{taskNo}’的任务信息");
                    throw new Exception($"未查询到任务号为：‘{TtaskNo}’的任务信息");
                }
                if (task.Status == "2")
                {
@@ -2353,7 +2380,7 @@
                        Db.Updateable(item).ExecuteCommand();
                    }
                    //出库流水（更改状态）
                    var allot = Db.Queryable<BllExportAllot>().Where(m => m.IsDel == "0" && (m.TaskNo == taskNo || (m.Status == "1" && m.PalletNo == task.PalletNo))).ToList();
                    var allot = Db.Queryable<BllExportAllot>().Where(m => m.IsDel == "0" && (m.TaskNo == TtaskNo || (m.Status == "1" && m.PalletNo == task.PalletNo))).ToList();

                    foreach (var item in allot)
                    {
@@ -2372,7 +2399,162 @@
                    if (userId != 0)
                    {
                        //添加操作日志记录
                        var k = new OperationSOServer().AddLogOperationSo("出库作业", "出库日志", taskNo, "完成", $"点击完成按钮、完成任务号为：{taskNo}的任务", userId);
                        var k = new OperationSOServer().AddLogOperationSo("出库作业", "出库日志", TtaskNo, "完成", $"点击完成按钮、完成任务号为：{TtaskNo}的任务", userId);
                    }
                    if (outLine != "" && outLine != "009" && outLine != "013" && outLine != "018" && outLine != "022")
                    {
                        #region 分配出库目的位
                        string positionStart = outLine, positionEnd = "", type = "D00";
                        var type1 = Db.Queryable<BllExportNotice>().Where(m => m.SONo == allot.First().SONo && m.IsDel == "0" && m.Status == "3").First();
                        if (type1 == null)
                        {
                            var locateno = Db.Queryable<SysStorageLocat>().Where(m => m.AreaNo == "B13").ToList();
                            type = "D02"; //空托盘垛出库
                            if (outLine == "443")//西侧出库
                            {
                                positionEnd = locateno.First(m => m.Row == 1 && m.Status == "0" && m.Flag == "0").LocatNo;
                            }
                            else if (outLine == "440")  //东侧出库
                            {
                                positionEnd = locateno.First(m => m.Row == 2 && m.Status == "0" && m.Flag == "0").LocatNo; //东侧房间库位
                            }
                            else  //1楼空托盘出库不调用AGV
                            {
                                Db.CommitTran();
                                return;
                            }

                        }
                        else 
                        { 
                            if (type1.Type == "1" || (type1.Type == "5" && (positionStart == "440" || positionStart == "443")))  //3楼领料出库 /3L中间品出库
                            {
                                var locateno = Db.Queryable<SysStorageLocat>().Where(m => m.AreaNo == "B11").ToList();
                                if (outLine == "443")//西侧出库
                                {

                                    positionEnd = locateno.OrderBy(m => m.LocatNo).First(m => m.Row == 1 && m.Status == "0" && m.Flag == "0").LocatNo; //西侧房间库位
                                }
                                else if (outLine == "440")  //东侧出库
                                {
                                    positionEnd = locateno.OrderBy(m => m.LocatNo).First(m => m.Row == 3  && m.Status == "0" && m.Flag == "0").LocatNo; //东侧房间库位和对面房间
                                }
                            }
                            else if (type1.Type == "2" || type1.Type == "3") //抽检出库 /取样出库
                            {
                                positionEnd = Db.Queryable<SysStorageLocat>().OrderBy(m=>m.LocatNo).First(m => m.AreaNo == "B04" && m.Status == "0" && m.Flag == "0").LocatNo;
                            }
                            else if (type1.Type == "4")//不合格品出库
                            {

                                positionEnd = Db.Queryable<SysStorageLocat>().OrderBy(m => m.LocatNo).First(m => (m.AreaNo == "B01"|| m.AreaNo == "B02"||m.AreaNo == "B04") && m.Status == "0" && m.Flag == "0").LocatNo;
                            }
                            else if (type1.Type == "0")//成品出库
                            {
                                if (type1.UDF1 == "0") //出库到暂存区
                                {
                                    positionEnd = Db.Queryable<SysStorageLocat>().OrderBy(m => m.LocatNo).First(m => m.AreaNo == "B02" && m.Status == "0" && m.Flag == "0").LocatNo;
                                }
                                else
                                {
                                    return;
                                }
                            }
                            else //其他单据类型都存放发货缓存区
                            {
                                positionEnd = Db.Queryable<SysStorageLocat>().OrderBy(m => m.LocatNo).First(m => m.AreaNo == "B02" && m.Status == "0" && m.Flag == "0").LocatNo;
                            }
                        }
                        #endregion

                        #region AGV调用
                        var storageLocatEnd = Db.Queryable<SysStorageLocat>().First(w => w.IsDel == "0" && w.LocatNo == positionEnd && w.Flag == "0" && w.Status == "0");
                        if (storageLocatEnd == null)
                        {
                            throw new Exception("生成的AGV任务目的地址不正确");
                        }
                        List<AgvSchedulingTask> agvTaskList = new List<AgvSchedulingTask>();

                        object[] position = new object[2];
                        position[0] = new
                        {
                            positionCode = positionStart,
                            type = "00"
                        };
                        position[1] = new
                        {
                            positionCode = positionEnd,
                            type = "00"
                        };

                        AgvSchedulingTask agvTask = new AgvSchedulingTask();
                        Random r = new Random();
                        long ran = DateTime.Now.Ticks;
                        agvTask.ReqCode = ran.ToString();
                        //agvTask.ReqCode = TtaskNo;         //agv请求编号，需要随机生成  （最大32位）
                        agvTask.TaskCode = TtaskNo;         //任务号
                        agvTask.TaskTyp = type;           //搬运类型
                        agvTask.PositionCodePath = position;      //起始和目的位集合
                        agvTask.CtnrTyp = "1";            //容器类型，值为1
                        if (type == "D02")
                        {
                            var palnoNum = Db.Queryable<BllPalletBind>().OrderByDescending(w=>w.Id).First(w => w.IsDel == "0" && w.PalletNo == task.PalletNo);
                            agvTask.CtnrNum = palnoNum.Qty.ToString();     //叠托任务需要下发空托盘数量
                        }

                        agvTaskList.Add(agvTask);

                        string str = "";
                        var list2 = agvTaskList.Select(m => m.TaskCode).ToList();
                        var jsonData = JsonConvert.SerializeObject(agvTaskList);
                        jsonData = jsonData.Substring(1, jsonData.Length - 1);
                        jsonData = jsonData.Substring(0, jsonData.Length - 1);
                        var response = HttpHelper.DoPost(url, jsonData, "下发给AGV转运命令", "AGV");
                        var agvModel = JsonConvert.DeserializeObject<OutCommanAgvDto>(response);
                        if (agvModel.Code != "0")
                        {
                            //记录log
                            var logStr = $@".\log\AGV\任务反馈" + DateTime.Now.ToString("yyyyMMdd") + ".txt";
                            jsonData = JsonConvert.SerializeObject(agvModel);
                            LogFile.SaveLogToFile($"AGV任务反馈执行通知：( {jsonData} ),", logStr);
                        }

                        #endregion

                        #region 添加出库任务信息

                        var taskNonew = new Common().GetMaxNo("TK");
                        var exTask = new LogTask    //小车移库任务
                        {
                            TaskNo = TtaskNo,
                            Sender = "WMS",
                            Receiver = "AGV",
                            IsSuccess = 1, //是否下发成功 0失败 1成功

                            StartLocat = positionStart,//起始位置
                            EndLocat = positionEnd,//目标位置
                            PalletNo = task.PalletNo,//托盘码
                            IsSend = 1,//是否可再次下发
                            IsCancel = 1,//是否可取消
                            IsFinish = 1,//是否可完成
                            Type = "2",//任务类型 0 入库任务 1 出库任务  2 移库任务
                            Status = "1",//任务状态0：等待执行1正在执行2执行完成
                            OrderType = "3",//0 入库单 1 出库单  2 盘点单  3 移库单
                            CreateTime = DateTime.Now, //创建时间
                            CreateUser = userId, //创建人
                            Msg = "小车从" + positionStart  + "到" + positionEnd + "的移库任务", //关键信息
                                                                                                             //FinishDate = serverTime, //完成时间
                        };
                        Db.Insertable(exTask).ExecuteCommand();

                        #endregion

                        #region 储位状态变更
                        //更改储位状态为出库中
                        var locat = Db.Queryable<SysStorageLocat>().First(m => m.LocatNo == positionEnd);
                        locat.Status = "4"; //4 移入中
                        Db.Updateable(locat).ExecuteCommand();//修改储位信息
                        #endregion
                    }
                    Db.CommitTran();
                }
@@ -2393,7 +2575,7 @@
        /// </summary>
        /// <param name="taskNo">任务号</param>
        /// <param name="userId">操作人</param>
        /// <exception cref="Exception"></exception>
        /// <exception cref="Exception"></exception>          
        public void RelocationSuccess(string taskNo, int userId)
        {
            try
@@ -2504,8 +2686,9 @@
                    StartLocate = locateNo, // 起始位置
                    StartRoadway = locate.RoadwayNo,
                    EndLocate = task.EndLocat, // 目标位置 
                    EndRoadway = task.EndRoadway,
                    TaskNo = task.TaskNo, // 任务号
                    TaskType = "1",// 任务类型 (出库)
                    TaskType = task.Type,// 任务类型 (出库)
                    OutMode = "",  //目标地址
                    Order = 1
                }; //出库数据 
@@ -2759,7 +2942,15 @@

                    // 出库总表  状态改为部分分配
                    var noticeModel = Db.Queryable<BllExportNotice>().First(m => m.SONo == noticeDetailModel.SONo && m.IsDel == "0");
                    noticeModel.Status = "1";
                    if (noticeDetailModel.AllotQty<=0)
                    {
                        noticeModel.Status = "0";
                    }
                    else
                    {
                        noticeModel.Status = "1";
                    }
                   
                    Db.Updateable(noticeModel).ExecuteCommand();

                    // 库存明细表 状态修改为异常锁定 锁定数量修改为托盘上数量
@@ -2773,7 +2964,7 @@

                    // 库存总表 锁定数量=当前锁定数量 +  (库存明细托盘上数量-库存明细托盘上已锁定的数量)
                    var stockModel = Db.Queryable<DataStock>().First(m => m.LotNo == stockDetailModel.LotNo && m.SkuNo == stockDetailModel.SkuNo && m.IsDel == "0");
                    stockModel.LockQty = stockModel.LockQty + (int)(stockDetailModel.Qty - lockQty);
                    stockModel.LockQty = stockModel.LockQty + (decimal)(stockDetailModel.Qty - lockQty);
                    Db.Updateable(stockModel).ExecuteCommand();

                    // 拣货明细表 删除
@@ -3354,9 +3545,9 @@
                    var needQty = detail.Qty - detail.AllotQty;
                    //分配的出库数量
                    var outQty = model.StockList.Select(s => s.Qty).ToList().Sum();
                    if (outQty != needQty)
                    if (outQty < needQty)
                    {
                        throw new Exception("操作失败，出库数量与计划数量不一致！");
                        throw new Exception("操作失败，出库数量不能大于计划数量！");
                    }
                }
                
@@ -3458,7 +3649,7 @@
                    foreach (var item in detailList)
                    {
                        totalQty += item.Qty;
                        totalAllotQty += Convert.ToInt32(item.AllotQty);
                        totalAllotQty += Convert.ToDecimal(item.AllotQty);
                    }

                    if (totalAllotQty >= totalQty)
@@ -3532,7 +3723,7 @@
                        }
                    }
                    var boxInfo = Db.Queryable<DataBoxInfo>().Where(w => w.IsDel == "0" && w.PalletNo == item.PalletNo && w.BitBoxMark == "1").ToList();
                    if (boxInfo != null)//托盘上有零箱需要拆箱
                    if (boxInfo.Count>0)//托盘上有零箱需要拆箱
                    {
                        result = "1";//需要拆箱
                        break;
@@ -3614,5 +3805,266 @@

            return nowAddress;
        }

        /// <summary>
        /// 获取拆垛托盘拆垛信息
        /// </summary>
        /// <param name="model">拆垛托盘号和WCS任务号</param>
        /// <returns>拆垛托盘信息</returns>
        public RequestBoxInfoCheck BoxInfoCheckWcs (BoxInfoCheck model)
        {
            try
            {
                // 判断当前任务状态  Status 1:正在执行 3:异常结束
                var taskModel = Db.Queryable<LogTask>().First(m => m.TaskNo == model.TaskNo && m.IsDel == "0" );
                if (taskModel == null)
                {
                    throw new Exception("此任务不存在或任务状态已变更!");
                }
                // 验证托盘分配信息
                var palletBindModel = Db.Queryable<BllExportAllot>().First(m => m.PalletNo == model.PalletNo && m.TaskNo == model.TaskNo && m.IsDel == "0" && m.Status == "2");
                if (palletBindModel == null)
                {
                    throw new Exception("未找到当前托盘分配任务信息!");
                }
                //计算当前当前托盘上箱数和拆垛箱数
                var storcklist = Db.Queryable<DataStockDetail>().First(m => m.PalletNo == palletBindModel.PalletNo && m.SkuNo == palletBindModel.SkuNo && m.LotNo == palletBindModel.LotNo);

                string level = "1";
                int qty = 0, qtycount = 0;
                var packlist = Db.Queryable<SysPackag>().First(m => m.PackagNo == palletBindModel.SkuNo && m.IsDel == "0");
                if (packlist.L2Name == "箱")
                {
                    level = "2";
                }
                switch (level)
                {
                    case "1":
                        qty = (int)(palletBindModel.Qty / packlist.L1Num);
                        qtycount = (int)(storcklist.Qty / packlist.L1Num);
                        break;
                    case "2":
                        qty = (int)(palletBindModel.Qty / packlist.L2Num);
                        qtycount = (int)(storcklist.Qty / packlist.L2Num);
                        break;

                }
                
                var list = new RequestBoxInfoCheck
                {
                    PalletNo = model.PalletNo,
                    TaskNo = model.TaskNo,
                    SkuNo = palletBindModel.SkuNo,
                    SkuName  = palletBindModel.SkuName,
                    LotNo = palletBindModel.LotNo,
                    OrderNo = palletBindModel.SONo,
                    Standard = palletBindModel.Standard,
                    Qty = qty,//拆垛箱数
                    QtyCount = qtycount   //托盘上箱数
                };
                return list;
            }
            catch (Exception e)
            {

                throw new Exception(e.Message);
            }
        }

        /// <summary>
        /// 拆垛分拣主扫箱码出库
        /// </summary>
        /// <param name="model">箱号</param>
        /// <returns>出库分拣口</returns>
        public string BoxInfoExportWcs(string boxno)
        {
            try
            {
                if (string.IsNullOrWhiteSpace(boxno))
                {
                    throw new Exception("主扫分拣箱码为空");
                }
                //箱码所在拆垛拣货信息
                var boxModel = Db.Queryable<DataBoxInfo>().First(m=>m.BoxNo == boxno);
                if (boxModel == null)
                {
                    throw new Exception("未查询到该箱码的信息");
                }
                //出库分配信息
                var allot = Db.Queryable<BllExportAllot>().First(m =>
                    m.IsDel == "0" && (m.Status == "2" || m.Status == "3") && m.PalletNo == boxModel.PalletNo);
                if (allot == null)
                {
                    throw new Exception("未查询到该托盘的分配信息");
                }
                //出库单
                var notice = Db.Queryable<BllExportNotice>().First(m => m.IsDel == "0" && m.SONo == allot.SONo);
                if (notice == null)
                {
                    throw new Exception("未查询到该出库单的信息");
                }
                //出库单明细
                var noticeDetail = Db.Queryable<BllExportNoticeDetail>()
                    .First(m => m.IsDel == "0" && m.Id == allot.SODetailNo);
                if (noticeDetail == null)
                {
                    throw new Exception("未查询到该出库单明细的信息");
                }
                
                //剩余拣货数量（待拣减去已拣）
                var needQty = allot.Qty - allot.CompleteQty;

                //库存明细
                var stockDetail = Db.Queryable<DataStockDetail>().First(m => m.IsDel == "0" && m.Id == allot.StockId);
                if (stockDetail == null)
                {
                    throw new Exception("未查询到该托盘分配的库存明细信息！");
                }
                //库存总表
                var stock = Db.Queryable<DataStock>().First(a => a.IsDel == "0" && a.SkuNo == stockDetail.SkuNo && a.LotNo == stockDetail.LotNo);
                if (stock == null)
                {
                    throw new Exception("未查询到该托盘分配的库存信息！");
                }

                List<DataBoxInfo> boxInfos;
                var boxInfo = Db.Queryable<DataBoxInfo>().Where(m => m.IsDel == "0" && m.BoxNo == boxno && m.StockDetailId == stockDetail.Id);
                if (boxInfo.Count() == 0)
                {
                    throw new Exception("未查询到该箱码及追溯码的信息");
                }
                boxInfos = boxInfo.ToList();

                var comDetailList = Db.Queryable<BllCompleteDetail>().Where(m => m.IsDel == "0" && m.ExportAllotId == allot.Id && m.PalletNo == boxModel.PalletNo).ToList();
                if (boxInfo.Count() == 0)
                {
                    throw new Exception("未查询到该箱码的信息");
                }
                if (boxInfo.Any(m => m.PalletNo != boxModel.PalletNo))
                {
                    throw new Exception("该托盘与箱码没有绑定关系");
                }
                var boxQty = boxInfo.GroupBy(m => m.BoxNo).Select(m => SqlFunc.AggregateSum(m.Qty)).ToList();
                if (boxQty[0] > needQty)
                {
                    throw new Exception("拣货数量不能大于箱内剩余待拣数量");
                }
                decimal pickQty = 0;//拣货的数量
                Db.BeginTran();
                var comList = new List<BllCompleteDetail>();
                foreach (var item in boxInfos)
                {
                    //添加拣货明细
                    var completeDetail = new BllCompleteDetail()
                    {
                        SONo = allot.SONo,
                        SODetailNo = allot.SODetailNo,
                        ExportAllotId = allot.Id,
                        StockId = allot.StockId,
                        BoxNo = item.BoxNo,
                        BoxNo2 = item.BoxNo2,
                        BoxNo3 = item.BoxNo3,

                        LotNo = allot.LotNo,
                        LotText = allot.LotText,
                        SupplierLot = allot.SupplierLot,
                        SkuNo = allot.SkuNo,
                        SkuName = allot.SkuName,
                        Standard = allot.Standard,
                        PalletNo = boxModel.PalletNo,
                        CompleteQty = item.Qty,

                    };
                    comList.Add(completeDetail);

                    
                    pickQty += item.Qty;
                    //删除库存箱码明细
                    Db.Deleteable(item).ExecuteCommand();
                }

                Db.Insertable(comList).ExecuteCommand();
                //修改出库分配信息
                allot.CompleteQty += pickQty;
                allot.Status = allot.Qty == allot.CompleteQty ? "5" : "3";
                allot.UpdateTime = DateTime.Now;
                if (allot.Status == "5")
                {
                    //判断该托盘是否还存在物料 存在改为待回库 待回库完成后改为已完成
                }
                Db.Updateable(allot).ExecuteCommand();

                //删除或修改库存明细
                stockDetail.BitPalletMark = "1";//修改为零托标识
                stockDetail.Qty -= pickQty;
                stockDetail.LockQty -= pickQty;
                if (stockDetail.Qty == stockDetail.LockQty)
                {
                    stockDetail.Status = "2";
                }
                else if (stockDetail.Qty > stockDetail.LockQty && stockDetail.LockQty > 0)
                {
                    stockDetail.Status = "1";
                }
                else
                {
                    stockDetail.Status = "0";
                }

                if (stockDetail.Qty <= 0)
                {
                    Db.Deleteable(stockDetail).ExecuteCommand();
                }
                else
                {
                    Db.Updateable(stockDetail).ExecuteCommand();
                }
                stock.Qty -= pickQty;
                stock.LockQty -= pickQty;
                if (stock.Qty <= 0)
                {
                    Db.Deleteable(stock).ExecuteCommand();
                }
                else
                {
                    Db.Updateable(stock).ExecuteCommand();
                }
                var num2 = Db.Queryable<DataStockDetail>().Count(m => m.IsDel == "0" && m.PalletNo == boxModel.PalletNo);
                if (num2 <= 0)
                {
                    //改变托盘状态
                    var pallet = Db.Queryable<SysPallets>().First(m => m.PalletNo == boxModel.PalletNo && m.IsDel == "0");
                    if (pallet == null)
                    {
                        throw new Exception("未在托盘表中查询到托盘信息");
                    }
                    pallet.Status = "0";
                    Db.Updateable(pallet).ExecuteCommand();
                }
                //修改出库单明细拣货数量
                noticeDetail.CompleteQty += pickQty;
                noticeDetail.Status = "2";
                Db.Updateable(noticeDetail).ExecuteCommand();

                var num = Db.Queryable<BllExportNoticeDetail>()
                    .Count(m => m.IsDel == "0" && m.SONo == allot.SONo && m.CompleteQty < m.Qty);
                if (num <= 0)
                {
                    notice.Status = "4"; //更改为执行完成

                    noticeDetail.Status = "3";
                    Db.Updateable(noticeDetail).ExecuteCommand();
                }
                //修改出库单信息
                Db.Updateable(notice).ExecuteCommand();
                Db.CommitTran();
                return allot.LoadingAddre;
            }
            catch (Exception e)
            {
                Db.RollbackTran();
                throw new Exception(e.Message);
            }
        }
    }
}