diff --git a/Model/base/BaseOperModel_Imp.cs b/Model/base/BaseOperModel_Imp.cs
index 06afdd9..ee9237a 100644
--- a/Model/base/BaseOperModel_Imp.cs
+++ b/Model/base/BaseOperModel_Imp.cs
@@ -6,6 +6,7 @@ namespace DeiNiu.Data.BaseObject
     [Serializable]
     public class BaseOperModel_Imp  
     {
+        protected static log4net.ILog log = log4net.LogManager.GetLogger("logCommon");
         public BaseOperModel_Imp()
         {
             
diff --git a/Model/wms/data/WmsOutPickRequest_Imp.cs b/Model/wms/data/WmsOutPickRequest_Imp.cs
index 4f6971d..6f979ca 100644
--- a/Model/wms/data/WmsOutPickRequest_Imp.cs
+++ b/Model/wms/data/WmsOutPickRequest_Imp.cs
@@ -188,7 +188,7 @@ namespace DeiNiu.wms.Data.Model
                     
                     _strSql = "SELECT  TOP (@cnt) *  FROM [t_wmsOutPickRequest] r  where exists("
                         + _strSql + ") order by priority desc";
-
+                    log.Debug(_strSql);
                     //_strSql += " order by pickOrderNo;";
                     sqlCmd.CommandText = _strSql;
                     //sqlCmd.Parameters.AddWithValue("@cnt", WmsConstants.PAGER_SIZE/2);
diff --git a/Utils/WmsConstants.cs b/Utils/WmsConstants.cs
index f758f92..9a4f199 100644
--- a/Utils/WmsConstants.cs
+++ b/Utils/WmsConstants.cs
@@ -181,7 +181,7 @@ namespace DeiNiu.Utils
         public static string PRINTER_NAME_PIN = "HP LaserJet Professional P1106";
 
         public static string LIGHT_COM_1 = "com1";
-
+        public static string LIGHT_COM_2 = "com1";
 
 
 
diff --git a/WcfService1/BLL/lWmsOutPickRequest.cs b/WcfService1/BLL/lWmsOutPickRequest.cs
index d4f587d..a45ba26 100644
--- a/WcfService1/BLL/lWmsOutPickRequest.cs
+++ b/WcfService1/BLL/lWmsOutPickRequest.cs
@@ -264,7 +264,7 @@ namespace DeiNiu.wms.Logical
        // }
 
         //static Dictionary<int, List<int>> comLables = new Dictionary<int, List<int>>();
-        static List<int> lblist = new List<int>();
+        static List<int> TESTlblist = new List<int>();
         static Dictionary<int, int> comLables = new Dictionary<int,int>();
        
         void initialDebugSetting()
@@ -277,7 +277,7 @@ namespace DeiNiu.wms.Logical
 
                 if (!node.isOn)
                 {
-                    continue;
+                  //  continue;
                 }
                 try
                 {
@@ -285,8 +285,8 @@ namespace DeiNiu.wms.Logical
                     string[] lbs = labels.Split(',');
                     foreach (string s in lbs)
                     {
-                        comLables[ Convert.ToInt32(s.Trim())] =  Convert.ToInt32(node.name.Trim());
-                        lblist.Add( Convert.ToInt32(s.Trim()));
+                        comLables[ Convert.ToInt32(s.Trim())] =  Convert.ToInt32(node.value.Trim());
+                        TESTlblist.Add( Convert.ToInt32(s.Trim()));
                     }
                 }
                 catch
@@ -296,8 +296,6 @@ namespace DeiNiu.wms.Logical
                  
             }
 
- 
-
         }
 
         private string waveOrder ="";
@@ -330,7 +328,7 @@ namespace DeiNiu.wms.Logical
 
             //一个波次可以摘取订单数 =   空闲分播台数量*每个分播台可分播客户数， 分播台的订单用颜色区分
 
-
+            loglw.Debug("start new wave ....");
 
             bool isSeedsEnabled = WmsConstants.OUT_BULK_SEEDS_PICK_ON;
           
@@ -350,11 +348,13 @@ namespace DeiNiu.wms.Logical
                    
                     if (seedsDesk.ID == 0)
                     {
+                        loglw.Debug("no free desk ");
                         return;
                     }
                 }
                 else
                 {
+                    loglw.Debug("no free desk ");
                     return;
                 }
             }
@@ -393,7 +393,8 @@ namespace DeiNiu.wms.Logical
             {
                 WmsOutPickRequest wo = new WmsOutPickRequest(order);
                 wo.seedsLabelId = 0;
-                requests.Add(wo);
+                // requests.Add(wo);
+                loglw.Debug("等待播种订单转入摘果" + order);
             }
 
             foreach (DataRow dr in dtOne.Rows) //摘果订单
@@ -418,17 +419,17 @@ namespace DeiNiu.wms.Logical
           
             int labelMaxInWave = WmsConstants.MAX_LABEL_DATA_IN_A_WAVE; //一个标签一个波次只能存储40条数据         
 
-#if DEBUG
+//#if DEBUG
             // if (lblist.Count == 0)
             {
-                lblist.Clear();
+                TESTlblist.Clear();
                 initialDebugSetting();
             }
-            lblist.Sort();
+            TESTlblist.Sort();
             //  int minId = lblist[0];
             //    int maxId = lblist[lblist.Count - 1];
             // labelMaxInWave = 2;
-#endif
+//#endif
 
 
             // List<WmsStockRecord> strecs = null;
@@ -582,23 +583,23 @@ namespace DeiNiu.wms.Logical
                     {
                         sr.count = Convert.ToDecimal(drv["count"].ToString());
                     }
-#if DEBUG
-                    if (lblist.Count > 0)
+//#if DEBUG
+                    if (TESTlblist.Count > 0)
                     {
-                        int id = new Random().Next(lblist.Count);
+                        int id = new Random().Next(TESTlblist.Count);
                         //#if DEBUG
-                        sr.location.elabId = lblist[id]; //new Random().Next(minId, maxId + 1); //测试。。。随机分配标签id 为 1-3
+                        sr.location.elabId = TESTlblist[id]; //new Random().Next(minId, maxId + 1); //测试。。。随机分配标签id 为 1-3
 
-                        while (lblist.Count > 1 && lastId == sr.location.elabId)
+                        while (TESTlblist.Count > 1 && lastId == sr.location.elabId)
                         {
-                            id = new Random().Next(lblist.Count);
-                            sr.location.elabId = lblist[id];
+                            id = new Random().Next(TESTlblist.Count);
+                            sr.location.elabId = TESTlblist[id];
                         }
 
                         lastId = sr.location.elabId;
                         //#endif
                     }
