修改电料机数据返回

Signed-off-by: zhangzheng <zhangz@usoftchina.com>

WebContent/WEB-INF/spring/config.xml

@@ -17,7 +17,7 @@
            http://www.springframework.org/schema/util 
            http://www.springframework.org/schema/util/spring-util.xsd"
 	default-autowire="byName">
-	<bean id="baseUtil" class="com.mes.core.BaseUtil"></bean>
+	<bean id="BaseUtil" class="com.mes.core.BaseUtil"></bean>
 	<util:properties id="about">
 		<prop key="defaultSob">MES</prop><!-- 默认帐套名称 --><!-- 集团中心名称 -->
 		<prop key="task.status">true</prop>
@@ -69,13 +69,13 @@
 		<property name="maxUploadSize" value="104857600" />
 	</bean>
 	
-	<!-- 自定义拦截器 -->
+	<!-- 自定义拦截器
 	<mvc:interceptors>
 		<mvc:interceptor>
 			<mvc:mapping path="/*/**"></mvc:mapping>
-			<bean class="com.mes.core.interceptor.DbSourceInterceptor"></bean><!-- MultiDataSource Interceptor -->
+			<bean class="com.mes.core.interceptor.DbSourceInterceptor"></bean>
 		</mvc:interceptor>
-	</mvc:interceptors>
+	</mvc:interceptors>-->
 	
 	
 	<mvc:annotation-driven />

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

@@ -9,7 +9,7 @@
 			<value>oracle.jdbc.driver.OracleDriver</value>
 		</property>
 		<property name="url">
-          <value>jdbc:oracle:thin:@117.25.180.218:1521:orcl</value>
+          <value>jdbc:oracle:thin:@127.0.0.1:1521:orcl</value>
 			<!--   <value>jdbc:oracle:thin:@192.168.230.200:1521:orcl</value>-->
         </property>
         <property name="username">
@@ -24,7 +24,7 @@
         </property>
         <property name="url">
             <!-- <value>jdbc:oracle:thin:@117.25.180.218:1521:orcl</value> -->
-			 <value>jdbc:oracle:thin:@192.168.230.200:1521:orcl</value>
+			 <value>jdbc:oracle:thin:@127.0.0.1:1521:orcl</value>
 		</property>
 		<property name="username">
 			<value>MES_TEST</value>
@@ -38,7 +38,7 @@
 		</property>
 		<property name="url">
 			<!-- <value>jdbc:oracle:thin:@117.25.180.218:1521:orcl</value> -->
-			 <value>jdbc:oracle:thin:@192.168.230.200:1521:orcl</value>
+			 <value>jdbc:oracle:thin:@127.0.0.1:1521:orcl</value>
 		</property>
 		<property name="username">
 			<value>MES_ZZ</value>

src/com/mes/core/interceptor/DbSourceInterceptor.java

@@ -23,8 +23,8 @@ public class DbSourceInterceptor extends HandlerInterceptorAdapter {
 	 * 处理前台请求之前执行
 	 */
 	@Override
-	public boolean preHandle(HttpServletRequest req, HttpServletResponse resp, Object handler) throws Exception {		
-		Object obj = req.getSession().getAttribute("employee");				
+	public boolean preHandle(HttpServletRequest req, HttpServletResponse resp, Object handler) throws Exception {
+		Object obj = req.getSession().getAttribute("employee");
 		String sessionId = req.getParameter("sessionId");
 		if (obj == null && sessionId != null){
 			if (MobileSessionContext.getInstance().getSessionById(sessionId) != null) {
@@ -51,7 +51,8 @@ public class DbSourceInterceptor extends HandlerInterceptorAdapter {
 		} else{
 			/*BaseUtil.showError("请先登录ERP再进行相关操作");
 			return false;*/
-		}
+			}
+
 		return true;
 	}
 

src/com/mes/service/barcode/impl/BarcodeServiceImpl.java

@@ -103,11 +103,9 @@ public class BarcodeServiceImpl implements BarcodeService {
 		SqlRowList rs = baseDao.queryForRowSet("select bar_code,bar_remain from barcode@MES_ZZ where bar_code='"+barcode+"'");
 		//查询到了钢网信息
 		if(rs.next()){
-			map.put("barcode",barcode);
-			map.put("beforeupdate",rs.getString("bar_remain"));
 			try{
 				baseDao.execute("update barcode@MES_ZZ set bar_remain="+num+" where bar_code='"+barcode+"'");
-				map.put("afterupdate",baseDao.getFieldDataByCondition("barcode@MES_ZZ","bar_remain","bar_code='"+barcode+"'")) ;
+				map.put("Result","True") ;
 			}
 			catch(Exception e) {
 				map.put("Error",e.getMessage());