bug修改

source/DeviceLibrary/StoreConfig/StoreConfig.csv

@@ -13,7 +13,7 @@ PRO,0,旋转轴（轴1）P3/NG口放料点,MiddleAxis_P3,4760,,,,,,,,,,,,
 PRO,0,进出轴（轴3）P1/待机原位点,InOutAxis_P1,200,,,,,,,,,,,,
 PRO,0,进出轴（轴3）P4/NG口放料点,InOutAxis_P4,4760,,,,,,,,,,,,
 PRO,0,压紧轴（轴4）P1待机原位点,CompressAxis_P1,4760,,,,,,,,,,,,
-PRO,0,压紧轴（轴4）P2压紧点列表,CompAxis_P2_List,8=74800,12=71300,28=59300,36=46800,48=40400,,,,,,,,
+PRO,0,压紧轴（轴4）P2压紧点列表,CompAxis_P2_List,8=74800;12=71300;28=59300;36=46800;48=40400,,,,,,,,
 ,,,,,,,,,,,,,,,,
 PRO,0,升降轴（轴2）P1速度,UpDownAxis_P1_Speed,1000,,,,,,,,,,,,
 PRO,0,升降轴（轴2）P2速度,UpDownAxis_P2_Speed,500,,,,,,,,,,,,

source/DeviceLibrary/mananger/HttpServer.cs

@@ -88,6 +88,9 @@ namespace OnlineStore.DeviceLibrary
                     LogUtil.debug("http :URL:" + url + " :Response:" + json);
                 }
                 if (string.IsNullOrWhiteSpace(json)) return task;
+                //行 2234: [2021 - 04 - 07 15:09:31,412][9]INFO - http :URL: 
+                //http://192.168.100.14/myproject/rest/api/qisda/device/putShelfFinished?barcode=640253A*34005600000309*QG00006*5000*23C4&rfid=F103&rfidLoc=8&robotIndex=1 :
+                //Response:{"code":0,"msg":"ok","data":{"smallTask":"0","cutPackageTask":"0","packageTask":"0","bigTask":"0","smallEmpty":"0","bigEmpty":"5","packageEmpty":"0","rfid":"F103","usedRfidList":"F106,F105,F103","barcode":"640253A*34005600000309*QG00006*5000*23C4","cutTask":"0"}} 耗时[00:00:00.1]
 
                 JavaScriptSerializer serializer = new JavaScriptSerializer();
                 Dictionary<string, object> obj = (Dictionary<string, object>)serializer.DeserializeObject(json);

source/DeviceLibrary/model/InOutParam.cs

@@ -128,7 +128,7 @@ namespace OnlineStore.DeviceLibrary
 
         internal bool IsSameWare(InOutPosInfo posInfo)
         {
-            if (BoxPosId.Equals(posInfo.BoxPosId) && barcode.Equals(posInfo.barcode) && ShelfPosId.Equals(posInfo.ShelfPosId) && IsNg.Equals(posInfo.IsNg))
+            if (BoxPosId.Equals(posInfo.BoxPosId) && barcode.Equals(posInfo.barcode) && rfid.Equals(posInfo.rfid) && IsNg.Equals(posInfo.IsNg))
             {
                 return true;
             }