|
|
@@ -1733,12 +1733,29 @@ public class MESHelperServiceImpl implements MESHelperService {
|
|
|
//实际业务数据
|
|
|
Map<Object, Object> rmap = new HashMap<>();
|
|
|
String oErrMessage=null;
|
|
|
+ if(map.get("iWO")==null){
|
|
|
+ oErrMessage = "WO不能为空";
|
|
|
+ rmap.put("oErrMessage",oErrMessage);
|
|
|
+ return rmap;
|
|
|
+ }
|
|
|
if(map.get("iSN")==null){
|
|
|
oErrMessage = "SN不能为空";
|
|
|
rmap.put("oErrMessage",oErrMessage);
|
|
|
return rmap;
|
|
|
}
|
|
|
+
|
|
|
+ String iWO=map.get("iWO").toString();
|
|
|
String iSN=map.get("iSN").toString();
|
|
|
+ SqlRowList rs=baseDao.queryForRowSet("SELECT a.ma_code, b.ms_sncode, COUNT(b.ms_sncode) num FROM make a, makeserial b "+
|
|
|
+ "WHERE a.ma_code = '"+iWO+"' AND a.ma_code = b.ms_makecode GROUP BY a.ma_code,b.ms_sncode");
|
|
|
+ if(rs.next()){
|
|
|
+ if(rs.getString("num") == "0"){
|
|
|
+ oErrMessage = "WO不合法";
|
|
|
+ rmap.put("oErrMessage",oErrMessage);
|
|
|
+ return rmap;
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
String iTestResult= "";
|
|
|
String iResCode= "";
|
|
|
String iClassName="";
|
|
|
@@ -1770,7 +1787,7 @@ public class MESHelperServiceImpl implements MESHelperService {
|
|
|
for (int i=0;i<name.length;i++){
|
|
|
sql.setLength(0);
|
|
|
sql.append("Insert into STEPTESTDETAIL (STD_ID,STD_CLASS,STD_SN,STD_MAKECODE,STD_ACTUALVALUE,STD_TESTRESULT,STD_INDATE,STD_RESCODE)");
|
|
|
- sql.append("values(STEPTESTDETAIL_SEQ.nextval,'"+name[i]+"','" + iSN + "','" + map2.get("oMoCode") + "','" + value[i] + "','" + result[i] + "',sysdate,'" + iResCode + "')");
|
|
|
+ sql.append("values(STEPTESTDETAIL_SEQ.nextval,'"+name[i]+"','" + iSN + "','" + iWO + "','" + value[i] + "','" + result[i] + "',sysdate,'" + iResCode + "')");
|
|
|
baseDao.execute(sql.toString());
|
|
|
}
|
|
|
rmap.put("oErrMessage",oErrMessage);
|
