Merge branch 'yyk'

yyk

2024-08-29 2a9bf520f65e85777fff0f20f4c84ba9a810eef5

 Wms/WMS.BLL/DataServer/StockServer.cs

@@ -581,7 +581,7 @@
            try
            {
                string str = "select* from SysMaterials where SkuNo in (select a.SkuNo from BllArrivalNoticeDetail a " +
                    "inner join BllExportNoticeDetail b on a.SkuNo = b.SkuNo";
                    "left join BllExportNoticeDetail b on a.SkuNo = b.SkuNo";

                //判断开始时间是否为空
                if (!string.IsNullOrWhiteSpace(StartTime))