Merge branch 'yyk'

yuyou_x

2024-02-23 06199ebfdf5d58c90c44848cf2fd490256e01c51

 Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs

@@ -752,6 +752,10 @@
                    }

                    var info = boxInfo.First(m => m.BindNo == item.Id);
                    //获取托盘绑定对应单据
                    var noticeDetail = Db.Queryable<BllArrivalNoticeDetail>().First(a => a.IsDel == "0" && a.Id == item.ASNDetailNo);
                    if (info != null)
                    {
                    if (!msgS.Contains(info.SkuNo))
                    {
                        msgS += info.SkuNo + ";";
@@ -763,6 +767,21 @@

                    }
                }
                    else
                    {
                        if (!msgS.Contains(noticeDetail.SkuNo))
                        {
                            msgS += noticeDetail.SkuNo + ";";
                        }

                        if (!msgL.Contains(noticeDetail.LotNo))
                        {
                            msgL += noticeDetail.LotNo + ";";

                        }
                    }
                    
                }
                var time = DateTime.Now;
                var log = new BllAuditLog()
                {