-#endif
+//#endif
                     sumBulkCnt += sr.count;
                     lstBulk.Add(sr);
 
@@ -962,7 +963,8 @@ namespace DeiNiu.wms.Logical
                                 if (dte > System.DateTime.Now)
                                 {
                                     seedsWaiting.Remove(pr.pickOrderNo);
-                                    noSeeds.Add(pr.pickOrderNo);
+                                    if(!noSeeds.Contains(pr.pickOrderNo))
+                                         noSeeds.Add(pr.pickOrderNo);
                                     loglw.Debug( String.Format("pr {0} waited {1},noseeds marked", pr.pickOrderNo, dte.CompareTo(DateTime.Now)));
 
                                 }
@@ -4637,17 +4639,17 @@ namespace DeiNiu.wms.Logical
         
             int labelMaxInWave = WmsConstants.MAX_LABEL_DATA_IN_A_WAVE; //一个标签一个波次只能存储40条数据         
 
-             #if DEBUG
+             //#if DEBUG
             // if (lblist.Count == 0)
             {
-                lblist.Clear();
+                TESTlblist.Clear();
                 initialDebugSetting();
             }
-            lblist.Sort();
+            TESTlblist.Sort();
             //  int minId = lblist[0];
             //    int maxId = lblist[lblist.Count - 1];
             // labelMaxInWave = 2;
-            #endif
+           // #endif
 
 
             // List<WmsStockRecord> strecs = null;
