修改限制已完工或者出货的不允许再修改

src/main/java/com/uas/eis/serviceImpl/MESHelperServiceImpl.java

@@ -557,6 +557,20 @@ public class MESHelperServiceImpl implements MESHelperService {
 		}
 		String iSN=map.get("iSN").toString();
 		String iHashValue=map.get("iHashValue").toString();
+		//SN在makeserial表最新一条记录ms_status为2的不允许更新
+		SqlRowList rsMs=baseDao.queryForRowSet("select ms_status from "+Master+".makeserial where ms_id=(select max(ms_id) from "+Master+".makeserial where ms_sncode=?)",iSN);
+		if(rsMs.next() && "2".equals(rsMs.getString("ms_status"))){
+			oErrMessage = "SN:"+iSN+"在已完工,不允许更新";
+			rmap.put("oErrMessage",oErrMessage);
+			return rmap;
+		}
+		//prodiomac表中已有该SN出货记录的不允许更新
+		SqlRowList rsPim=baseDao.queryForRowSet("select count(1)cn from "+Master+".prodiomac where PIM_INOROUT='OUT' and pim_mac=?",iSN);
+		if(rsPim.next() && rsPim.getInt(1)>0){
+			oErrMessage = "SN:"+iSN+"已存在出货记录,不允许更新";
+			rmap.put("oErrMessage",oErrMessage);
+			return rmap;
+		}
 		Object makecode=baseDao.getFieldDataByCondition(Master+".makeserial","ms_makecode","ms_id=(select max(ms_id) from "+Master+".makeserial where ms_sncode='"+iSN+"')");
 		if(makecode==null){
 			oErrMessage = "SN:"+iSN+"不存在";
@@ -637,6 +651,20 @@ public class MESHelperServiceImpl implements MESHelperService {
 		}
 		String iSN=map.get("iSN").toString();
 		String iHashValue=map.get("iCRBValue").toString();
+		//SN在makeserial表最新一条记录ms_status为2的不允许更新
+		SqlRowList rsMs=baseDao.queryForRowSet("select ms_status from "+Master+".makeserial where ms_id=(select max(ms_id) from "+Master+".makeserial where ms_sncode=?)",iSN);
+		if(rsMs.next() && "2".equals(rsMs.getString("ms_status"))){
+			oErrMessage = "SN:"+iSN+"已完工,不允许更新";
+			rmap.put("oErrMessage",oErrMessage);
+			return rmap;
+		}
+		//prodiomac表中已有该SN出货记录的不允许更新
+		SqlRowList rsPim=baseDao.queryForRowSet("select count(1)cn from "+Master+".prodiomac where PIM_INOROUT='OUT' and pim_mac=?",iSN);
+		if(rsPim.next() && rsPim.getInt(1)>0){
+			oErrMessage = "SN:"+iSN+"已存在出货记录,不允许更新";
+			rmap.put("oErrMessage",oErrMessage);
+			return rmap;
+		}
 		Object makecode=baseDao.getFieldDataByCondition(Master+".makeserial","ms_makecode","ms_id=(select max(ms_id) from "+Master+".makeserial where ms_sncode='"+iSN+"')");
 		if(makecode==null){
 			oErrMessage = "SN:"+iSN+"不存在";
@@ -699,6 +727,20 @@ public class MESHelperServiceImpl implements MESHelperService {
 		}
 		String iSN=map.get("iSN").toString();
 		String iHashValue=map.get("iCRBValue").toString();
+		//SN在makeserial表最新一条记录ms_status为2的不允许更新
+		SqlRowList rsMs=baseDao.queryForRowSet("select ms_status from "+Master+".makeserial where ms_id=(select max(ms_id) from "+Master+".makeserial where ms_sncode=?)",iSN);
+		if(rsMs.next() && "2".equals(rsMs.getString("ms_status"))){
+			oErrMessage = "SN:"+iSN+"在已完工,不允许更新";
+			rmap.put("oErrMessage",oErrMessage);
+			return rmap;
+		}
+		//prodiomac表中已有该SN出货记录的不允许更新
+		SqlRowList rsPim=baseDao.queryForRowSet("select count(1)cn from "+Master+".prodiomac where PIM_INOROUT='OUT' and pim_mac=?",iSN);
+		if(rsPim.next() && rsPim.getInt(1)>0){
+			oErrMessage = "SN:"+iSN+"已存在出货记录,不允许更新";
+			rmap.put("oErrMessage",oErrMessage);
+			return rmap;
+		}
 		Object makecode=baseDao.getFieldDataByCondition(Master+".makeserial","ms_makecode","ms_id=(select max(ms_id) from "+Master+".makeserial where ms_sncode='"+iSN+"')");
 		if(makecode==null){
 			oErrMessage = "SN:"+iSN+"不存在";