|
|
@@ -123,7 +123,33 @@ public class MESHelperServiceImpl implements MESHelperService {
|
|
|
|
|
|
private Map<Object, Object> SnList(JSONObject map){
|
|
|
Map<Object, Object> relist = new HashMap<Object, Object>();
|
|
|
-
|
|
|
+ List<Map<Object, Object>> Err = new ArrayList<>();
|
|
|
+ JSONArray snlist= map.getJSONArray("SNLIST");
|
|
|
+ for (int i=0;i<snlist.size();i++) {
|
|
|
+ Map<Object, Object> DataErr = new HashMap<Object, Object>();
|
|
|
+ JSONObject map1=snlist.getJSONObject(i);
|
|
|
+ String sncode=map1.getString("SN");
|
|
|
+ String macode=map1.getString("MACODE");
|
|
|
+ String type=map1.getString("TYPE");
|
|
|
+ if(!(type.equals("before")||type.equals("after"))){
|
|
|
+ DataErr.put("TypeErr","类型必须是before或者after,SN["+sncode+"]");
|
|
|
+ Err.add(DataErr);
|
|
|
+ continue;
|
|
|
+ }
|
|
|
+ if(!baseDao.checkIf("make","ma_code='"+macode+"'")){
|
|
|
+ DataErr.put("MakeErr","工单号"+macode+"不存在,SN["+sncode+"]");
|
|
|
+ Err.add(DataErr);
|
|
|
+ continue;
|
|
|
+ }
|
|
|
+ if(baseDao.checkIf("makesnlist","msl_makecode='"+macode+"' and msl_sncode='"+sncode+"'")){
|
|
|
+ DataErr.put("SnErr","SN["+sncode+"]重复");
|
|
|
+ Err.add(DataErr);
|
|
|
+ continue;
|
|
|
+ }
|
|
|
+ baseDao.execute("insert into makesnlist (msl_id,msl_makecode,msl_indate,msl_sncode,msl_type)" +
|
|
|
+ "values(makesnlist_seq.nextval,'"+macode+"',sysdate,'"+sncode+"','"+type+"')");
|
|
|
+ }
|
|
|
+ relist.put("ErrorMessage",Err);
|
|
|
return relist;
|
|
|
}
|
|
|
|