@@ -4723,20 +4725,20 @@ namespace DeiNiu.wms.Logical
             foreach( WmsStockRecord rec in lstBulk)
             {
 
-                 if (lblist.Count > 0) 
+                 if (TESTlblist.Count > 0) 
                  {
-                    int id = new Random().Next(lblist.Count);
-                    #if DEBUG
-                    rec.location.elabId = lblist[id]; //new Random().Next(minId, maxId + 1); //测试。。。随机分配标签id 为 1-3
+                    int id = new Random().Next(TESTlblist.Count);
+                 //  #if DEBUG
+                    rec.location.elabId = TESTlblist[id]; //new Random().Next(minId, maxId + 1); //测试。。。随机分配标签id 为 1-3
 
-                    while (lblist.Count > 1 && lastId == rec.location.elabId)
+                    while (TESTlblist.Count > 1 && lastId == rec.location.elabId)
                     {
-                        id = new Random().Next(lblist.Count);
-                        rec.location.elabId = lblist[id];
+                        id = new Random().Next(TESTlblist.Count);
+                        rec.location.elabId = TESTlblist[id];
                     }
 
                     lastId = rec.location.elabId;
-                        #endif
+                 //       #endif
                  }
 
                 //建立零库电子拣选临时数据  
@@ -4996,10 +4998,10 @@ namespace DeiNiu.wms.Logical
             //#if DEBUG
             // if (lblist.Count == 0)
             {
-                lblist.Clear();
+                TESTlblist.Clear();
                 initialDebugSetting();
             }
-            lblist.Sort();
+            TESTlblist.Sort();
             //  int minId = lblist[0];
             //    int maxId = lblist[lblist.Count - 1];
             // labelMaxInWave = 2;
@@ -5448,8 +5450,8 @@ namespace DeiNiu.wms.Logical
               
                 if (comLables.Count > 0)
                 {
-                    int id = new Random().Next(lblist.Count); 
-                    wpl.elabId = lblist[id];
+                    int id = new Random().Next(TESTlblist.Count); 
+                    wpl.elabId = TESTlblist[id];
                     wpl.port = comLables[wpl.elabId];
                     
                    
diff --git a/WcfService1/Log4Net.config b/WcfService1/Log4Net.config
index 6e8c2de..6c76715 100644
--- a/WcfService1/Log4Net.config
+++ b/WcfService1/Log4Net.config
@@ -40,7 +40,7 @@
 			<appender-ref ref="lightWaveAppender"/>
 		</logger>
 		<appender name="lightWaveAppender" type="log4net.Appender.RollingFileAppender">
-			<file value="/log/wms/lightWave.log" />
+			<file value="/medicine/log/wms/lightWave.log" />
 			<!--file可以指定具体的路径 eg : d:\\test.log。不指定的话log被生成在项目的bin/Debug 或者 bin/Release目录下 （web的项目 默认生成在根目录下）-->
 			<appendToFile value="true" />
 			<rollingStyle value="Size" />
@@ -57,7 +57,7 @@
 		
 		
 		<appender name="testAppender" type="log4net.Appender.RollingFileAppender">
-			<file value="/log/wms/test/test.log" />
+			<file value="/medicine/log/wms/test/test.log" />
 			<!--file可以指定具体的路径 eg : d:\\test.log。不指定的话log被生成在项目的bin/Debug 或者 bin/Release目录下 （web的项目 默认生成在根目录下）-->
 			<appendToFile value="true" />
 			<rollingStyle value="Size" />
@@ -72,7 +72,7 @@
 			</layout>
 		</appender>
 		<appender name="testError" type="log4net.Appender.RollingFileAppender">
-			<file value="/log/wms/testError.log" />
+			<file value="/medicine/log/wms/testError.log" />
 			<!--file可以指定具体的路径 eg : d:\\test.log。不指定的话log被生成在项目的bin/Debug 或者 bin/Release目录下 （web的项目 默认生成在根目录下）-->
 			<appendToFile value="true" />
 			<rollingStyle value="Size" />
@@ -92,7 +92,7 @@
 		</appender>
 
 		<appender name="errorApperder" type="log4net.Appender.RollingFileAppender">
-			<file value="/log/wms/error.log" />
+			<file value="/medicine/log/wms/error.log" />
 			<!--file可以指定具体的路径 eg : d:\\test.log。不指定的话log被生成在项目的bin/Debug 或者 bin/Release目录下 （web的项目 默认生成在根目录下）-->
 			<appendToFile value="true" />
 			<rollingStyle value="Size" />
@@ -111,7 +111,7 @@
 			</filter>
 		</appender>
 		<appender name="SpecialAppender" type="log4net.Appender.RollingFileAppender">
-			<file value="/log/wms/spec/special.log" />
+			<file value="/medicine/log/wms/spec/special.log" />
 			<!--file可以指定具体的路径 eg : d:\\test.log。不指定的话log被生成在项目的bin/Debug 或者 bin/Release目录下 （web的项目 默认生成在根目录下）-->
 			<appendToFile value="true" />
 			<rollingStyle value="Size" />
@@ -126,7 +126,7 @@
 			</layout>
 		</appender>
 		<appender name="CommonAppender" type="log4net.Appender.RollingFileAppender">
-			<file value="/log/wms/common.log" />
+			<file value="/medicine/log/wms/common.log" />
 			<!--file可以指定具体的路径 eg : d:\\test.log。不指定的话log被生成在项目的bin/Debug 或者 bin/Release目录下 （web的项目 默认生成在根目录下）-->
 			<appendToFile value="true" />
 			<rollingStyle value="Size" />
@@ -142,7 +142,7 @@
 		</appender>
 
 		<appender name="InAppender" type="log4net.Appender.RollingFileAppender">
-			<file value="/log/wms/stockIn/stockIn.log" />
+			<file value="/medicine/log/wms/stockIn/stockIn.log" />
 			<!--file可以指定具体的路径 eg : d:\\test.log。不指定的话log被生成在项目的bin/Debug 或者 bin/Release目录下 （web的项目 默认生成在根目录下）-->
 			<appendToFile value="true" />
 			<rollingStyle value="Size" />
@@ -158,7 +158,7 @@
 		</appender>
 
 		<appender name="OutAppender" type="log4net.Appender.RollingFileAppender">
-			<file value="/log/wms/stockOut/stockOut.log" />
+			<file value="/medicine/log/wms/stockOut/stockOut.log" />
 			<!--file可以指定具体的路径 eg : d:\\test.log。不指定的话log被生成在项目的bin/Debug 或者 bin/Release目录下 （web的项目 默认生成在根目录下）-->
 			<appendToFile value="true" />
 			<rollingStyle value="Size" />
@@ -173,7 +173,7 @@
 			</layout>
 		</appender>
 		<appender name="ERPAppender" type="log4net.Appender.RollingFileAppender">
-			<file value="/log/wms/stockOut/ERP.log" />
+			<file value="/medicine/log/wms/stockOut/ERP.log" />
 			<!--file可以指定具体的路径 eg : d:\\test.log。不指定的话log被生成在项目的bin/Debug 或者 bin/Release目录下 （web的项目 默认生成在根目录下）-->
 			<appendToFile value="true" />
 			<rollingStyle value="Size" />
diff --git a/WcfService1/Properties/PublishProfiles/IISProfile1.pubxml.user b/WcfService1/Properties/PublishProfiles/IISProfile1.pubxml.user
index dcc8081..ccd7d9d 100644
--- a/WcfService1/Properties/PublishProfiles/IISProfile1.pubxml.user
+++ b/WcfService1/Properties/PublishProfiles/IISProfile1.pubxml.user
@@ -7,7 +7,7 @@
   <PropertyGroup>
     <TimeStampOfAssociatedLegacyPublishXmlFile />
     <EncryptedPassword />
-    <History>True|2024-11-03T13:34:43.5638618Z||;True|2024-11-03T18:48:46.3810583+08:00||;True|2024-11-03T18:33:09.1693025+08:00||;True|2024-11-03T18:07:14.9554943+08:00||;True|2024-11-03T17:33:33.9400438+08:00||;True|2024-11-03T15:57:22.7762130+08:00||;True|2024-11-03T13:42:26.2482526+08:00||;False|2024-11-03T13:42:08.2682676+08:00||;True|2024-11-02T20:34:37.6850648+08:00||;True|2024-11-02T20:33:22.3223896+08:00||;True|2024-11-02T19:45:31.8188247+08:00||;True|2024-11-02T18:39:44.9569699+08:00||;True|2024-11-02T18:34:57.3571628+08:00||;True|2024-11-01T22:49:02.9367010+08:00||;True|2024-11-01T10:04:21.3678006+08:00||;True|2024-11-01T10:03:01.3411346+08:00||;True|2024-11-01T09:44:00.7350827+08:00||;True|2024-11-01T09:12:32.0665339+08:00||;True|2024-10-31T19:45:04.7206262+08:00||;True|2024-10-31T18:23:12.1224608+08:00||;True|2024-10-31T18:12:20.0817368+08:00||;True|2024-10-31T13:17:42.3078407+08:00||;True|2024-10-31T13:02:30.9943804+08:00||;True|2024-10-31T12:10:37.8182773+08:00||;True|2024-10-31T11:33:30.5543070+08:00||;True|2024-10-31T00:18:42.4972597+08:00||;True|2024-10-30T22:38:53.0134018+08:00||;True|2024-10-30T20:40:18.0941869+08:00||;True|2024-10-30T20:12:15.2067911+08:00||;True|2024-10-30T19:13:17.7390813+08:00||;True|2024-10-30T12:56:46.8481080+08:00||;True|2024-10-30T12:35:52.6493094+08:00||;True|2024-10-30T11:22:33.1999170+08:00||;True|2024-10-29T20:05:23.8279373+08:00||;True|2024-10-29T20:02:38.2307412+08:00||;True|2024-10-10T11:24:12.7545755+08:00||;True|2024-10-09T12:06:40.7152367+08:00||;True|2024-05-27T10:56:59.0680190+08:00||;True|2024-04-16T15:21:29.2941280+08:00||;True|2024-04-13T08:25:11.6297414+08:00||;True|2024-04-12T21:14:14.3762458+08:00||;True|2024-04-12T20:59:04.3716416+08:00||;True|2024-04-12T20:58:10.9181928+08:00||;True|2024-04-12T20:57:19.3920429+08:00||;True|2024-04-12T17:05:38.8579277+08:00||;True|2024-04-12T16:59:27.1357133+08:00||;True|2024-04-12T16:15:01.3100281+08:00||;True|2024-04-12T16:14:40.1163395+08:00||;True|2024-04-11T19:33:13.0403449+08:00||;True|2024-04-11T19:00:16.9572092+08:00||;True|2024-04-11T18:16:37.3809917+08:00||;True|2024-04-11T15:28:45.6815845+08:00||;True|2024-04-11T15:26:29.8024648+08:00||;True|2024-04-11T11:15:58.5104690+08:00||;True|2024-04-11T09:19:02.5048679+08:00||;True|2024-04-10T20:36:42.3021582+08:00||;True|2024-04-10T20:13:08.6915913+08:00||;True|2024-04-10T15:17:58.1748530+08:00||;True|2024-04-09T08:41:20.5238496+08:00||;True|2024-04-08T23:00:50.8373975+08:00||;True|2024-04-08T15:59:58.6130543+08:00||;True|2024-04-08T15:59:38.9278010+08:00||;True|2024-04-08T10:07:10.2128467+08:00||;True|2024-04-08T10:06:25.4395457+08:00||;True|2024-04-05T16:16:05.9765142+08:00||;True|2024-04-03T16:50:37.2989554+08:00||;True|2024-04-03T16:50:15.1099921+08:00||;True|2024-04-01T16:50:03.7331925+08:00||;True|2024-04-01T16:46:10.4004854+08:00||;True|2024-04-01T16:39:16.5382856+08:00||;True|2024-04-01T16:38:59.0060858+08:00||;False|2024-04-01T16:38:45.9060078+08:00||;True|2024-04-01T14:22:39.2007429+08:00||;True|2024-04-01T13:36:25.8859724+08:00||;True|2024-04-01T09:45:29.0972587+08:00||;True|2024-04-01T09:44:56.4382067+08:00||;True|2024-03-31T15:45:08.9316183+08:00||;True|2024-03-30T23:21:11.1074338+08:00||;True|2024-03-30T23:16:19.4987497+08:00||;True|2024-03-30T22:29:01.0587645+08:00||;True|2024-03-30T22:27:50.4331636+08:00||;True|2024-03-29T13:20:54.5697685+08:00||;True|2024-03-28T09:07:05.2532582+08:00||;True|2024-03-28T09:01:27.4300633+08:00||;True|2024-03-27T16:32:37.1048143+08:00||;True|2024-03-27T11:10:17.8351527+08:00||;True|2024-03-27T11:09:08.3753820+08:00||;True|2024-03-27T10:55:29.4411823+08:00||;True|2024-03-27T10:30:30.1003703+08:00||;True|2024-03-26T23:12:32.2851963+08:00||;True|2024-03-26T17:37:31.4980906+08:00||;True|2024-03-26T12:51:33.1688124+08:00||;True|2024-03-26T12:50:01.8312458+08:00||;True|2024-03-26T11:32:27.2914592+08:00||;True|2024-03-26T10:55:10.6157670+08:00||;True|2024-03-26T00:10:16.7867504+08:00||;True|2024-03-25T23:54:59.2520542+08:00||;True|2024-03-25T23:40:48.6273997+08:00||;True|2024-03-25T21:07:51.4682972+08:00||;True|2024-03-25T12:01:50.4840464+08:00||;</History>
+    <History>True|2024-11-04T14:27:29.3756940Z||;True|2024-11-04T22:24:17.0651411+08:00||;True|2024-11-04T22:19:38.7879418+08:00||;True|2024-11-04T22:05:56.8271654+08:00||;True|2024-11-04T21:50:07.9758208+08:00||;True|2024-11-04T21:18:16.9346004+08:00||;True|2024-11-04T10:58:22.6037381+08:00||;True|2024-11-03T21:34:43.5638618+08:00||;True|2024-11-03T18:48:46.3810583+08:00||;True|2024-11-03T18:33:09.1693025+08:00||;True|2024-11-03T18:07:14.9554943+08:00||;True|2024-11-03T17:33:33.9400438+08:00||;True|2024-11-03T15:57:22.7762130+08:00||;True|2024-11-03T13:42:26.2482526+08:00||;False|2024-11-03T13:42:08.2682676+08:00||;True|2024-11-02T20:34:37.6850648+08:00||;True|2024-11-02T20:33:22.3223896+08:00||;True|2024-11-02T19:45:31.8188247+08:00||;True|2024-11-02T18:39:44.9569699+08:00||;True|2024-11-02T18:34:57.3571628+08:00||;True|2024-11-01T22:49:02.9367010+08:00||;True|2024-11-01T10:04:21.3678006+08:00||;True|2024-11-01T10:03:01.3411346+08:00||;True|2024-11-01T09:44:00.7350827+08:00||;True|2024-11-01T09:12:32.0665339+08:00||;True|2024-10-31T19:45:04.7206262+08:00||;True|2024-10-31T18:23:12.1224608+08:00||;True|2024-10-31T18:12:20.0817368+08:00||;True|2024-10-31T13:17:42.3078407+08:00||;True|2024-10-31T13:02:30.9943804+08:00||;True|2024-10-31T12:10:37.8182773+08:00||;True|2024-10-31T11:33:30.5543070+08:00||;True|2024-10-31T00:18:42.4972597+08:00||;True|2024-10-30T22:38:53.0134018+08:00||;True|2024-10-30T20:40:18.0941869+08:00||;True|2024-10-30T20:12:15.2067911+08:00||;True|2024-10-30T19:13:17.7390813+08:00||;True|2024-10-30T12:56:46.8481080+08:00||;True|2024-10-30T12:35:52.6493094+08:00||;True|2024-10-30T11:22:33.1999170+08:00||;True|2024-10-29T20:05:23.8279373+08:00||;True|2024-10-29T20:02:38.2307412+08:00||;True|2024-10-10T11:24:12.7545755+08:00||;True|2024-10-09T12:06:40.7152367+08:00||;True|2024-05-27T10:56:59.0680190+08:00||;True|2024-04-16T15:21:29.2941280+08:00||;True|2024-04-13T08:25:11.6297414+08:00||;True|2024-04-12T21:14:14.3762458+08:00||;True|2024-04-12T20:59:04.3716416+08:00||;True|2024-04-12T20:58:10.9181928+08:00||;True|2024-04-12T20:57:19.3920429+08:00||;True|2024-04-12T17:05:38.8579277+08:00||;True|2024-04-12T16:59:27.1357133+08:00||;True|2024-04-12T16:15:01.3100281+08:00||;True|2024-04-12T16:14:40.1163395+08:00||;True|2024-04-11T19:33:13.0403449+08:00||;True|2024-04-11T19:00:16.9572092+08:00||;True|2024-04-11T18:16:37.3809917+08:00||;True|2024-04-11T15:28:45.6815845+08:00||;True|2024-04-11T15:26:29.8024648+08:00||;True|2024-04-11T11:15:58.5104690+08:00||;True|2024-04-11T09:19:02.5048679+08:00||;True|2024-04-10T20:36:42.3021582+08:00||;True|2024-04-10T20:13:08.6915913+08:00||;True|2024-04-10T15:17:58.1748530+08:00||;True|2024-04-09T08:41:20.5238496+08:00||;True|2024-04-08T23:00:50.8373975+08:00||;True|2024-04-08T15:59:58.6130543+08:00||;True|2024-04-08T15:59:38.9278010+08:00||;True|2024-04-08T10:07:10.2128467+08:00||;True|2024-04-08T10:06:25.4395457+08:00||;True|2024-04-05T16:16:05.9765142+08:00||;True|2024-04-03T16:50:37.2989554+08:00||;True|2024-04-03T16:50:15.1099921+08:00||;True|2024-04-01T16:50:03.7331925+08:00||;True|2024-04-01T16:46:10.4004854+08:00||;True|2024-04-01T16:39:16.5382856+08:00||;True|2024-04-01T16:38:59.0060858+08:00||;False|2024-04-01T16:38:45.9060078+08:00||;True|2024-04-01T14:22:39.2007429+08:00||;True|2024-04-01T13:36:25.8859724+08:00||;True|2024-04-01T09:45:29.0972587+08:00||;True|2024-04-01T09:44:56.4382067+08:00||;True|2024-03-31T15:45:08.9316183+08:00||;True|2024-03-30T23:21:11.1074338+08:00||;True|2024-03-30T23:16:19.4987497+08:00||;True|2024-03-30T22:29:01.0587645+08:00||;True|2024-03-30T22:27:50.4331636+08:00||;True|2024-03-29T13:20:54.5697685+08:00||;True|2024-03-28T09:07:05.2532582+08:00||;True|2024-03-28T09:01:27.4300633+08:00||;True|2024-03-27T16:32:37.1048143+08:00||;True|2024-03-27T11:10:17.8351527+08:00||;True|2024-03-27T11:09:08.3753820+08:00||;True|2024-03-27T10:55:29.4411823+08:00||;True|2024-03-27T10:30:30.1003703+08:00||;True|2024-03-26T23:12:32.2851963+08:00||;True|2024-03-26T17:37:31.4980906+08:00||;True|2024-03-26T12:51:33.1688124+08:00||;True|2024-03-26T12:50:01.8312458+08:00||;</History>
     <LastFailureDetails />
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/WcfService1/WmsOutPickRequestService.svc.cs b/WcfService1/WmsOutPickRequestService.svc.cs
index aff5af5..6d1562b 100644
--- a/WcfService1/WmsOutPickRequestService.svc.cs
+++ b/WcfService1/WmsOutPickRequestService.svc.cs
@@ -74,7 +74,7 @@ namespace DeiNiu.Wcf
         {
             if (isProcessWaveing)
             {
-                LogHelper.debug(typeof(WmsOutPickRequestService), "!!!!!!!!!!!!!!!!! new pick wave ... is processing... return ....");
+                log.Debug(  "!!!!!!!!!!!!!!!!! new pick wave ... is processing... return ....");
                 return;
             }
             isProcessWaveing = true;
@@ -90,7 +90,7 @@ namespace DeiNiu.Wcf
             }
             catch (Exception e)
             {
-                LogHelper.debug(typeof(WmsOutPickRequestService), "!!!!!!!!!!!!!!!!!Exception !!!!!" + e.Message);
+                log.Error(e );
                 LogHelper.debug(typeof(WmsOutPickRequestService), e.StackTrace);
                 throw e;
             }
diff --git a/WcfServicePortal/LAuthority.cs b/WcfServicePortal/LAuthority.cs
index d0b8477..38b621a 100644
--- a/WcfServicePortal/LAuthority.cs
+++ b/WcfServicePortal/LAuthority.cs
@@ -129,6 +129,7 @@ namespace DeiNiu.wms.Logical
       // public Dictionary<String, List<Authority>> getCatedAuthorities(int empId,int warehouse=-1)
         public Dictionary<String, List<Authority>> getCatedAuthorities(int empId,int warehouse=-1)
         {
+            
             Dictionary<String, List<Authority>> auths = new Dictionary<String, List<Authority>>();
 
            // DataView dv = new DataView(getAllActiveData().Tables[0]);
diff --git a/winform/Login.Designer.cs b/winform/Login.Designer.cs
index be551f2..6c8f01f 100644
--- a/winform/Login.Designer.cs
+++ b/winform/Login.Designer.cs
@@ -168,7 +168,7 @@
             // 
             // textEditHost
             // 
-            this.textEditHost.EditValue = "175.24.179.109:10003";
+            this.textEditHost.EditValue = "175.24.179.109:10006";
             this.textEditHost.Location = new System.Drawing.Point(13, 25);
             this.textEditHost.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.textEditHost.Name = "textEditHost";
diff --git a/winform/Login.resx b/winform/Login.resx
index 18823b0..be9c2d8 100644
--- a/winform/Login.resx
+++ b/winform/Login.resx
@@ -121,7 +121,7 @@
     <value>17, 17</value>
   </metadata>
   <metadata name="splashScreenManager1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>275, 17</value>
+    <value>274, 17</value>
   </metadata>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="barButtonItem1.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
diff --git a/winform/epick/SeedsOutService.cs b/winform/epick/SeedsOutService.cs
index 5677777..aa4ae93 100644
--- a/winform/epick/SeedsOutService.cs
+++ b/winform/epick/SeedsOutService.cs
@@ -1243,7 +1243,11 @@ namespace DeiNiu.wms.win
              col.BeginUpdate();
 
              oCom = System.Configuration.ConfigurationManager.AppSettings["Com"];
-             int oldIndex = 0;
+            if (string.IsNullOrEmpty(oCom))
+            {
+                oCom = WmsConstants.LIGHT_COM_2;
+            }
+            int oldIndex = 0;
              try
              {
 
diff --git a/winform/main.Designer.cs b/winform/main.Designer.cs
index 74a166b..8f35687 100644
--- a/winform/main.Designer.cs
+++ b/winform/main.Designer.cs
@@ -327,35 +327,35 @@
             this.lbcompany,
             this.toolStripSeparator2,
             this.lbVersion});
-            this.toolStrip1.Location = new System.Drawing.Point(188, 1303);
+            this.toolStrip1.Location = new System.Drawing.Point(188, 1316);
             this.toolStrip1.Name = "toolStrip1";
-            this.toolStrip1.Size = new System.Drawing.Size(1188, 38);
+            this.toolStrip1.Size = new System.Drawing.Size(1188, 25);
             this.toolStrip1.TabIndex = 3;
             this.toolStrip1.Text = "toolStrip1";
             // 
             // lbAccount
             // 
             this.lbAccount.Name = "lbAccount";
-            this.lbAccount.Size = new System.Drawing.Size(0, 33);
+            this.lbAccount.Size = new System.Drawing.Size(0, 20);
             // 
             // lbcompany
             // 
             this.lbcompany.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
             this.lbcompany.Name = "lbcompany";
-            this.lbcompany.Size = new System.Drawing.Size(243, 33);
+            this.lbcompany.Size = new System.Drawing.Size(243, 20);
             this.lbcompany.Text = "DeiNiuSoft Ltd. All Rights Reserved";
             // 
             // toolStripSeparator2
             // 
             this.toolStripSeparator2.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
             this.toolStripSeparator2.Name = "toolStripSeparator2";
-            this.toolStripSeparator2.Size = new System.Drawing.Size(6, 38);
+            this.toolStripSeparator2.Size = new System.Drawing.Size(6, 25);
             // 
             // lbVersion
             // 
             this.lbVersion.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
             this.lbVersion.Name = "lbVersion";
-            this.lbVersion.Size = new System.Drawing.Size(89, 33);
+            this.lbVersion.Size = new System.Drawing.Size(89, 20);
             this.lbVersion.Text = "wmsVersion";
             // 
             // main
@@ -374,7 +374,7 @@
             this.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.Name = "main";
             this.Ribbon = this.ribbonControl1;
-            this.Text = "";
+            this.Text = "得牛WMS";
             this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.main_FormClosing);
             this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.main_FormClosed);
             ((System.ComponentModel.ISupportInitialize)(this.dxValidationProvider1)).EndInit();
