合并代码

Administrator

2024-02-02 ec258841a0f5249935578544ebed9121fbc71b2d

 Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs

@@ -1537,6 +1537,9 @@
                {
                    throw new Exception("-1:托盘号不可为空!");
                }
                //判断物料数量是否为0 为0判断箱码信息 不为0继续
                if (model.SkuQty == 0)
                {
                if (string.IsNullOrEmpty(model.BoxNo))
                {
                    throw new Exception("-1:箱码信息不可为空!");
@@ -1550,6 +1553,8 @@
                    }

                }
                }

                #endregion
                // 验证入库单总表
                var notice = Db.Queryable<BllArrivalNotice>().First(m => m.IsDel == "0" && m.ASNNo == model.AsnNo);
@@ -1763,7 +1768,7 @@

                // 更改入库单明细已组数量
                var sqlString = string.Empty;
                sqlString += $"update BllArrivalNoticeDetail set FactQty = FactQty + '{factQty}' where id = '{model.AsnDetailId}';";
                sqlString += $"update BllArrivalNoticeDetail set FactQty = FactQty + '{bind.Qty}' where id = '{model.AsnDetailId}';";
                Db.Ado.ExecuteCommand(sqlString);

                // 更改入库单及入库明细状态
@@ -1875,7 +1880,7 @@
                        PalletNo = model.PalletNo,
                        PalletNo2 = "",
                        PalletNo3 = "",
                        Qty = 0,
                        Qty = model.SkuQty,
                        FullQty = pNum,
                        Status = "0",
                        Type = "0",
@@ -1901,7 +1906,7 @@
                }

                #region 箱码信息

                var boxInfoList = new List<BllLabelBoxNo>();
                var msgStr = $"箱号为{model.BoxNo}";
                var boxInfoList = new List<BllLabelBoxNo>();
                //首箱
@@ -1922,6 +1927,29 @@
                    }
                    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);

@@ -2032,7 +2060,7 @@

                // 更改入库单明细已组数量
                var sqlString = string.Empty;
                sqlString += $"update BllArrivalNoticeDetail set FactQty = FactQty + '{factQty}' where id = '{model.AsnDetailId}';";
                sqlString += $"update BllArrivalNoticeDetail set FactQty = FactQty + '{bind.Qty}' where id = '{model.AsnDetailId}';";
                Db.Ado.ExecuteCommand(sqlString);

                // 更改入库单及入库明细状态