diff --git a/B3_QiLianMuGe.Web/Pages/B3_QiLianMuGe/Dialogs/QueryBarCode.cs b/B3_QiLianMuGe.Web/Pages/B3_QiLianMuGe/Dialogs/QueryBarCode.cs
index 1fc60b4..1f75bc2 100644
--- a/B3_QiLianMuGe.Web/Pages/B3_QiLianMuGe/Dialogs/QueryBarCode.cs
+++ b/B3_QiLianMuGe.Web/Pages/B3_QiLianMuGe/Dialogs/QueryBarCode.cs
@@ -42,11 +42,9 @@ namespace BWP.Web.Pages.B3_QiLianMuGe.Dialogs
 
     protected override void CreateQuery(VLayoutPanel vPanel)
     {
-      var layoutManager = new LayoutManager("", mDFInfo, mQueryContainer);
-      //layoutManager.Add("GoodsPropertyCatalog_ID");
-      //layoutManager["GoodsPropertyCatalog_ID"].ExtDmoType = typeof(GoodsProperty);
-      layoutManager.Add("ScanTime", new SimpleLabel("扫描时间"), QueryCreator.TimeRange(mDFInfo.Fields["ScanTime"],mQueryContainer, "MinScanTime", "MaxScanTime"));
-      layoutManager.Add("UploadTime", new SimpleLabel("上传时间"), QueryCreator.TimeRange(mDFInfo.Fields["UploadTime"], mQueryContainer, "MinUploadTime", "MaxUploadTime"));
+      var layoutManager = new LayoutManager("main", mDFInfo, mQueryContainer);
+      layoutManager.Add("ScanTime", QueryCreator.TimeRange(mDFInfo.Fields["ScanTime"],mQueryContainer, "MinScanTime", "MaxScanTime"));
+      layoutManager.Add("UploadTime", QueryCreator.TimeRange(mDFInfo.Fields["UploadTime"], mQueryContainer, "MinUploadTime", "MaxUploadTime"));
       var config = new AutoLayoutConfig();
       config.Add("BarCode");
       config.Add("ScanTime");
@@ -92,6 +90,8 @@ namespace BWP.Web.Pages.B3_QiLianMuGe.Dialogs
       query.Columns.Add(DQSelectColumn.Field("SecondUnit", goods));
       query.Columns.Add(DQSelectColumn.Create(DQExpression.LogicCase(DQCondition.IsNull(DQExpression.Field(goods, "PackageWeight")),DQExpression.Sum(DQExpression.Field(rightBarCode,"Weight")), DQExpression.Field(goods, "PackageWeight")), "PWeight"));
       query.Columns.Add(DQSelectColumn.Create(DQExpression.Count(DQExpression.Field(rightBarCode,"ID")), "Num"));
+      query.Where.Conditions.Add(DQCondition.Or(DQCondition.IsNull(DQExpression.Field(barCode,"IsOpen")),DQCondition.EQ(barCode,"IsOpen",false)));
+      query.Where.Conditions.Add(DQCondition.IsNull(DQExpression.Field(barCode, "PickTime")));
       if (!string.IsNullOrEmpty(Request.QueryString["Store_ID"]))
       {
         query.Where.Conditions.Add(DQCondition.Like(barCode, "Store_ID", Request.QueryString["Store_ID"]));
@@ -143,6 +143,10 @@ namespace BWP.Web.Pages.B3_QiLianMuGe.Dialogs
       query2.Columns.Add(DQSelectColumn.Field("SecondUnit", goods2));
       query2.Columns.Add(DQSelectColumn.Field("Weight", barCode2, "PWeight"));
       query2.Columns.Add(DQSelectColumn.Create(DQExpression.Snippet<int>("1"), "Num"));
+      query2.Where.Conditions.Add(DQCondition.IsNull(DQExpression.Field(barCode2,"PackageID")));
+      query2.Where.Conditions.Add(DQCondition.IsNotNull(DQExpression.Field(barCode2, "InStoreTime")));
+      query2.Where.Conditions.Add(DQCondition.IsNull(DQExpression.Field(barCode2, "PickTime")));
+      
       if (!txtbarCode.IsEmpty)
       {
         query2.Where.Conditions.Add(DQCondition.Like(ceBarCode2, "BarCode", txtbarCode.Text));
diff --git a/B3_QiLianMuGe.Web/Pages/B3_QiLianMuGe/Dialogs/QueryBarCode.xml b/B3_QiLianMuGe.Web/Pages/B3_QiLianMuGe/Dialogs/QueryBarCode.xml
index 917f5cb..8ee3afd 100644
--- a/B3_QiLianMuGe.Web/Pages/B3_QiLianMuGe/Dialogs/QueryBarCode.xml
+++ b/B3_QiLianMuGe.Web/Pages/B3_QiLianMuGe/Dialogs/QueryBarCode.xml
@@ -8,7 +8,7 @@
   </From>
   <Where>
     <And>
-      <GreaterThanOrEqual>
+      <!--<GreaterThanOrEqual>
         <Field name="ScanTime"/>
         <QBE paramName="MinScanTime" />
       </GreaterThanOrEqual>
@@ -27,7 +27,7 @@
       <Contains>
         <Field name="BarCode"/>
         <QBE paramName="BarCode"/>
-      </Contains>
+      </Contains>-->
     </And>
   </Where>
 </Select>