diff --git a/winform/main.resx b/winform/main.resx
index 5256798..b553202 100644
--- a/winform/main.resx
+++ b/winform/main.resx
@@ -121,7 +121,7 @@
     <value>17, 17</value>
   </metadata>
   <metadata name="splashScreenManager1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 64</value>
+    <value>274, 17</value>
   </metadata>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="barButtonItem1.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -368,13 +368,13 @@
 </value>
   </data>
   <metadata name="xtraTabbedMdiManager1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 111</value>
+    <value>539, 17</value>
   </metadata>
   <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>25</value>
   </metadata>
   <metadata name="toolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 252</value>
+    <value>1252, 17</value>
   </metadata>
   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
@@ -1509,9 +1509,9 @@
 </value>
   </data>
   <metadata name="dockManager1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 158</value>
+    <value>827, 17</value>
   </metadata>
   <metadata name="galleryDropDown1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 205</value>
+    <value>1023, 17</value>
   </metadata>
 </root>
\ No newline at end of file
diff --git a/winform/public/Park.cs b/winform/public/Park.cs
index 7247190..72b1e15 100644
--- a/winform/public/Park.cs
+++ b/winform/public/Park.cs
@@ -519,7 +519,11 @@ namespace DeiNiu.wms.win
                             case 1:
                                 WmsConstants.LIGHT_COM_1 = n.value;
                                 break;
