Merge branch 'wxw'

wxw

9 小时以前 f3a9a3ad429d86028c884e3476dc0badcd8da966

 Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs

@@ -3034,7 +3034,7 @@
                    foreach (var item in list)
                    {
                        var outModeLocate = "";
                        if (outMode == "1")
                        if (outMode == "17")
                        {
                            if (i < outLocatelist1.Count)
                            {
@@ -3043,11 +3043,11 @@
                            else
                            {
                                var j = i % outLocatelist1.Count;
                                

                                outModeLocate = outLocatelist1[j].LocatNo;
                            }
                        }
                        else if(outMode == "2")
                        else if (outMode == "18")
                        {
                            if (i < outLocatelist1.Count)
                            {
@@ -3060,6 +3060,10 @@
                                outModeLocate = outLocatelist2[j].LocatNo;
                            }
                        }
                        else
                        {
                            throw new Exception("出库口工位异常");
                        }
                        
                        var taskNoStr = "";