callm 2 недель назад
Родитель
Сommit
35e8322a29

+ 1 - 0
src/main/java/com/uas/eis/entity/HelperType.java

@@ -36,6 +36,7 @@ public enum HelperType {
     SetHashValue("SetHashValue","写入SN对应的HashValue"),
     GetHashValue("GetHashValue","获取SN对应的HashValue"),
     Weigh("Weigh","添加称重接口"),
+    GetEDISN("GetEDISN","获取EDI的SN进行召回重置"),
     GetMakeInfo("GetMakeInfo","获取工单相关参数");
     ;
 

+ 28 - 0
src/main/java/com/uas/eis/serviceImpl/MESHelperServiceImpl.java

@@ -103,6 +103,9 @@ public class MESHelperServiceImpl implements MESHelperService {
 			case SetPcbaData:
 				remap = SetPcbaData(json,AE_MASTER);
 				break;
+			case GetEDISN:
+				remap = GetEDISN(json,AE_MASTER);
+				break;
 			case GetInfoByMaterial:
 				remap = GetInfoByMaterial(json,AE_MASTER);
 				break;
@@ -1334,6 +1337,31 @@ public class MESHelperServiceImpl implements MESHelperService {
 		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){
 		//实际业务数据
 		Map<Object, Object> rmap = new HashMap<>();