-                        
+
+                            case 2:
+                                WmsConstants.LIGHT_COM_2 = n.value;
+                                break;
+
 
                         }
                     }
diff --git a/winform/service/GoodsOutServiceForm.Designer.cs b/winform/service/GoodsOutServiceForm.Designer.cs
index 4ce836c..9105f8b 100644
--- a/winform/service/GoodsOutServiceForm.Designer.cs
+++ b/winform/service/GoodsOutServiceForm.Designer.cs
@@ -83,6 +83,12 @@
             this.layoutControlGroup5 = new DevExpress.XtraLayout.LayoutControlGroup();
             this.simpleSeparator1 = new DevExpress.XtraLayout.SimpleSeparator();
             this.tabbedControlGroup1 = new DevExpress.XtraLayout.TabbedControlGroup();
+            this.layoutControlGroup3 = new DevExpress.XtraLayout.LayoutControlGroup();
+            this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.emptySpaceItem4 = new DevExpress.XtraLayout.EmptySpaceItem();
+            this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlGroup2 = new DevExpress.XtraLayout.LayoutControlGroup();
             this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -91,12 +97,6 @@
             this.emptySpaceItem3 = new DevExpress.XtraLayout.EmptySpaceItem();
             this.emptySpaceItem5 = new DevExpress.XtraLayout.EmptySpaceItem();
             this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlGroup3 = new DevExpress.XtraLayout.LayoutControlGroup();
