Pda/View/SoSetting/ExNoticeOut.html

@@ -253,7 +253,7 @@

                            } else {
                                if (res.data[i].LotNo == '' || res.data[i].LotNo == null) {
                                    $("#goodSelect").append('<option value =' + res.data[i].ISoDetailIdd+ i + '>' + res.data[i]
                                    $("#goodSelect").append('<option value =' + res.data[i].SoDetailId + '>' + res.data[i]
                                        .SkuName +
                                        '</option>');
                                } else {

 Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs

@@ -1001,6 +1001,10 @@
                }
                //根据目标区域获取目标储位地址
                EndLocat = await GetLocat(areaNo);
                if (string.IsNullOrEmpty(EndLocat))
                {
                    throw Oops.Bah("获取目标储位失败!");
                }
                
                //起始储位信息
                var storageLocat = await Db.Queryable<SysStorageLocat>().FirstAsync(w => w.IsDel == "0" && w.LocatNo == locatNo);
@@ -1265,9 +1269,18 @@
            string endLocat = string.Empty;//目标储位
            //当前区域所有储位信息
            var storageLocatList = await Db.Queryable<SysStorageLocat>().Where(w => w.WareHouseNo == "W04" && w.AreaNo == areaNo).ToListAsync();
           
            var locatInfo2 = storageLocatList.Where(w => w.IsDel == "0" && w.Flag == "0" && w.Status == "0")

            var locatInfo2 = new SysStorageLocat();
            if (areaNo == "B10")
            {
                locatInfo2 = storageLocatList.Where(w => w.IsDel == "0" && w.Flag == "0")
                           .OrderByDescending(m => m.Layer).OrderByDescending(m => m.Column).OrderByDescending(m => m.Row).First();
            }
            else
            {
                locatInfo2 = storageLocatList.Where(w => w.IsDel == "0" && w.Flag == "0" && w.Status == "0")
                               .OrderByDescending(m => m.Layer).OrderByDescending(m => m.Column).OrderByDescending(m => m.Row).First();
            }            

            if (locatInfo2 != null)
            {

 Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs

@@ -2728,10 +2728,8 @@
                else
                {
                    stockDetail.Status = "0";
                }
                //判断托盘上还有没有其他物料
                var palletData = Db.Queryable<DataStockDetail>().First(w => w.IsDel == "0" && w.PalletNo == palletNo && w.Id != stockDetail.Id);
                if (stockDetail.Qty <= 0 && palletData == null)
                }                
                if (stockDetail.Qty <= 0)
                {
                    await Db.Deleteable(stockDetail).ExecuteCommandAsync();
                }
@@ -2760,7 +2758,9 @@
                }

                //判断托盘上物料是否拣货完毕
                if (isDel == 0)
                //判断托盘上还有没有其他物料
                var palletData = Db.Queryable<DataStockDetail>().First(w => w.IsDel == "0" && w.PalletNo == palletNo && w.Id != stockDetail.Id);
                if (isDel == 0 && palletData == null)
                {
                    pallet.Status = "0";
                    await Db.Updateable(pallet).ExecuteCommandAsync();

 Wms/WMS.BLL/HttpServer.cs

@@ -1763,9 +1763,9 @@
                    {
                        throw new Exception("储位损坏不能出库");
                    }
                    if (locate.WareHouseNo != "W02")
                    if (locate.WareHouseNo != "W02" && locate.WareHouseNo != "W04")
                    {
                        throw new Exception("托盘不在货架库上");
                        throw new Exception("托盘不在货架库上也不在平库");
                    }
                    var locateEnd = Db.Queryable<SysStorageLocat>().First(m => m.LocatNo == outModeLocate && m.IsDel == "0");//当前出库的目标储位信息
                    if (locateEnd == null)
@@ -1774,11 +1774,20 @@
                    }
                    else if (locateEnd.Status != "0")
                    {
                        throw new Exception("目标储位状态不是空储位");
                        var logEnd = Db.Queryable<LogTask>().First(w => w.IsDel == "0" && w.Status == "1" && w.EndLocat == locateEnd.LocatNo);
                        if (logEnd != null && logEnd.PalletNo != palletNo)
                        {
                            throw new Exception("目标储位状态不是空储位");
                        }
                        var detailEnd = Db.Queryable<DataStockDetail>().First(w => w.IsDel == "0" && w.LocatNo == locateEnd.LocatNo);
                        if (detailEnd != null && detailEnd.PalletNo != palletNo)
                        {
                            throw new Exception("目标储位状态不是空储位");
                        }
                    }
                    #endregion

                    if (locate.Status == "1") //有物品
                    if (locate.WareHouseNo == "W02" && locate.Status == "1") //有物品
                    {
                        #region 添加出库任务

@@ -1857,9 +1866,9 @@
                        Db.Updateable(item).ExecuteCommand();

                        #endregion
                        

                    }
                    else if (locate.Status == "3") //出库中
                    else if (locate.Status == "3" || locate.WareHouseNo == "W04") //出库中或已在平库
                    {
                        #region 改变数据
                        //判断是否是已经出过库又回库（状态为待拣货的 1）
@@ -1883,21 +1892,31 @@
                                }
                            }
                        }
                        var taskNo = Db.Queryable<LogTask>().First(m => m.OrderType == "1" && m.TaskNo != item.TaskNo && m.Status == "1" && m.PalletNo == item.PalletNo);
                        if (taskNo == null)
                        if (locate.WareHouseNo == "W04")
                        {
                            taskNo = logTaskList.FirstOrDefault(m => m.PalletNo == item.PalletNo);//当前有同托盘不同物料出库
                            item.TaskNo = "";
                            item.Status = "2"; // 出库分配信息状态改为正在执行 
                            item.OutMode = item.OutMode;//出库口
                            //item.UnstackingMode = unstackingMode2;//拆垛模式
                            Db.Updateable(item).ExecuteCommand();
                        }
                        if (taskNo == null)
                        else
                        {
                            throw new Exception($"托盘号：{item.PalletNo},出库异常");
                        }
                        item.TaskNo = taskNo.TaskNo;
                        item.Status = "1"; // 出库分配信息状态改为正在执行 
                        item.OutMode = item.OutMode;//出库口
                        //item.UnstackingMode = unstackingMode2;//拆垛模式
                        Db.Updateable(item).ExecuteCommand();
                        
                            var taskNo = Db.Queryable<LogTask>().First(m => m.OrderType == "1" && m.TaskNo != item.TaskNo && m.Status == "1" && m.PalletNo == item.PalletNo);
                            if (taskNo == null)
                            {
                                taskNo = logTaskList.FirstOrDefault(m => m.PalletNo == item.PalletNo);//当前有同托盘不同物料出库
                            }
                            if (taskNo == null)
                            {
                                throw new Exception($"托盘号：{item.PalletNo},出库异常");
                            }
                            item.TaskNo = taskNo.TaskNo;
                            item.Status = "1"; // 出库分配信息状态改为正在执行 
                            item.OutMode = item.OutMode;//出库口
                            //item.UnstackingMode = unstackingMode2;//拆垛模式
                            Db.Updateable(item).ExecuteCommand();
                        }                     
                        #endregion
                    }
                    else if (locate.Status == "5") //移出中

 Wms/Wms/Controllers/PdaCrController.cs

@@ -264,10 +264,6 @@

        #endregion

        #region AGV空托盘转运

        #endregion

        #region 零箱解绑
        /// <summary>
        /// 零箱解绑