新增对接接口，钢网接口，更新条码数量接口

WebContent/WEB-INF/spring/config.xml

@@ -19,7 +19,7 @@
 	default-autowire="byName">
 	<bean id="baseUtil" class="com.mes.core.BaseUtil"></bean>
 	<util:properties id="about">
-		<prop key="defaultSob">MES</prop><!-- 默认帐套名称 --><!-- 集团中心名称 -->
+		<prop key="defaultSob">MES_ZZ</prop><!-- 默认帐套名称 --><!-- 集团中心名称 -->
 		<prop key="task.status">true</prop>
 	</util:properties>
 	<mvc:resources mapping="/resources/**" location="/resources/" />

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:@192.168.230.200:1521:orcl</value>
 		      <!--<value>jdbc:oracle:thin:@192.168.230.200:1521:orcl</value>  -->
 		</property>
 		<property name="username">
@@ -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:@192.168.230.200:1521:orcl</value>
 		</property>
 		<property name="username">
 			<value>MES_ZZ</value>

n_malatabarcode.iml

@@ -8,6 +8,18 @@
       <src_folder value="file://$MODULE_DIR$/src" expected_position="0" />
     </src_description>
   </component>
+  <component name="FacetManager">
+    <facet type="web" name="Web">
+      <configuration>
+        <descriptors>
+          <deploymentDescriptor name="web.xml" url="file://$MODULE_DIR$/web/WEB-INF/web.xml" />
+        </descriptors>
+        <webroots>
+          <root url="file://$MODULE_DIR$/web" relative="/" />
+        </webroots>
+      </configuration>
+    </facet>
+  </component>
   <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
     <output url="file://$MODULE_DIR$/build/classes" />
     <exclude-output />
@@ -15,8 +27,7 @@
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
     </content>
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="jdk" jdkName="1.7" jdkType="JavaSDK" />
-    <orderEntry type="library" exported="" name="lib" level="project" />
-    <orderEntry type="library" exported="" scope="PROVIDED" name="Tomcat 8.5.24-4" level="application_server_libraries" />
+    <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
+    <orderEntry type="library" name="aopalliance" level="project" />
   </component>
 </module>

src/com/mes/controller/barcode/BarcodeController.java

@@ -13,20 +13,59 @@ import com.mes.service.barcode.BarcodeService;
 
 @Controller
 public class BarcodeController{
-	
+
 	@Autowired
-	private BarcodeService barcodeService; 
-	
+	private BarcodeService barcodeService;
+
 	/**
 	 获取条码信息
 	 */
 	@RequestMapping(value="/getBarcodeData.action",method = RequestMethod.GET)
 	@ResponseBody
-	public Map<String, Object> getBarcodeData (String UID){	
+	public Map<String, Object> getBarcodeData (String UID){
 		Map<String, Object> modelMap = new HashMap<String, Object >();
-		
+
 		modelMap = barcodeService.getBarcodeData(UID);
-		
+
+		return  modelMap;
+	}
+
+	/**
+	 获取条码信息
+	 */
+	@RequestMapping(value="/getStencilUseCount.action",method = RequestMethod.GET)
+	@ResponseBody
+	public Map<String, Object> getStencilUseCount (String barcode){
+		Map<String, Object> modelMap = new HashMap<String, Object >();
+
+		modelMap = barcodeService.getStencilUseCount(barcode);
+
+		return  modelMap;
+	}
+
+	/**
+	 获取条码信息
+	 */
+	@RequestMapping(value="/updateStencilUseCount.action",method = RequestMethod.GET)
+	@ResponseBody
+	public Map<String, Object> updateStencilUseCount (String barcode,String Count){
+		Map<String, Object> modelMap = new HashMap<String, Object >();
+
+		modelMap = barcodeService.updateStencilUseCount(barcode,Count);
+
+		return  modelMap;
+	}
+
+	/**
+	 获取条码信息
+	 */
+	@RequestMapping(value="/updateBarcode.action",method = RequestMethod.GET)
+	@ResponseBody
+	public Map<String, Object> updateBarcode (String barcode,String num){
+		Map<String, Object> modelMap = new HashMap<String, Object >();
+
+		modelMap = barcodeService.updateBarcode(barcode,num);
+
 		return  modelMap;
-	}	
+	}
 }

src/com/mes/dao/MultiDataSource.java

@@ -3,7 +3,9 @@ package com.mes.dao;
 import java.io.PrintWriter;
 import java.sql.Connection;
 import java.sql.SQLException;
+import java.sql.SQLFeatureNotSupportedException;
 import java.util.Properties;
+import java.util.logging.Logger;
 
 import javax.sql.DataSource;
 import org.apache.commons.dbcp.BasicDataSource;
@@ -40,6 +42,11 @@ public class MultiDataSource extends BasicDataSource implements DataSource, Appl
 		return getDataSource().getLoginTimeout();
 	}
 
+	@Override
+	public Logger getParentLogger() throws SQLFeatureNotSupportedException {
+		return null;
+	}
+
 	public void setLogWriter(PrintWriter arg0) throws SQLException {
 		getDataSource().setLogWriter(arg0);
 	}

src/com/mes/service/barcode/BarcodeService.java

