Browse Source

修改BUG

callm 2 months ago
parent
commit
b53865d5a1

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

@@ -943,8 +943,8 @@ public class MESHelperServiceImpl implements MESHelperService {
 		}
 		//之前有获取过的
 		SqlRowList rs=baseDao.queryForRowSet("select * from "+Master+".makeinfodet left join "+Master+".MakeRemark on MID_ORDERCODE=ordernumber " +
-				"left join aftersaledet on asd_sn=mid_sn left join DeliveryIn on DeliveryIn.sn=mid_sn " +
-				"left join Deliveryout on Deliveryout.sn=mid_sn left join remakedet  on mid_sn=RMD_SN where mid_ordercode='"+iMakecode+"' and rownum=1");
+				"left join "+Master+".aftersaledet on asd_sn=mid_sn left join "+Master+".DeliveryIn on "+Master+".DeliveryIn.sn=mid_sn " +
+				"left join "+Master+".Deliveryout on "+Master+".Deliveryout.sn=mid_sn left join "+Master+".remakedet  on mid_sn=RMD_SN where mid_ordercode='"+iMakecode+"' and rownum=1");
 		if(rs.next()){
 			rmap.put("MID_ID","");
 			rmap.put("MID_MIID",rs.getString("MID_MIID"));

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

@@ -4,7 +4,7 @@ spring:
         driverClassName: oracle.jdbc.OracleDriver
         username: YD_CYZZ
         password: select!#%*(
-        url: jdbc:oracle:thin:@113.98.196.181:1521:orcl
+        url: jdbc:oracle:thin:@192.168.0.85:1521:orcl
         initialSize: 1
         maxActive: 3
         maxWait: 30000
@@ -33,7 +33,6 @@ server:
         uri_encoding: UTF-8
     context-path:
         /EIS
-
 logging:
   level:
     org: