Merge remote-tracking branch 'origin/yidao_ciy' into yidao_ciy

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

@@ -234,8 +234,8 @@ public class MESHelperServiceImpl implements MESHelperService {
 			}
 
 			rmap.put("message","SN["+iSN+"]重量为"+weight+",符合重量范围"+obj[0]+"-"+obj[1]+",称重通过");
-			Object ms_id=baseDao.getFieldDataByCondition("makeserial","max(ms_id)","ms_sncode='"+iSN+"'");
-			baseDao.execute("update makeserial set ms_grossw ='"+weight+"' where ms_id="+ms_id);
+			Object ms_id=baseDao.getFieldDataByCondition(Master+".makeserial","max(ms_id)","ms_sncode='"+iSN+"'");
+			baseDao.execute("update "+Master+".makeserial set ms_grossw ='"+weight+"' where ms_id="+ms_id);
 
 			Map<String, String> rmap1 = new HashMap<String, String>();
 			rmap1.put("minWeight",obj[0].toString());