@@ -5,5 +5,11 @@ import java.util.Map;
 public interface BarcodeService {
 
 	Map<String, Object> getBarcodeData(String barcode);
-	
+
+	Map<String, Object> getStencilUseCount(String barcode);
+
+	Map<String, Object> updateStencilUseCount(String barcode,String Count);
+
+	Map<String, Object> updateBarcode(String barcode,String Num);
+
 }

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

@@ -19,7 +19,7 @@ public class BarcodeServiceImpl implements BarcodeService {
 		Map<String, Object> map = new HashMap<String, Object>();
 		String master = null;
 		SqlRowList rs = baseDao.queryForRowSet("select getBarcode('"+barcode+"') master from dual");
-		
+
 		if(rs.next() && rs.getString("master") != null && !("").equals(rs.getString("master"))){
 			master = rs.getString("master");
 		}else{
@@ -27,7 +27,7 @@ public class BarcodeServiceImpl implements BarcodeService {
 			return map;
 		}
 		String master1 = "N_MALATA_ZZ";
-		
+
 		if("MES_LINK".equals(master)){
 			master1 = "N_MALATA";
 		}else if("MES_ZZ".equals(master)){
@@ -36,7 +36,7 @@ public class BarcodeServiceImpl implements BarcodeService {
 		rs = baseDao.queryForRowSet(" select bar_status,bar_code,to_char(ba_date,'yyyy-MM-dd HH:mm:ss') ba_date," +
 				"to_char(bar_recorddate,'yyyy-MM-dd HH:mm:ss')  bar_recorddate,bar_remain,pr_detail,bar_madedate," +
 				"bar_vendbarcode,bar_made,pr_spec,bar_batchcode,bar_prodcode " +
-				"from "+master+".barcode left join "+master+".product on pr_code = bar_prodcode " +
+				"from barcode@"+master+" left join product@+"+master+" on pr_code = bar_prodcode " +
 				"left join batch@"+master1+" on ba_code=bar_batchcode where bar_code=?",barcode);
 		if(rs.next()){
 			map.put("partNumber", rs.getString("bar_prodcode"));
@@ -52,4 +52,70 @@ public class BarcodeServiceImpl implements BarcodeService {
 		return map;
 	}
 
+	@Override
+	public Map<String, Object> getStencilUseCount(String barcode) {
+		Map<String, Object> map = new HashMap<String, Object>();
+		SqlRowList rs = baseDao.queryForRowSet("select * from stencil where st_code='"+barcode+"'");
+		if(rs.next()){
+			map.put("code",rs.getString("st_code"));
+			map.put("name",rs.getString("st_name"));
+			map.put("usecount",rs.getString("st_usecount"));
+			map.put("version",rs.getString("st_version"));
+			map.put("ensiona",rs.getString("st_ensiona"));
+			map.put("ensionb",rs.getString("st_ensionb"));
+			map.put("ensionc",rs.getString("st_ensionc"));
+			map.put("ensiond",rs.getString("st_ensiond"));
+			map.put("ensione",rs.getString("st_ensione"));
+			map.put("table",rs.getString("st_table"));
+			map.put("pcbcode",rs.getString("st_pcbcode"));
+			map.put("remark",rs.getString("st_remark"));
+			map.put("maxusecount",rs.getString("st_maxusecount"));
+		}
+		return map;
+	}
+
+	@Override
+	public Map<String, Object> updateStencilUseCount(String barcode,String count) {
+		Map<String, Object> map = new HashMap<String, Object>();
+		SqlRowList rs = baseDao.queryForRowSet("select * from stencil where st_code='"+barcode+"'");
+		//查询到了钢网信息
+		if(rs.next()){
+			map.put("barcode",barcode);
+			map.put("beforeupdate",rs.getString("st_usecount"));
+			try{
+				baseDao.execute("update stencil set st_usecount=nvl(st_usecount,0)+"+count+" where st_code='"+barcode+"'");
+				map.put("count",count) ;
+				map.put("afterupdate",Integer.parseInt(rs.getString("st_usecount"))+Integer.parseInt(count)) ;
+			}
+			catch(Exception e) {
+				map.put("Error",e.getMessage());
+			};
+		}else
+		{
+			map.put("Error","钢网"+barcode+"不存在");
+		}
+		return map;
+	}
+
+	@Override
+	public Map<String, Object> updateBarcode(String barcode,String num) {
+		Map<String, Object> map = new HashMap<String, Object>();
+		SqlRowList rs = baseDao.queryForRowSet("select bar_code,bar_remain from barcode where bar_code='"+barcode+"'");
+		//查询到了钢网信息
+		if(rs.next()){
+			map.put("barcode",barcode);
+			map.put("beforeupdate",rs.getString("bar_remain"));
+			try{
+				baseDao.execute("update barcode set bar_remain="+num+" where bar_code='"+barcode+"'");
+				map.put("afterupdate",baseDao.getFieldDataByCondition("barcode","bar_remain","bar_code='"+barcode+"'")) ;
+			}
+			catch(Exception e) {
+				map.put("Error",e.getMessage());
+			};
+		}else
+		{
+			map.put("Error","条码"+barcode+"不存在");
+		}
+		return map;
+	}
 }