|
|
@@ -1334,7 +1334,7 @@ public class MESHelperServiceImpl implements MESHelperService {
|
|
|
paramsMap.put("su_linecode",rs.getString("st_line"));
|
|
|
paramsMap.put("su_usemacode",WorkOrderNo);
|
|
|
paramsMap.put("su_usedate",InspectTime);
|
|
|
- if(usestatus == "在库"){
|
|
|
+ if(usestatus.contains("在库")){
|
|
|
paramsMap.put("su_status","领用");
|
|
|
if(jsonObj.optString("InspectResult", "").contains("NG")){
|
|
|
rmap.put("Result", "NG");
|
|
|
@@ -1346,7 +1346,7 @@ public class MESHelperServiceImpl implements MESHelperService {
|
|
|
rmap.put("Meassage", stKind+"状态: " + jsonObj.optString("TestResult", "") + "不可领用");
|
|
|
return rmap;
|
|
|
}
|
|
|
- }else if(usestatus == "出库"){
|
|
|
+ }else if(usestatus.contains("出库")){
|
|
|
paramsMap.put("su_status","归还");
|
|
|
}
|
|
|
|
|
|
@@ -1358,7 +1358,7 @@ public class MESHelperServiceImpl implements MESHelperService {
|
|
|
paramsMap1.put("STD_VALUE2",jsonObj.optString("action", ""));
|
|
|
paramsMap1.put("STD_VALUE3",jsonObj.optString("Inspector", ""));
|
|
|
|
|
|
- if(stKind == "钢网"){
|
|
|
+ if(stKind.contains("钢网")){
|
|
|
paramsMap.put("su_ensiona",jsonObj.optString("Tension1", ""));
|
|
|
paramsMap.put("su_ensionb",jsonObj.optString("Tension2", ""));
|
|
|
paramsMap.put("su_ensionc",jsonObj.optString("Tension3", ""));
|
|
|
@@ -1381,7 +1381,7 @@ public class MESHelperServiceImpl implements MESHelperService {
|
|
|
paramsMap1.put("STD_VALUE15",jsonObj.optString("OtherErrNum", ""));
|
|
|
paramsMap1.put("STD_VALUE16",jsonObj.optString("ErrCount", ""));
|
|
|
paramsMap1.put("STD_VALUE17",jsonObj.optString("HoleCount", ""));
|
|
|
- }else if(stKind == "刮刀"){
|
|
|
+ }else if(stKind.contains("刮刀")){
|
|
|
paramsMap1.put("STD_VALUE4",jsonObj.optString("TestResult", ""));
|
|
|
paramsMap1.put("STD_VALUE5",jsonObj.optString("ScrapSegma", ""));
|
|
|
paramsMap1.put("STD_VALUE6",jsonObj.optString("NlightWay", ""));
|
|
|
@@ -1400,9 +1400,9 @@ public class MESHelperServiceImpl implements MESHelperService {
|
|
|
paramsMap.put("su_cleannums",cleannums);
|
|
|
baseDao.execute(SqlUtil.getInsertSqlByMap(paramsMap,"stenciluse"));
|
|
|
}
|
|
|
- if(usestatus == "在库"){
|
|
|
+ if(usestatus.contains("在库") ){
|
|
|
baseDao.updateByCondition("stencil", "st_usestatus = '出库'", "st_code='" + MeshCode + "'");
|
|
|
- }else if(usestatus == "出库"){
|
|
|
+ }else if(usestatus.contains("出库")){
|
|
|
baseDao.updateByCondition("stencil", "st_usestatus = '在库'", "st_code='" + MeshCode + "'");
|
|
|
}
|
|
|
baseDao.execute(SqlUtil.getInsertSqlByMap(paramsMap1,"steptestdetail"));
|
