入库ng上报

source/DeviceLibrary/storeBean/boxBean/BoxEquip_ConnectServerTimer.cs

@@ -137,7 +137,12 @@ namespace OnlineStore.DeviceLibrary
             lineOperation.cid = CID;
             lineOperation.cid = CID;
             lineOperation.seq = ConfigAppSettings.nextSeq();
             lineOperation.seq = ConfigAppSettings.nextSeq();
             lineOperation.status = 1;
             lineOperation.status = 1;
-            if (WarnMsg != "")
+            var input = StoreManager.XLRStore?.inputEquip;
+            if (input != null && !string.IsNullOrEmpty(input.InstoreNgMsg))
+            {
+                WarnMsg = input.InstoreNgMsg;
+            }
+            else if (WarnMsg != "")
             {
             {
                 lineOperation.status = (int)DeviceStatus.Warning;
                 lineOperation.status = (int)DeviceStatus.Warning;
                 lineOperation.msg = $"W={WarnMsg}";
                 lineOperation.msg = $"W={WarnMsg}";

source/DeviceLibrary/storeBean/inputBean/InputEquip.cs

@@ -111,7 +111,7 @@ namespace OnlineStore.DeviceLibrary
             }
             }
             SetAllTimer(false);
             SetAllTimer(false);
             MoveInfo.EndMove();
             MoveInfo.EndMove();
-
+            InstoreNgMsg = "";
             LogInfo("StartRun ： 开始启动 ");
             LogInfo("StartRun ： 开始启动 ");
             runStatus = RunStatus.HomeMoving;
             runStatus = RunStatus.HomeMoving;
             MoveInfo.NewMove(MoveType.RHome, new InOutParam());
             MoveInfo.NewMove(MoveType.RHome, new InOutParam());

source/DeviceLibrary/storeBean/inputBean/InputEquip_InStore.cs

@@ -18,6 +18,7 @@ namespace OnlineStore.DeviceLibrary
     {
     {
         public bool ClampEmptyMove = false;
         public bool ClampEmptyMove = false;
         public Dictionary<int, int> reelHeightOffset = new Dictionary<int, int>();
         public Dictionary<int, int> reelHeightOffset = new Dictionary<int, int>();
+        public string InstoreNgMsg = "";
         protected override bool CheckWaitResult(DeviceMoveInfo moveInfo, WaitResultInfo wait)
         protected override bool CheckWaitResult(DeviceMoveInfo moveInfo, WaitResultInfo wait)
         {
         {
             TimeSpan span = DateTime.Now - moveInfo.LastSetpTime;
             TimeSpan span = DateTime.Now - moveInfo.LastSetpTime;
@@ -490,6 +491,7 @@ namespace OnlineStore.DeviceLibrary
             else if (MoveInfo.IsStep(StepEnum.II81_MiddleToNg))
             else if (MoveInfo.IsStep(StepEnum.II81_MiddleToNg))
             {
             {
                 MoveInfo.NextMoveStep(StepEnum.II82_InoutToP6);
                 MoveInfo.NextMoveStep(StepEnum.II82_InoutToP6);
+                InstoreNgMsg = $"入库ng :{MoveInfo.MoveParam.PosInfo?.ToStr()}";
                 MoveLog($" 入料->NG箱 {MoveInfo.SLog}: 进出轴到P6（NG料区放料点）{Config.Inout_P6}");
                 MoveLog($" 入料->NG箱 {MoveInfo.SLog}: 进出轴到P6（NG料区放料点）{Config.Inout_P6}");
                 InOutAxis.AbsMove(MoveInfo, Config.Inout_P6, Config.Inout_P6_Speed);
                 InOutAxis.AbsMove(MoveInfo, Config.Inout_P6, Config.Inout_P6_Speed);
             }
             }
@@ -520,6 +522,7 @@ namespace OnlineStore.DeviceLibrary
             }
             }
             else if (MoveInfo.IsStep(StepEnum.II86_1_InoutToP1))
             else if (MoveInfo.IsStep(StepEnum.II86_1_InoutToP1))
             {
             {
+                InstoreNgMsg = "";
                 if (shelf.Equals(1))
                 if (shelf.Equals(1))
                 {
                 {
                     MoveLog($" 入料->NG箱放料结束");
                     MoveLog($" 入料->NG箱放料结束");