Browse Source

切换正式

callm 2 years ago
parent
commit
8c82ab2b93

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

@@ -237,6 +237,9 @@ public class MESHelperServiceImpl implements MESHelperService {
 	@Override
 	public String  UploadSteel(String SteelMeshCode,String scraperCode, String SteelMeshCount, String scraperCount, String datatime) {
 		//判断钢网编号
+		if(SteelMeshCode==null){
+			return "刮刀编号为空";
+		}
 		if(!SteelMeshCode.equals("")&&SteelMeshCode!=null){
 			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+"'");

+ 2 - 2
src/main/resources/application.yml

@@ -2,9 +2,9 @@ spring:
     datasource:
         type: org.apache.tomcat.jdbc.pool.DataSource
         driverClassName: oracle.jdbc.OracleDriver
-        username: N_MES_T
+        username: N_MES
         password: select!#%*(
-        url: jdbc:oracle:thin:@127.0.0.1:1521:orcl
+        url: jdbc:oracle:thin:@10.98.0.21:1521:orcl
     http:
         encoding:
             force: true