bug修改。D7增加当前库位号上传。

source/AssemblyLineClient/App.config

@@ -8,7 +8,6 @@
     <add key="App_AutoRun" value="0" />
     <add key="App_AutoRun" value="0" />
     <add key="App_Title" value="流水线客户端" />
     <add key="App_Title" value="流水线客户端" />
     <!--Server address-->
     <!--Server address-->
-    <!--<add key="http.server" value="http://192.168.100.14/myproject/service/store/emptyPosForPutin"/>-->
     <add key="http.server" value="http://192.168.100.14/myproject/" />
     <add key="http.server" value="http://192.168.100.14/myproject/" />
     <!--storeType-->
     <!--storeType-->
     <add key="Line_moveEquip_count" value="7" />
     <add key="Line_moveEquip_count" value="7" />

source/DeviceLibrary/assemblyLine/MoveEquip_Partial.cs

@@ -648,6 +648,8 @@ namespace OnlineStore.DeviceLibrary
 
 
                     if (OnlyProOutTray)
                     if (OnlyProOutTray)
                     {
                     {
+                        InLog("出料移栽 " + MoveInfo.SLog + "，提前通知出料机构取料");
+                        LineServer.StartInStore(DeviceID, MoveInfo.MoveParam);
                         string code = MoveInfo.MoveParam.WareCode;
                         string code = MoveInfo.MoveParam.WareCode;
                         if (MoveInfo.MoveParam.IsNG)
                         if (MoveInfo.MoveParam.IsNG)
                         {
                         {
@@ -661,8 +663,6 @@ namespace OnlineStore.DeviceLibrary
                             string msg = SServerManager.arrive3fRobotLocation(Name, 1, code);
                             string msg = SServerManager.arrive3fRobotLocation(Name, 1, code);
                             afterPutCutOK = true;
                             afterPutCutOK = true;
                         }
                         }
-                        InLog("出料移栽 " + MoveInfo.SLog + "，提前通知出料机构取料");
-                        LineServer.StartInStore(DeviceID, MoveInfo.MoveParam);
                     }
                     }
                     else
                     else
                     {
                     {

source/DeviceLibrary/assemblymanager/EDataManager.cs

@@ -101,7 +101,7 @@ namespace OnlineStore.DeviceLibrary
                         lineList.Add(line);
                         lineList.Add(line);
                     }
                     }
                 }
                 }
-                FileEncoding.WritteFile(FilePath, lineList.ToArray());
+                FileEncoding.WriteFile(FilePath, lineList.ToArray());
             }
             }
             catch (Exception ex)
             catch (Exception ex)
             {
             {

source/DeviceLibrary/assemblymanager/TrayManager.cs

@@ -202,7 +202,7 @@ namespace OnlineStore.DeviceLibrary
                         lineList.Add(line);
                         lineList.Add(line);
                     }
                     }
                 }
                 }
-                FileEncoding.WritteFile(FilePath, lineList.ToArray()); 
+                FileEncoding.WriteFile(FilePath, lineList.ToArray()); 
             }
             }
             catch (Exception ex)
             catch (Exception ex)
             {
             {

source/DeviceLibrary/server/BoxInfo.cs

@@ -71,6 +71,11 @@ namespace OnlineStore.DeviceLibrary
         /// </summary>
         /// </summary>
         public int HasTray { get; set; }
         public int HasTray { get; set; }
 
 
-        public   List<string> WaitInStoreList = new List<string>();
+        public List<string> WaitInStoreList = new List<string>();
+
+        /// <summary>
+        /// 当前出入库的库位号
+        /// </summary>
+        public string CurrPosId { get; set; }
     }
     }
 }
 }

source/DeviceLibrary/server/LineServer.cs

@@ -98,8 +98,9 @@ namespace OnlineStore.DeviceLibrary
                     LineRunStatus runs = (LineRunStatus)box.SRunStatus;
                     LineRunStatus runs = (LineRunStatus)box.SRunStatus;
                     if (runs.Equals(LineRunStatus.Busy))
                     if (runs.Equals(LineRunStatus.Busy))
                     {
                     {
-                        if (status.Equals(LineStatus.OutStoreExecute) || status.Equals(LineStatus.OutStoreBoxEnd) || box.WaitInStoreList.Contains(posId))
-                        { 
+                        bool isOutP = status.Equals(LineStatus.OutStoreExecute) || status.Equals(LineStatus.OutStoreBoxEnd);
+                        if ((isOutP && box.CurrPosId.Equals(posId)) || box.WaitInStoreList.Contains(posId))
+                        {
                             return true;
                             return true;
                         }
                         }
                     }
                     }

source/LoadCVSLibrary/FileEncoding.cs

@@ -9,7 +9,7 @@ namespace OnlineStore.LoadCSVLibrary
 {
 {
     public class FileEncoding
     public class FileEncoding
     {
     {
-        public  static bool WritteFile(string filePath, string[] lines)
+        public  static bool WriteFile(string filePath, string[] lines)
         {
         {
             try
             try
             {
             {
@@ -43,13 +43,12 @@ namespace OnlineStore.LoadCSVLibrary
                 {
                 {
                     File.Delete(filePath);
                     File.Delete(filePath);
                 }
                 }
-                File.WriteAllLines(filePath, lines, Encoding.UTF8);
-
+                File.WriteAllLines(filePath, lines, Encoding.UTF8); 
 
 
             }
             }
             catch (Exception ex)
             catch (Exception ex)
             {
             {
-                LogUtil.error(ex.ToString());
+                LogUtil.error("WriteFile ["+filePath+"] error :" +ex.ToString());
                 return false;
                 return false;
             }
             }
             return true;
             return true;