功能测试，问题修改。

bklLiudl

2024-08-26 fe5c4eeb45ec03380259b2e3c9b411be128ae6c8

 Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs

@@ -73,6 +73,7 @@
                    CompleteTime = tb1.CompleteTime,
                    CreateTime = tb1.CreateTime,
                    CreateUserName = tb3.RealName,
                    UserName=tb1.UserName,
                    UpdateTime = ((DateTime)tb1.UpdateTime).ToString("yyyy-MM-dd HH:mm:ss"),
                    UpdateUserName = tb4.RealName

@@ -118,6 +119,8 @@
                     Status = tb1.Status,
                     AsnType = tb2.Type,
                     AsnStatus = tb2.Status,
                     Lot1 = tb1.Lot1,
                     Lot2 = tb1.Lot2,
                     UDF1 = tb1.UDF1,
                     UDF2 = tb1.UDF2,
                     UDF3 = tb1.UDF3,
@@ -519,8 +522,21 @@
                            }
                        }

                        if (TypeLot.Contains(model.Type)) 
                        {
                            if (string.IsNullOrWhiteSpace(detailModel.Lot1)) 
                            {
                                throw new Exception("生产日期不可为空!");
                            }
                            if (string.IsNullOrWhiteSpace(detailModel.Lot2))
                            {
                                throw new Exception("过期日期不可为空!");
                            }
                        }

                        // 判断是否已存在当前明细
                        var com =  dbDetailModels.Where(m => m.SkuNo == detailModel.SkuNo && m.LotNo == detailModel.LotNo && m.Id != detailModel.Id && m.IsDel == "0").Count();
                        var com =  dbDetailModels.Where(m => m.SkuNo == detailModel.SkuNo 
                        && m.LotNo == detailModel.LotNo && m.Id != detailModel.Id && m.IsDel == "0").Count();
                        if (com > 0)
                        {
                            strMessage = "-1:物料和批次号重复;";
@@ -587,6 +603,8 @@
                                IsBelt = detailModel.IsBelt,
                                SupplierLot = detailModel.SupplierLot,
                                Status = "0",
                                Lot1 = detailModel.Lot1,
                                Lot2 = detailModel.Lot2,
                                UDF1 = detailModel.UDF1,
                                UDF2 = detailModel.UDF2,
                                UDF3 = detailModel.UDF3,
@@ -607,6 +625,8 @@
                                             && it.SupplierLot == detailModel.SupplierLot
                                             && it.IsBale == detailModel.IsBale
                                             && it.IsBelt == detailModel.IsBelt
                                             && it.Lot1 == detailModel.Lot1                                 // 生产日期
                                             && it.Lot2 == detailModel.Lot2                                 // 过期日期
                                             && it.UDF1 == detailModel.UDF1
                                             && it.UDF2 == detailModel.UDF2
                                             && it.UDF3 == detailModel.UDF3
@@ -624,7 +644,7 @@
                                {
                                    if (dbDetail.LotNo != detailModel.LotNo)
                                    {
                                        strMessage = "-1:当前单据类型不可更改批次，只可编辑数量;";
                                        strMessage = "-1:当前单据类型不可更改批次;";
                                        continue;
                                    }
                                }
@@ -639,6 +659,8 @@
                            dbDetail.LotText = detailModel.LotText;
                            dbDetail.SupplierLot = detailModel.SupplierLot;
                            dbDetail.IsBale = detailModel.IsBale;
                            dbDetail.Lot1 = detailModel.Lot1;
                            dbDetail.Lot2 = detailModel.Lot2;
                            dbDetail.UDF1 = detailModel.UDF1;
                            dbDetail.UDF2 = detailModel.UDF2;
                            dbDetail.UDF3 = detailModel.UDF3;
@@ -792,7 +814,7 @@
                    asnModel.UpdateUser = model.CreateUser;
                }

                asnDetail.IsDel = "0";
                asnDetail.IsDel = "1";
                asnDetail.UpdateTime = editDateTime;
                asnDetail.UpdateUser = model.CreateUser;