自动出库功能修改

source/ACSingleStore/App.config

@@ -49,6 +49,8 @@
     <!--配置文件的表头格式，0=中文，1=英文-->
     <add key ="LibNameType" value ="0"/>
     <add key="DefaultPWD" value ="123456"/>
+    <!--自动出入库时使用-->
+    <add key ="LOC" value ="1"/>
   </appSettings>
   <log4net>
     <appender name="RollingLogFileAppender" type="log4net.Appender.RollingFileAppender">

source/Common/Setting_Init.cs

@@ -98,5 +98,6 @@ namespace OnlineStore.Common
 
         public static string LibNameType = "LibNameType";
         public static string DefaultPWD = "DefaultPWD";
+        public static string LOC = "LOC";
     }
 }

source/Common/util/HttpHelper.cs

@@ -138,13 +138,13 @@ namespace OnlineStore.Common
         {
             try
             {
-                LogUtil.info(LOGGER, "HTTP GET FROM: " + url);
+                LogUtil.debug(LOGGER, "HTTP GET FROM: " + url);
                 var wc = new WebClient { Encoding = encoding };
                 var readStream = wc.OpenRead(url);
                 using (var sr = new StreamReader(readStream, encoding))
                 {
                     var result = sr.ReadToEnd();
-                    LogUtil.info(LOGGER, "receive << " + result);
+                    LogUtil.debug(LOGGER, "receive << " + result);
                     return result;
                 }
             }

source/DeviceLibrary/acSingleStore/AC_SA_BoxBean.cs

@@ -1208,6 +1208,7 @@ namespace OnlineStore.DeviceLibrary
         }
         private DateTime preProTime = DateTime.Now;
 
+
         private void AutoResetProcess()
         {
             try
@@ -1279,25 +1280,41 @@ namespace OnlineStore.DeviceLibrary
                 {
                     //获取出库的库位号
                     string readId = "";
+                    //[{"LOC":"1","RI":"A100007","QTY":1000,"PN":"pn"},{"LOC":"2","RI":"A100015","QTY":1000,"PN":"pn"}]
                     //http://[SMD-BOX-IP]:[SMD-BOX-Port]/rest/api/v2/mes/inventory
-                    string result = HttpHelper.Post(StoreManager.GetAPI("", StoreManager.api_inventory));
-                    if (!String.IsNullOrEmpty(result))
+                    //http://localhost/myproject/rest/api/v2/mes/inventory?LOC=1
+                    int LOC = ConfigAppSettings.GetIntValue(Setting_Init.LOC);
+                    if (LOC <= 0)
                     {
-                        string[] rArray = result.Split('}');
-                        foreach (string obj in rArray)
+                        LOC = 1;
+                    }
+                    string result = HttpHelper.Get(StoreManager.GetAPI("", StoreManager.api_inventory) + "?LOC=" + LOC);
+                    if (!String.IsNullOrEmpty(result))
                     {
-                            string[] objArray = obj.Split(',');
-                            if (objArray.Length >= 4)
+                        List<APIInfo> apilist = JsonHelper.DeserializeJsonToList<APIInfo>(result);
+                        foreach (APIInfo a in apilist)
                         {
-                                string rId = objArray[1];
-                                if (rId.Length > 7)
+                            if (a.LOC.Equals(LOC))
                             {
-                                    readId = rId.Substring(6, rId.Length - 7);
+                                readId = a.RI;
                                 LogUtil.debug("自动出入库：查找到：RI: " + readId);
-                                    break;
-                                }
                             }
                         }
+                        //string[] rArray = result.Split('}');
+                        //foreach (string obj in rArray)
+                        //{
+                        //    string[] objArray = obj.Split(',');
+                        //    if (objArray.Length >= 4)
+                        //    {
+                        //        string rId = objArray[1];
+                        //        if (rId.Length > 7)
+                        //        {
+                        //            readId = rId.Substring(6, rId.Length - 7);
+                        //            LogUtil.debug("自动出入库：查找到：RI: " + readId);
+                        //            break;
+                        //        }
+                        //    }
+                        //}
                     }
                     if (readId.Equals(""))
                     {
@@ -1938,7 +1955,10 @@ namespace OnlineStore.DeviceLibrary
                                     LogUtil.info(LOGGER, StoreName + " 执行出库【" + currInOutFixture.ToStr() + "】失败，加入等待队列");
                                     AddWaitOutInfo(currInOutFixture);
                                 }
-                              if(autoNext)  autoMsg = "自动出库：" + posId;
+                                if (autoNext)
+                                {
+                                    autoMsg = "自动出库：" + posId;
+                                }
                             }
                             else
                             {

source/DeviceLibrary/acSingleStore/AutomaticBaiting_Partial.cs

@@ -233,6 +233,7 @@ namespace OnlineStore.DeviceLibrary
                 {
                     LogUtil.error(Name + moveAxis.DisplayStr + "目标[" + targetPosition + "]当前[" + outCount +
                      "]，误差过大，重新运动，剩余[" + StoreMove.CanWhileCount + "]次");
+                    ACServerManager.SuddenStop(moveAxis.DeviceName, moveAxis.GetAxisValue());
                     ACServerManager.AbsMove(moveAxis.DeviceName, moveAxis.GetAxisValue(), targetPosition, targetSpeed);
                     StoreMove.CanWhileCount--;
                 }

source/DeviceLibrary/acSingleStore/StoreManager.cs

@@ -152,5 +152,17 @@ namespace OnlineStore.DeviceLibrary
             }
             return host;
         }
+
+
+    }
+    public class APIInfo
+    {
+        //[{"LOC":"1","RI":"A100007","QTY":1000,"PN":"pn"},{"LOC":"2","RI":"A100015","QTY":1000,"PN":"pn"}]
+
+        public int LOC=1;
+        public string  RI = "";
+        public string QTY = "";
+        public string PN = "";
+
     }
 }