Browse Source

【英唐精密MES】【数据库链接调整】

caosy 6 years ago
parent
commit
8b57fc639a

+ 2 - 2
WebContent/WEB-INF/spring/db-config.xml

@@ -9,10 +9,10 @@
 			<value>oracle.jdbc.driver.OracleDriver</value>
 			<value>oracle.jdbc.driver.OracleDriver</value>
 		</property>
 		</property>
 		<property name="url">
 		<property name="url">
-			<value>jdbc:oracle:thin:@10.1.81.2:1521:orcl</value>
+			<value>jdbc:oracle:thin:@192.168.1.118:1521:orcl</value>
 		</property>
 		</property>
 		<property name="username">
 		<property name="username">
-			<value>UAS_MES</value>
+			<value>MES</value>
 		</property>
 		</property>
 		<property name="password" value="select!#%*(" />
 		<property name="password" value="select!#%*(" />
 	</bean>
 	</bean>

+ 7 - 6
src/com/uas/mes/pda/service/impl/PdaSMTServiceImpl.java

@@ -1855,13 +1855,14 @@ public class PdaSMTServiceImpl implements PdaSMTService {
 						for(Map<String ,Object> mapnow:rs.getResultList()) {
 						for(Map<String ,Object> mapnow:rs.getResultList()) {
 							if (barcode.toString().contains(mapnow.get("psl_prodcode").toString())) {
 							if (barcode.toString().contains(mapnow.get("psl_prodcode").toString())) {
 								pr_code =mapnow.get("psl_prodcode").toString();
 								pr_code =mapnow.get("psl_prodcode").toString();
-							} else {
-								String[] stringArr = mapnow.get("repcode").toString().split(",");
-								for (String s : stringArr) {
-									if (barcode.toString().contains(s)) {
-										pr_code = s;
+							} else {try {
+									String[] stringArr = mapnow.get("repcode").toString().split(",");
+									for (String s : stringArr) {
+										if (barcode.toString().contains(s)) {
+											pr_code = s;
+										}
 									}
 									}
-								}
+								}catch(Exception e){}
 							}
 							}
 						}
 						}
 						if(pr_code == null || ("").equals(pr_code)){
 						if(pr_code == null || ("").equals(pr_code)){