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

# Conflicts:
#	src/main/java/com/uas/eis/serviceImpl/MESHelperServiceImpl.java

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

@@ -236,20 +236,18 @@ public class MESHelperServiceImpl implements MESHelperService {
 
 	@Override
 	public String  UploadSteel(String SteelMeshCode,String scraperCode, String SteelMeshCount, String scraperCount, String datatime) {
+		String err = CheckSteel(SteelMeshCode);
 		//判断钢网编号
-		if(SteelMeshCode==null){
-			return "刮刀编号为空";
-		}
-		if(!SteelMeshCode.equals("")&&SteelMeshCode!=null){
+		if(SteelMeshCode!=null&&!"".equals(SteelMeshCode)){
 			baseDao.execute("insert into devicetestinfo(DTI_ID, DTI_SNCODE,DTI_TESTQTY, DTI_MACHINETYPE, DTI_TYPE, DTI_TIME, DTI_SOURCECONTENT)values(devicetestinfo_seq.nextval,'"+scraperCode+"','"+scraperCount+"','钢网','钢网',to_date('"+datatime+"','yyyy-mm-dd hh24:mi:ss'),'')");
 			baseDao.execute("update stencil set  st_usecount=nvl(st_usecount,0)+"+scraperCount +" where st_code='"+SteelMeshCode+"'");
 		}
 		//判断刮刀编号
-		if(!scraperCode.equals("")&&scraperCode!=null){
+		if(scraperCode!=null&&!"".equals(scraperCode)){
 			baseDao.execute("insert into devicetestinfo(DTI_ID, DTI_SNCODE,DTI_TESTQTY, DTI_MACHINETYPE, DTI_TYPE, DTI_TIME, DTI_SOURCECONTENT)values(devicetestinfo_seq.nextval,'"+scraperCode+"','"+scraperCount+"','刮刀','刮刀',to_date('"+datatime+"','yyyy-mm-dd hh24:mi:ss'),'')");
 			baseDao.execute("update stencil set  st_usecount=nvl(st_usecount,0)+"+scraperCount +" where st_code='"+scraperCode+"'");
 		}
-		return "";
+		return err;
 	}
 
 	@Override