彩盒称重接口添加

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

@@ -236,8 +236,11 @@ public class MESHelperServiceImpl implements MESHelperService {
 			rmap1.put("machineModel","");
 			rmap.put("dataInfo",rmap1);
 			return rmap;
+		}else{
+			oErrMessage = "未设置标准重量";
+			rmap.put("oErrMessage",oErrMessage);
+			return rmap;
 		}
-		return rmap;
 	}
 
 	private Object SetPcbaData(String iSN,String iResCode,String iOperator,String iResult,String Master){
@@ -287,7 +290,7 @@ public class MESHelperServiceImpl implements MESHelperService {
 
 		baseDao.execute("insert into makecbr(MC_ID, MC_MAKECODE, MC_SNCODE, MC_HASHVALUE, MC_INDATE)" +
 					"values(makecbr_seq.nextval,'"+makecode+"','"+iSN+"','"+iHashValue+"',sysdate)");
-
+		rmap.put("oErrMessage",null);
 		return rmap;
 	}