-            this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.emptySpaceItem4 = new DevExpress.XtraLayout.EmptySpaceItem();
-            this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
             this.tabbedControlGroup2 = new DevExpress.XtraLayout.TabbedControlGroup();
             this.layoutControlGroup7 = new DevExpress.XtraLayout.LayoutControlGroup();
             this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -143,6 +143,12 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup5)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.simpleSeparator1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.tabbedControlGroup1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup3)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem4)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup2)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
@@ -151,12 +157,6 @@
             ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem3)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem5)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup3)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem4)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.tabbedControlGroup2)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup7)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
@@ -779,6 +779,70 @@
             this.layoutControlGroup3,
             this.layoutControlGroup2});
             // 
+            // layoutControlGroup3
+            // 
+            this.layoutControlGroup3.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
+            this.layoutControlItem1,
+            this.layoutControlItem4,
+            this.layoutControlItem12,
+            this.emptySpaceItem4,
+            this.layoutControlItem2});
+            this.layoutControlGroup3.Location = new System.Drawing.Point(0, 0);
+            this.layoutControlGroup3.Name = "layoutControlGroup3";
+            this.layoutControlGroup3.Size = new System.Drawing.Size(225, 733);
+            this.layoutControlGroup3.Text = "服务状态";
+            // 
+            // layoutControlItem1
+            // 
+            this.layoutControlItem1.Control = this.lbUrl;
+            this.layoutControlItem1.Location = new System.Drawing.Point(0, 185);
+            this.layoutControlItem1.Name = "layoutControlItem1";
+            this.layoutControlItem1.Size = new System.Drawing.Size(225, 40);
+            this.layoutControlItem1.TextSize = new System.Drawing.Size(0, 0);
+            this.layoutControlItem1.TextVisible = false;
+            // 
+            // layoutControlItem4
+            // 
+            this.layoutControlItem4.Control = this.lbStatus;
+            this.layoutControlItem4.Location = new System.Drawing.Point(0, 225);
+            this.layoutControlItem4.MaxSize = new System.Drawing.Size(225, 39);
+            this.layoutControlItem4.MinSize = new System.Drawing.Size(225, 39);
+            this.layoutControlItem4.Name = "layoutControlItem4";
+            this.layoutControlItem4.Size = new System.Drawing.Size(225, 39);
+            this.layoutControlItem4.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+            this.layoutControlItem4.TextSize = new System.Drawing.Size(0, 0);
+            this.layoutControlItem4.TextVisible = false;
+            // 
+            // layoutControlItem12
+            // 
+            this.layoutControlItem12.Control = this.picBarcode;
+            this.layoutControlItem12.Location = new System.Drawing.Point(0, 0);
+            this.layoutControlItem12.MinSize = new System.Drawing.Size(106, 26);
+            this.layoutControlItem12.Name = "layoutControlItem12";
+            this.layoutControlItem12.Size = new System.Drawing.Size(225, 185);
+            this.layoutControlItem12.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+            this.layoutControlItem12.TextSize = new System.Drawing.Size(0, 0);
+            this.layoutControlItem12.TextVisible = false;
+            // 
+            // emptySpaceItem4
+            // 
+            this.emptySpaceItem4.AllowHotTrack = false;
+            this.emptySpaceItem4.Location = new System.Drawing.Point(0, 300);
+            this.emptySpaceItem4.Name = "emptySpaceItem4";
+            this.emptySpaceItem4.Size = new System.Drawing.Size(225, 433);
+            this.emptySpaceItem4.TextSize = new System.Drawing.Size(0, 0);
+            // 
+            // layoutControlItem2
+            // 
+            this.layoutControlItem2.Control = this.lbLightsInfo;
+            this.layoutControlItem2.Location = new System.Drawing.Point(0, 264);
+            this.layoutControlItem2.MinSize = new System.Drawing.Size(36, 36);
+            this.layoutControlItem2.Name = "layoutControlItem2";
+            this.layoutControlItem2.Size = new System.Drawing.Size(225, 36);
+            this.layoutControlItem2.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+            this.layoutControlItem2.TextSize = new System.Drawing.Size(0, 0);
+            this.layoutControlItem2.TextVisible = false;
+            // 
             // layoutControlGroup2
             // 
             this.layoutControlGroup2.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
