调整特殊pn,只计算低于10500的数量

DeviceLibrary/AutoScan/RobotManage.cs

@@ -119,6 +119,7 @@ namespace DeviceLibrary
                 xrayMachine.pnlst = new HashSet<string>(wiston_spnlist);
                 xrayMachine.pnlst = new HashSet<string>(wiston_spnlist);
                 xrayMachine.relmove = ConfigHelper.Config.Get<int>("wiston_relmove", 50);
                 xrayMachine.relmove = ConfigHelper.Config.Get<int>("wiston_relmove", 50);
                 xrayMachine.ptrycount = ConfigHelper.Config.Get<int>("wiston_strycount", 3);
                 xrayMachine.ptrycount = ConfigHelper.Config.Get<int>("wiston_strycount", 3);
+                var a= ConfigHelper.Config.Get<int>("wiston_smaxcount", 10500);
                 LogUtil.info("加载到特殊pn序列" + string.Join(",", ConfigHelper.Config.Get<string[]>("wiston_spnlist")));
                 LogUtil.info("加载到特殊pn序列" + string.Join(",", ConfigHelper.Config.Get<string[]>("wiston_spnlist")));
                 LogUtil.info("加载到相对移动偏移" + xrayMachine.relmove+",重试次数"+ xrayMachine.ptrycount);
                 LogUtil.info("加载到相对移动偏移" + xrayMachine.relmove+",重试次数"+ xrayMachine.ptrycount);
 
 

DeviceLibrary/AutoScan/XRayMachine.XRay.cs

@@ -175,7 +175,7 @@ namespace DeviceLibrary
                     break;
                     break;
                 case MoveStep.XRay_Extra_02:
                 case MoveStep.XRay_Extra_02:
                     var zerocount = countlist.Where((x) => x == 0).Count();
                     var zerocount = countlist.Where((x) => x == 0).Count();
-                    var hasnumcount = countlist.Where((x) => x > 0).Count();
+                    var hasnumcount = countlist.Where((x) => x > 0 && x<= ConfigHelper.Config.Get<int>("wiston_smaxcount", 10500)).Count();
                     if (hasnumcount <= ptrycount && zerocount<=ptryerrcount)
                     if (hasnumcount <= ptrycount && zerocount<=ptryerrcount)
                     {
                     {
                         MoveInfo.NextMoveStep(MoveStep.XRay_Extra_01);
                         MoveInfo.NextMoveStep(MoveStep.XRay_Extra_01);
@@ -184,7 +184,7 @@ namespace DeviceLibrary
                     else
                     else
                     {
                     {
                         MoveInfo.NextMoveStep(MoveStep.XRay_Extra_03);
                         MoveInfo.NextMoveStep(MoveStep.XRay_Extra_03);
-                        var maxcount = countlist.Max();
+                        var maxcount = countlist.Where((x) => x <= ConfigHelper.Config.Get<int>("wiston_smaxcount", 10500)).Max();
                         MoveInfo.log($"获取到最大数量{maxcount}, 分别数量:{string.Join(",", countlist)}");
                         MoveInfo.log($"获取到最大数量{maxcount}, 分别数量:{string.Join(",", countlist)}");
                         MoveInfo.ReelParam.QTY = maxcount;
                         MoveInfo.ReelParam.QTY = maxcount;
                         var cl = ServerConn.inputCounterDataByXRayMachine(MoveInfo.ReelParam.WareCode, maxcount);
                         var cl = ServerConn.inputCounterDataByXRayMachine(MoveInfo.ReelParam.WareCode, maxcount);