合并代码

Administrator

2024-02-02 deb9ab689bdeeb20ad2f835f9c13aba6f39652cb

 Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs

@@ -1908,7 +1908,6 @@
                #region 箱码信息
                var boxInfoList = new List<BllLabelBoxNo>();
                var msgStr = $"箱号为{model.BoxNo}";
                var boxInfoList = new List<BllLabelBoxNo>();
                //首箱
                var boxInfo = Db.Queryable<BllLabelBoxNo>().Where(m => m.IsDel == "0" && m.BoxNo == model.BoxNo && m.Level == "1").ToList();
                if (boxInfo.Count == 0)
@@ -1928,30 +1927,7 @@
                    boxInfoList.AddRange(boxInfo2);
                    var sql = $"select * from BllLabelBoxNo where IsDel = '0' and boxNo>'{model.BoxNo}' and boxNo<'{model.TailBoxNo}' and Level='1'; ";
                    var list = Db.Ado.SqlQuery<BllLabelBoxNo>(sql);
                    boxInfoList.AddRange(list);
                decimal factQty = 0.00m;//托盘总数量
                if (model.SkuQty == 0)
                {
                    //首箱
                    var boxInfo = Db.Queryable<BllLabelBoxNo>().Where(m => m.IsDel == "0" && m.BoxNo == model.BoxNo && m.IsUse == "0" && m.Level == "1").ToList();
                    if (boxInfo.Count == 0)
                    {
                        throw new Exception("-1:箱码信息不存在!");
                    }
                    //是否连续组托
                    if (model.IsContinue == "1")
                    {
                        boxInfoList.AddRange(boxInfo);
                        //尾箱
                        var boxInfo2 = Db.Queryable<BllLabelBoxNo>().Where(m => m.IsDel == "0" && m.BoxNo == model.TailBoxNo && m.IsUse == "0" && m.Level == "1").ToList();
                        if (boxInfo2.Count == 0)
                        {
                            throw new Exception("-1:尾箱码信息不存在!");
                        }
                        boxInfoList.AddRange(boxInfo2);
                        var sql = $"select * from BllLabelBoxNo where IsDel = '0' and IsUse = '0' and boxNo>'{model.BoxNo}' and boxNo<'{model.TailBoxNo}' and Level='1'; ";
                        var list = Db.Ado.SqlQuery<BllLabelBoxNo>(sql);
                        boxInfoList.AddRange(list);
                    boxInfoList.AddRange(list);       

                    //找到相关的二级码
                    foreach (var item in boxInfoList)