Merge branch 'wxw'

Administrator

2024-03-30 f147cfa91feec613eb304c78fecafdf43286034a

 Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs

@@ -68,7 +68,7 @@
                    throw new Exception("托盘码为空，请输入托盘码");
                }
                var palletInfo = Db.Queryable<DataStockDetail>().First(w => w.IsDel == "0" && w.PalletNo == palletNo);
                if (!string.IsNullOrEmpty(palletInfo.WareHouseNo))
                if (!string.IsNullOrEmpty(palletInfo.WareHouseNo) && type != "1")
                {
                    throw new Exception("该托盘还未出库");
                }
@@ -447,7 +447,7 @@
                    {
                        throw new Exception("拣货数量不能大于箱内剩余待拣数量");
                    }
                    var pickQty = 0;//拣货的数量
                    decimal pickQty = 0;//拣货的数量
                    var comDetailList = Db.Queryable<BllCompleteDetail>().Where(m => m.IsDel == "0" && m.ExportAllotId == allot.Id && m.PalletNo == palletNo).ToList();
                    var comList = new List<BllCompleteDetail>();
                    foreach (var item in boxInfos)
@@ -580,7 +580,7 @@
                        {
                            throw new Exception("该箱码内存在支码不能进行数量拣货");
                        }
                        int boxQty = boxInfo.First().Qty;
                        decimal boxQty = boxInfo.First().Qty;
                        if (Convert.ToInt32(pickQty1) > boxQty)
                        {
                            throw new Exception("拣货数量不能大于箱内数量");
@@ -616,7 +616,7 @@
                            }
                        }
                    }
                    var pickQty = 0;//拣货的数量
                    decimal pickQty = 0;//拣货的数量

                    var comList = new List<BllCompleteDetail>();
                    foreach (var item in boxInfos)
@@ -1233,6 +1233,20 @@

                #endregion

                #region 验证储位状态是否正常

                var locat = Db.Queryable<SysStorageLocat>().First(a=>a.IsDel == "0" && a.LocatNo == result.LocatNo);
                if (locat == null)
                {
                    throw new Exception("未获取到对应储位信息，请检查!");
                }
                if (locat.Status != "1")
                {
                    throw new Exception("当前储位不是有物品，请检查!");
                }

                #endregion

                //获取库存明细信息
                var stockDetail = Db.Queryable<DataStockDetail>().Where(s => s.IsDel == "0" && s.PalletNo == palletNo).ToList();
                //验证库存明细信息是否存在
@@ -1284,6 +1298,10 @@
                        item.AreaNo = "";//所属区域更改（改为空）
                        Db.Updateable(item).ExecuteCommand();
                    }
                    //变更储位状态
                    locat.Status = "0";//储位更改（改为空储位）
                    Db.Updateable(locat).ExecuteCommand();

                    //出库流水（更改状态）
                    var allot = Db.Queryable<BllExportAllot>().Where(m => m.IsDel == "0" && m.Status == "1" && m.PalletNo == palletNo && m.SONo == soNo).ToList();

@@ -1596,7 +1614,7 @@
                        {
                            throw new Exception("该箱码内存在支码不能进行数量拣货");
                        }
                        int boxQty = boxInfo.First().Qty;
                        decimal boxQty = boxInfo.First().Qty;
                        if (Convert.ToInt32(pickQty1) > boxQty)
                        {
                            throw new Exception("拣货数量不能大于箱内数量");
@@ -1622,7 +1640,7 @@
                            }
                        }
                    }
                    var pickQty = 0;//拣货的数量
                    decimal pickQty = 0;//拣货的数量

                    var comList = new List<BllCompleteDetail>();
                    foreach (var item in boxInfos)
@@ -1850,7 +1868,7 @@
                        {
                            throw new Exception("该箱码内存在支码不能进行数量拣货");
                        }
                        int boxQty = boxInfo.First().Qty;
                        decimal boxQty = boxInfo.First().Qty;
                        if (Convert.ToInt32(pickQty1) > boxQty)
                        {
                            throw new Exception("拣货数量不能大于箱内数量");
@@ -1885,7 +1903,7 @@
                            }
                        }
                    }
                    var pickQty = 0;//拣货的数量
                    decimal pickQty = 0;//拣货的数量

                    var comList = new List<BllCompleteDetail>();
                    foreach (var item in boxInfos)
@@ -2674,7 +2692,7 @@
                }
                #endregion

                var pickQty = 0;//拣货的数量
                decimal pickQty = 0;//拣货的数量
                if (string.IsNullOrWhiteSpace(boxNo))//整托拣货
                {
                    List<DataBoxInfo> boxInfos;
@@ -2830,7 +2848,7 @@
                        {
                            throw new Exception("该箱码内存在支码不能进行数量拣货");
                        }
                        int boxQty = boxInfo.First().Qty;
                        decimal boxQty = boxInfo.First().Qty;
                        if (Convert.ToInt32(pickQty1) > boxQty)
                        {
                            throw new Exception("拣货数量不能大于箱内数量");