Epost.DAL/OrdersQueueDAL.cs

@@ -211,11 +211,11 @@ namespace Epost.DAL
         #endregion
 
         #region 获取sku是否正在作业
-        public DataTable GetOrderQueue(string block,string area,string state)
+        public DataTable GetOrderQueue(string block,string area,string state,string sku)
         {
-            string sql = string.Format("select * from  OrdersQueue where state ='{0}' and taskblock='{1}' and taskarea='{2}'",
+            string sql = string.Format("select * from  OrdersQueue where state ='{0}' or (state = 1 and sku='{3}') and taskblock='{1}' and taskarea='{2}'",
                state,
-               block,area);
+               block,area,sku);
             LogHelper.WriteLogInfo("获取sku是否正在作业" + sql);
             return db.GetsqlForDT(sql);