1

PaintingPC/FrmQuality.cs

@@ -1447,12 +1447,12 @@ namespace PaintingPC
             {
                 if (!string.IsNullOrEmpty(errorMsg))
                 {
-                    ShowHint("在wms系统的查询返修出库记录时发生错误,错误原因:"+errorMsg, false);
+                    ShowHint("在wms系统的查询返修入库记录时发生错误,错误原因:"+errorMsg, false);
                     return false;
 
                 }
                 else{
-                    ShowHint("没有在wms系统的返修出库记录,无法进行点修补.", false);
+                    ShowHint("没有在wms系统的返修入库记录,无法进行点修补.", false);
                     return false;
                 }
                

WebService/Function.cs

@@ -1244,18 +1244,34 @@ namespace Webservice
             //因为客户端先插入,再调用接口,因此取第二条为前置状态  直接访问接口是,应该取第一条进行测试
             string lastState = string.Empty;
             string lastStation = string.Empty;
-            if (inspectTable.Rows.Count > 1)
+
+            if (!position.Contains("点修补"))
             {
-                lastState = inspectTable.Rows[1]["inspectResult"].ToString();
-                lastStation = inspectTable.Rows[1]["stationNo"].ToString();
+                if (inspectTable.Rows.Count > 1)
+                {
+                    lastState = inspectTable.Rows[1]["inspectResult"].ToString();
+                    lastStation = inspectTable.Rows[1]["stationNo"].ToString();
+                }
+                if (lastState == "合格")
+                {
+                    if (lastStation != inspectTable.Rows[0]["stationNo"].ToString())
+                    {
+                        lastState = "";
+                    }
+                }
             }
-            if(lastState == "合格")
+            else
             {
-                if(lastStation != inspectTable.Rows[0]["stationNo"].ToString())
+                if (inspectTable.Rows.Count > 1)
                 {
-                    lastState = "";
+                    lastState = inspectTable.Rows[1]["inspectResult"].ToString();
+                    if (lastState.Contains("其它"))
+                    {
+                        lastState = "";
+                    }
                 }
             }
+               
             //string lastOkState = string.Empty;
             //if (inspectTable.Rows.Count > 0)
             //{