良品采集成不良不重复添加执行步骤和调用存储过程

UAS-MES/PublicMethod/LogicHandler.cs

@@ -1030,8 +1030,18 @@ namespace UAS_MES.PublicMethod
             //之前保存的不良就不再调用
             if (ms_status != "3")
             {
-                dh.UpdateByCondition("makeserial", "ms_paststep = ms_paststep ||'," + StepCode + "',ms_status=3", "ms_sncode='" + iSnCode + "'");
-                SetStepFinish(iMakeCode, iSourceCode, iSnCode, "不良采集", iResult, iUserCode, out oErrorMessage);
+                string ms_stepcode = dh.getFieldDataByCondition("makeserial", "ms_stepcode", "ms_sncode='" + iSnCode + "'").ToString();
+                Console.WriteLine(ms_stepcode);
+                Console.WriteLine(StepCode);
+                if (ms_stepcode == StepCode)
+                {
+                    dh.UpdateByCondition("makeserial", "ms_status=3", "ms_sncode='" + iSnCode + "'");
+                }
+                else
+                {
+                    dh.UpdateByCondition("makeserial", "ms_paststep = ms_paststep ||'," + StepCode + "',ms_status=3", "ms_sncode='" + iSnCode + "'");
+                    SetStepFinish(iMakeCode, iSourceCode, iSnCode, "不良采集", iResult, iUserCode, out oErrorMessage);
+                }
             }
             return true;
         }