فهرست منبع

添加序列号重置第一个工序

callm 3 هفته پیش
والد
کامیت
bfa4c574e6

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

@@ -55,6 +55,7 @@ public enum HelperType {
     GetMedionValue("GetMedionValue","写入SN对应的HashValue"),
     SetMedionValue("SetMedionValue","写入SN对应的HashValue"),
     GetMakeInfo("GetMakeInfo","获取工单相关参数"),
+    ReSetSN("ReSetSN","重置SN到第一个工站"),
     GetMakeMaterial("GetMakeMaterial","获取用料表");
 
     private String code;

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

@@ -160,6 +160,9 @@ public class MESHelperServiceImpl implements MESHelperService {
 			case GetMakeInfo:
 				remap = GetMakeInfo(json,AE_MASTER);
 				break;
+			case ReSetSN:
+				remap = ReSetSN(json,AE_MASTER);
+				break;
 			case SetHashValue:
 				remap = SetHashValue(json,AE_MASTER);
 				break;
@@ -709,6 +712,44 @@ public class MESHelperServiceImpl implements MESHelperService {
 		return rmap;
 	}
 
+
+	private Map<Object,Object> ReSetSN(JSONObject map,String Master){
+		Map<Object, Object> rmap = new HashMap<Object, Object>();
+		String iSN=null;
+		String oErrMessage=null;
+
+		if(map.get("iSN")==null){
+			oErrMessage = "SN不能为空";
+			rmap.put("oErrMessage",oErrMessage);
+			return rmap;
+		}
+		iSN=map.get("iSN").toString();
+
+		SqlRowList rs = baseDao.queryForRowSet("select ms_id,ms_craftcode,ms_prodcode,ms_status,ms_stepcode,ms_nextstepcode from "+Master+".makeserial where ms_id=(  select max(ms_id) from "+Master+".makeserial where ms_sncode  in ( select '" + iSN + "' from dual union select sn from "+Master+".makesnrelation where beforesn='" + iSN + "' and sn<>' '  union select beforesn from "+Master+".makesnrelation where sn='" + iSN + "' and beforesn<>' '))");
+		String ms_status = "";
+		String ms_craftcode = "";
+		String ms_prodcode = "";
+		String ms_id = "";
+
+
+		if(rs.next()){
+			ms_id= rs.getString("ms_id");
+			ms_craftcode=rs.getString("ms_craftcode");
+			ms_prodcode=rs.getString("ms_prodcode");
+		}else {
+			oErrMessage = "SN不存在";
+			rmap.put("oErrMessage",oErrMessage);
+			return rmap;
+		}
+
+		Object firststep=baseDao.getFieldDataByCondition("craft left join craftdetail on cr_id=cd_crid","cd_stepcode","cr_code='"+ms_craftcode+"' and cr_prodcode='"+ms_prodcode+"' and cd_firststep=-1");
+		if(firststep!=null){
+			baseDao.execute("update makeserial set ms_nextstepcode=? where ms_id=?",firststep,ms_id);
+		}
+		rmap.put("oErrMessage",null);
+		return rmap;
+	}
+
 	private Map<Object,Object> GetMakeInfo(JSONObject map,String Master){
 		Map<Object, Object> rmap = new HashMap<Object, Object>();
 		String iSN=null;