@@ -869,70 +933,6 @@
             this.layoutControlItem18.TextVisible = false;
             this.layoutControlItem18.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
             // 
-            // layoutControlGroup3
-            // 
-            this.layoutControlGroup3.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
-            this.layoutControlItem1,
-            this.layoutControlItem4,
-            this.layoutControlItem12,
-            this.emptySpaceItem4,
-            this.layoutControlItem2});
-            this.layoutControlGroup3.Location = new System.Drawing.Point(0, 0);
-            this.layoutControlGroup3.Name = "layoutControlGroup3";
-            this.layoutControlGroup3.Size = new System.Drawing.Size(225, 733);
-            this.layoutControlGroup3.Text = "服务状态";
-            // 
-            // layoutControlItem1
-            // 
-            this.layoutControlItem1.Control = this.lbUrl;
-            this.layoutControlItem1.Location = new System.Drawing.Point(0, 185);
-            this.layoutControlItem1.Name = "layoutControlItem1";
-            this.layoutControlItem1.Size = new System.Drawing.Size(225, 40);
-            this.layoutControlItem1.TextSize = new System.Drawing.Size(0, 0);
-            this.layoutControlItem1.TextVisible = false;
-            // 
-            // layoutControlItem4
-            // 
-            this.layoutControlItem4.Control = this.lbStatus;
-            this.layoutControlItem4.Location = new System.Drawing.Point(0, 225);
-            this.layoutControlItem4.MaxSize = new System.Drawing.Size(225, 39);
-            this.layoutControlItem4.MinSize = new System.Drawing.Size(225, 39);
-            this.layoutControlItem4.Name = "layoutControlItem4";
-            this.layoutControlItem4.Size = new System.Drawing.Size(225, 39);
-            this.layoutControlItem4.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
-            this.layoutControlItem4.TextSize = new System.Drawing.Size(0, 0);
-            this.layoutControlItem4.TextVisible = false;
-            // 
-            // layoutControlItem12
-            // 
-            this.layoutControlItem12.Control = this.picBarcode;
-            this.layoutControlItem12.Location = new System.Drawing.Point(0, 0);
-            this.layoutControlItem12.MinSize = new System.Drawing.Size(106, 26);
-            this.layoutControlItem12.Name = "layoutControlItem12";
-            this.layoutControlItem12.Size = new System.Drawing.Size(225, 185);
-            this.layoutControlItem12.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
-            this.layoutControlItem12.TextSize = new System.Drawing.Size(0, 0);
-            this.layoutControlItem12.TextVisible = false;
-            // 
-            // emptySpaceItem4
-            // 
-            this.emptySpaceItem4.AllowHotTrack = false;
-            this.emptySpaceItem4.Location = new System.Drawing.Point(0, 300);
-            this.emptySpaceItem4.Name = "emptySpaceItem4";
-            this.emptySpaceItem4.Size = new System.Drawing.Size(225, 433);
-            this.emptySpaceItem4.TextSize = new System.Drawing.Size(0, 0);
-            // 
-            // layoutControlItem2
-            // 
-            this.layoutControlItem2.Control = this.lbLightsInfo;
-            this.layoutControlItem2.Location = new System.Drawing.Point(0, 264);
-            this.layoutControlItem2.MinSize = new System.Drawing.Size(36, 36);
-            this.layoutControlItem2.Name = "layoutControlItem2";
-            this.layoutControlItem2.Size = new System.Drawing.Size(225, 36);
-            this.layoutControlItem2.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
-            this.layoutControlItem2.TextSize = new System.Drawing.Size(0, 0);
-            this.layoutControlItem2.TextVisible = false;
-            // 
             // tabbedControlGroup2
             // 
             this.tabbedControlGroup2.Location = new System.Drawing.Point(264, 0);
