|
|
@ -1370,6 +1370,7 @@ namespace Webservice |
|
|
|
//因为客户端先插入,再调用接口,因此取第二条为前置状态 直接访问接口是,应该取第一条进行测试
|
|
|
|
string lastState = string.Empty; |
|
|
|
string lastStation = string.Empty; |
|
|
|
//bool isPointRepair = false;
|
|
|
|
|
|
|
|
if (!position.Contains("点修补")) |
|
|
|
{ |
|
|
@ -1377,6 +1378,8 @@ namespace Webservice |
|
|
|
{ |
|
|
|
lastState = inspectTable.Rows[1]["inspectResult"].ToString(); |
|
|
|
lastStation = inspectTable.Rows[1]["stationNo"].ToString(); |
|
|
|
|
|
|
|
//isPointRepair = inspectTable.AsEnumerable().Where(p => p.Field<string>("reason").Contains("点修")).Count() > 0;
|
|
|
|
} |
|
|
|
if (lastState == "合格") |
|
|
|
{ |
|
|
@ -1524,11 +1527,11 @@ namespace Webservice |
|
|
|
errorMssg = $"条码[{oneBarCode}]已判定[报废],不能重新判定[其它]."; |
|
|
|
return false; |
|
|
|
} |
|
|
|
if (lastState.Contains("其它")) |
|
|
|
{ |
|
|
|
errorMssg = $"条码[{oneBarCode}]已判定为[其它],不需要重复判定为[其它]."; |
|
|
|
return false; |
|
|
|
} |
|
|
|
//if (lastState.Contains("其它"))
|
|
|
|
//{
|
|
|
|
// errorMssg = $"条码[{oneBarCode}]已判定为[其它],不允许重复判定为[其它].";
|
|
|
|
// return false;
|
|
|
|
//}
|
|
|
|
|
|
|
|
} |
|
|
|
else if (state == 9) |
|
|
|