|
@@ -103,6 +103,9 @@ public class MESHelperServiceImpl implements MESHelperService {
|
|
|
case SetPcbaData:
|
|
case SetPcbaData:
|
|
|
remap = SetPcbaData(json,AE_MASTER);
|
|
remap = SetPcbaData(json,AE_MASTER);
|
|
|
break;
|
|
break;
|
|
|
|
|
+ case GetEDISN:
|
|
|
|
|
+ remap = GetEDISN(json,AE_MASTER);
|
|
|
|
|
+ break;
|
|
|
case GetInfoByMaterial:
|
|
case GetInfoByMaterial:
|
|
|
remap = GetInfoByMaterial(json,AE_MASTER);
|
|
remap = GetInfoByMaterial(json,AE_MASTER);
|
|
|
break;
|
|
break;
|
|
@@ -1334,6 +1337,31 @@ public class MESHelperServiceImpl implements MESHelperService {
|
|
|
return rmap;
|
|
return rmap;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+
|
|
|
|
|
+ private Map<Object,Object> GetEDISN(JSONObject map,String Master){
|
|
|
|
|
+ Map<Object, Object> rmap = new HashMap<>();
|
|
|
|
|
+ JSONArray dataArray = map.getJSONArray("data");
|
|
|
|
|
+ List<Map<String, Object>> maps = new ArrayList<>();
|
|
|
|
|
+ for (int i = 0; i < dataArray.size(); i++) {
|
|
|
|
|
+ JSONObject item = dataArray.getJSONObject(i);
|
|
|
|
|
+ Object sn = item.get("SN");
|
|
|
|
|
+ SqlRowList rs=baseDao.queryForRowSet("select ms_id from makeserial where ms_sncode='"+sn+"'");
|
|
|
|
|
+ if(rs.next()){
|
|
|
|
|
+ baseDao.execute("update makeserial set ms_edistatus=-1 where ms_id=(select max(ms_id) from makeserial where ms_sncode='"+sn+"')");
|
|
|
|
|
+ Map<String, Object> map1 = new HashMap<>();
|
|
|
|
|
+ map1.put("Pass",sn+"标记成功");
|
|
|
|
|
+ maps.add(map1);
|
|
|
|
|
+ }
|
|
|
|
|
+ else {
|
|
|
|
|
+ Map<String, Object> map1 = new HashMap<>();
|
|
|
|
|
+ map1.put("Fail",sn+"不存在");
|
|
|
|
|
+ maps.add(map1);
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
|
|
+ rmap.put("Result",maps);
|
|
|
|
|
+ return rmap;
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
private Map<Object,Object> SetPcbaData(JSONObject map,String Master){
|
|
private Map<Object,Object> SetPcbaData(JSONObject map,String Master){
|
|
|
//实际业务数据
|
|
//实际业务数据
|
|
|
Map<Object, Object> rmap = new HashMap<>();
|
|
Map<Object, Object> rmap = new HashMap<>();
|