Merge branch 'master' of http://119.3.29.177:3000/Luy/NWeiWMS

WMS-BS/NFine.Application/WMS/PickMaterialApp.cs

@@ -815,9 +815,9 @@ where a.IssueCode='{0}' and a.WorkPoint='{1}'";
                             c.InvUnit,
 	                        FLOOR(c.iQuantity) AS iQuantity,
 	                        d.WarehouseCode,
-	                        d.LocationCode,
 	                        m.LotNO,
 	                        (case when m.LotNo is null then 0 else FLOOR(ISNULL(d.Quantity, 0)) end) AS QTY,
+                            (case when m.LotNo is null then null else d.LocationCode end) AS LocationCode,
 	                        CONVERT(varchar(100),d.MTIME, 23) MTIME,
 	                        FLOOR(f.QTYTotal) QTYTotal  INTO #temp 
                         FROM