Merge branch 'master' into yyk

yyk

2024-07-18 bf1a9a818ffb721aea2709e9409fbb932b07e81d

 Wms/WMS.BLL/BllSoServer/ExportNoticeDetailServer.cs

@@ -26,8 +26,6 @@
        }
        public async Task<List<ExportNoticeDetailDto>> GetExportNoticeDetailList(GetExportNoticeDetailVm model, RefAsync<int> count)
        {
            try
            {
                if (string.IsNullOrWhiteSpace(model.SoNo))
                {
                    throw new Exception("出库单号为空");
@@ -66,6 +64,7 @@
                        SupplierLot = a.SupplierLot,
                        IsWave = a.IsWave,
                        WaveNo = a.WaveNo,
                    IsMixBox = a.IsMixBox,

                        CreateUserName = c.RealName,
                        UpdateUserName = d.RealName,
@@ -74,11 +73,6 @@
                    }).ToPageListAsync(model.Page, model.Limit, count);

                return data;
            }
            catch (Exception e)
            {
                throw new Exception(e.Message);
            }
        }

        public bool DelExportNoticeDetail(int id, int userId)