diff --git a/WMS-BS/NFine.Application/WMS/PickMaterialApp.cs b/WMS-BS/NFine.Application/WMS/PickMaterialApp.cs
index 49fbb15..54e749d 100644
--- a/WMS-BS/NFine.Application/WMS/PickMaterialApp.cs
+++ b/WMS-BS/NFine.Application/WMS/PickMaterialApp.cs
@@ -365,7 +365,7 @@ where a.IssueCode='{0}' and a.WorkPoint='{1}'";
             left join ICSInventory d on a.InvCode=d.InvCode and a.WorkPoint=d.WorkPoint
             left join ICSMOPickMerge e on a.ID=e.SourceID and a.WorkPoint=e.WorkPoint
 	left join ICSExtension f on a.ExtensionID=f.ID and a.WorkPoint=f.WorkPoint  
-            where a.ApplyCode='{0}'  and  b.WorkPoint='{1}'";
+            where a.ApplyCode='{0}'  and  a.WorkPoint='{1}'";
             sql = string.Format(sql, Code, WorkPoint);
             return Repository().FindTableBySql(sql.ToString());
         }
@@ -441,7 +441,7 @@ where a.IssueCode='{0}' and a.WorkPoint='{1}'";
 							left join ICSInventory d on a.InvCode=d.InvCode and a.WorkPoint=d.WorkPoint
 							left join ICSMOPickMerge e on a.ID=e.SourceID and a.WorkPoint=e.WorkPoint
 	left join ICSExtension f on a.ExtensionID=f.ID and a.WorkPoint=f.WorkPoint  
-            where a.IssueCode='{0}'  and  b.WorkPoint='{1}'";
+            where a.IssueCode='{0}'  and  a.WorkPoint='{1}'";
             sql = string.Format(sql, Code, WorkPoint);
             return Repository().FindTableBySql(sql.ToString());
         }
@@ -511,7 +511,7 @@ where a.IssueCode='{0}' and a.WorkPoint='{1}'";
 							left join ICSInventory d on a.InvCode=d.InvCode and a.WorkPoint=d.WorkPoint
 							left join ICSMOPickMerge e on a.ID=e.SourceID and a.WorkPoint=e.WorkPoint
 	left join ICSExtension f on a.ExtensionID=f.ID and a.WorkPoint=f.WorkPoint  
-            where a.SDNCode='{0}'  and  b.WorkPoint='{1}'";
+            where a.SDNCode='{0}'  and  a.WorkPoint='{1}'";
             sql = string.Format(sql, Code, WorkPoint);
             return Repository().FindTableBySql(sql.ToString());
         }
@@ -582,7 +582,7 @@ where a.IssueCode='{0}' and a.WorkPoint='{1}'";
 							left join ICSInventory d on a.InvCode=d.InvCode and a.WorkPoint=d.WorkPoint
 							left join ICSMOPickMerge e on a.ID=e.SourceID and a.WorkPoint=e.WorkPoint
 	left join ICSExtension f on a.ExtensionID=f.ID and a.WorkPoint=f.WorkPoint  
-            where a.OutCode='{0}'  and  b.WorkPoint='{1}'";
+            where a.OutCode='{0}'  and  a.WorkPoint='{1}'";
             sql = string.Format(sql, Code, WorkPoint);
             return Repository().FindTableBySql(sql.ToString());
         }
@@ -656,7 +656,7 @@ where a.IssueCode='{0}' and a.WorkPoint='{1}'";
 							left join ICSInventory d on a.InvCode=d.InvCode and a.WorkPoint=d.WorkPoint
 							left join ICSMOPickMerge e on a.ID=e.SourceID and a.WorkPoint=e.WorkPoint
 	left join ICSExtension f on a.ExtensionID=f.ID and a.WorkPoint=f.WorkPoint  
-            where a.BrrowCode='{0}'  and  b.WorkPoint='{1}'";
+            where a.BrrowCode='{0}'  and  a.WorkPoint='{1}'";
             sql = string.Format(sql, Code, WorkPoint);
             return Repository().FindTableBySql(sql.ToString());
         }
@@ -794,7 +794,7 @@ where a.IssueCode='{0}' and a.WorkPoint='{1}'";
 							left join ICSInventory d on a.InvCode=d.InvCode and a.WorkPoint=d.WorkPoint
 							left join ICSMOPickMerge e on a.ID=e.SourceID and a.WorkPoint=e.WorkPoint
 	left join ICSExtension f on a.ExtensionID=f.ID and a.WorkPoint=f.WorkPoint  
-            where a.OutCode='{0}'  and  b.WorkPoint='{1}'";
+            where a.OutCode='{0}'  and  a.WorkPoint='{1}'";
             sql = string.Format(sql, Code, WorkPoint);
             return Repository().FindTableBySql(sql.ToString());
         }
@@ -900,7 +900,7 @@ b.InvUnit,
 	                        a.InvCode,
 	                        b.InvName,
 	                        b.InvStd,
-b.InvUnit,
+                            b.InvUnit,
 	                        SUM(ISNULL(a.Quantity, 0)) AS iQuantity,
 	                        a.WhCode,
 							a.ExtensionID
@@ -938,7 +938,7 @@ b.InvUnit,
 	                        a.InvCode,
 	                        b.InvName,
 	                        b.InvStd,
-b.InvUnit,
+                            b.InvUnit,
 	                        SUM(ISNULL(a.Quantity, 0)) AS iQuantity,
 	                        a.WhCode,
 													a.ExtensionID