@@ -1058,6 +1058,12 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup5)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.simpleSeparator1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.tabbedControlGroup1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup3)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem4)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup2)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
@@ -1066,12 +1072,6 @@
             ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem3)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem5)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup3)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem4)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.tabbedControlGroup2)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup7)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
diff --git a/winform/service/GoodsOutServiceForm.resx b/winform/service/GoodsOutServiceForm.resx
index c9db211..59f437c 100644
--- a/winform/service/GoodsOutServiceForm.resx
+++ b/winform/service/GoodsOutServiceForm.resx
@@ -308,7 +308,7 @@
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABM
-        CQAAAk1TRnQBSQFMAgEBAgEAAWABCQFgAQkBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
+        CQAAAk1TRnQBSQFMAgEBAgEAAWgBCQFoAQkBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
         AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
         AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
         AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
diff --git a/winform/wms.csproj b/winform/wms.csproj
index 9ebb611..e260eab 100644
--- a/winform/wms.csproj
+++ b/winform/wms.csproj
@@ -13,7 +13,7 @@
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <IsWebBootstrapper>true</IsWebBootstrapper>
-    <PublishUrl>D:\wmsSetup\</PublishUrl>
+    <PublishUrl>D:\medicine\wmsSetup\</PublishUrl>
     <Install>true</Install>
     <InstallFrom>Web</InstallFrom>
     <UpdateEnabled>true</UpdateEnabled>
@@ -23,13 +23,13 @@
     <UpdatePeriodically>false</UpdatePeriodically>
     <UpdateRequired>false</UpdateRequired>
     <MapFileExtensions>true</MapFileExtensions>
-    <InstallUrl>http://175.24.179.109:8000/</InstallUrl>
+    <InstallUrl>http://175.24.179.109:9000/</InstallUrl>
     <TargetCulture>zh-Hans</TargetCulture>
     <ProductName>得牛WMS</ProductName>
     <PublisherName>得牛软件</PublisherName>
     <WebPage>publish.htm</WebPage>
     <OpenBrowserOnPublish>false</OpenBrowserOnPublish>
-    <ApplicationRevision>340</ApplicationRevision>
+    <ApplicationRevision>343</ApplicationRevision>
     <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <CreateDesktopShortcut>true</CreateDesktopShortcut>
diff --git a/winform/wms.csproj.user b/winform/wms.csproj.user
index 34f5260..c552ade 100644
--- a/winform/wms.csproj.user
+++ b/winform/wms.csproj.user
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <PublishUrlHistory>D:\wmsSetup\|publish\</PublishUrlHistory>
-    <InstallUrlHistory>http://175.24.179.109:8000/|http://www.deiniusoft.com:8000/|http://192.168.0.1:8000/|http://192.168.0.4:8000/|http://121.42.142.11:8000/</InstallUrlHistory>
+    <PublishUrlHistory>D:\medicine\wmsSetup\|D:\wmsSetup\|publish\</PublishUrlHistory>
+    <InstallUrlHistory>http://175.24.179.109:9000/|http://175.24.179.109:8000/|http://www.deiniusoft.com:8000/|http://192.168.0.1:8000/|http://192.168.0.4:8000/</InstallUrlHistory>
     <SupportUrlHistory />
     <UpdateUrlHistory>http://www.deiniusoft.com:8000/|http://localhost/WMS/</UpdateUrlHistory>
     <BootstrapperUrlHistory />
diff --git a/winform/出库/零货分拣/GoodsOutForm.cs b/winform/出库/零货分拣/GoodsOutForm.cs
index 671fcfd..98343af 100644
--- a/winform/出库/零货分拣/GoodsOutForm.cs
+++ b/winform/出库/零货分拣/GoodsOutForm.cs
@@ -896,7 +896,8 @@ namespace DeiNiu.wms.win
                 // this.splashScreenManager1.ShowWaitForm();
              //   string query = string.Format("{0} =#'{1}';", WmsOutPickRequest.fields.outStoreType.ToString(), (int)enumOutStoreType.拣货出库)
              //                + string.Format("{0} =#'{1}';", WmsOutRequest.fields.state.ToString(), (int)enumOutStockRequestStatus.正在分拣)
-                string query = string.Format("{0} =# {1} ;", WmsOutPickRequest.fields.outStoreType.ToString(), (int)enumOutStoreType.拣货出库) 
+                string query = string.Format("{0} =# {1} ;", WmsOutPickRequest.fields.outStoreType.ToString(), (int)enumOutStoreType.拣货出库)
+                              + string.Format("{0} =#'{1}';", WmsOutRequest.fields.state.ToString(), (int)enumOutStockRequestStatus.正在分拣)
                                + string.Format("{0} ># {1} ;", WmsOutPickRequest.fields.bulkCnt.ToString(), 0)
                                + string.Format("{0} is #{1};", WmsOutPickRequest.fields.waveOrder.ToString(), "null")