update 点料机接口

src/main/java/com/uas/eis/controller/MESHelperController.java

@@ -39,6 +39,14 @@ public class MESHelperController {
         return ApiResponse.successRsp(requestId,map);
     }
 
+    // 点料机接口
+    @RequestMapping(value="/UploadReelInfo")
+    public Map<Object,Object> UploadReelInfo(HttpServletRequest request,  @RequestBody String json){
+        Map<String, Object> modelMap = new HashMap<String, Object>();
+        Map<Object,Object> map = mesHelperService.UploadReelInfo(json);
+        return map;
+    }
+
     //抛料数据接口
     @RequestMapping(value="/StateEventDetail")
     public Map<Object,Object> StateEventDetail(HttpServletRequest request,  @RequestBody String json){

src/main/java/com/uas/eis/core/support/MesHelperApiLoginInterceptor.java

@@ -33,7 +33,7 @@ public class MesHelperApiLoginInterceptor extends HandlerInterceptorAdapter {
 
 
     public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
-        String accessKey = "N_MES";
+        String accessKey = "N_MES_ZS";
         String accessSecret = "394thg9egn8e9g";
         String requestId = request.getHeader(RequestId);
 

src/main/java/com/uas/eis/service/MESHelperService.java

@@ -11,6 +11,8 @@ public interface MESHelperService {
 
 	Map<Object, Object> Weigh(String data);
 
+	Map<Object, Object> UploadReelInfo(String data);
+
 	Map<Object, Object> SetupResultDataInterface(String data);
 
 	Map<Object, Object> TraceabilityDataInterface(String data);

src/main/java/com/uas/eis/serviceImpl/MESHelperServiceImpl.java

@@ -768,6 +768,51 @@ public class MESHelperServiceImpl implements MESHelperService {
 		return rmap;
 	}
 
+	@Override
+	public Map<Object,Object> UploadReelInfo(String data) {
+		Map<Object, Object> rmap = new HashMap<Object, Object>();
+		String oErrMessage="";
+		String ReelId="";
+		String Quantity="";
+		Map<String, Object> map=null;
+		try{
+			map =BaseUtil.convertJsonToMap(data);
+		}catch (Exception e){
+			System.out.printf(e.getMessage()) ;
+		}
+		if(map.get("ReelId")==null){
+			rmap.put("Status","NG");
+			rmap.put("Meassage","料盘ID不能为空");
+			return rmap;
+		}
+		if(map.get("Quantity")==null){
+			rmap.put("Status","NG");
+			rmap.put("Meassage","数量不能为空");
+			return rmap;
+		}
+		ReelId=map.get("ReelId").toString();
+		Quantity=map.get("Quantity").toString();
+		SqlRowList rs=baseDao.queryForRowSet("select bar_id,bar_prodcode,bar_remain,pr_spec,to_char(nvl(bar_madedate,sysdate),'yyyy-mm-dd')bar_madedate from barcode@ERP_JMDZ_HF left join product on bar_prodcode = pr_code where bar_code=?",ReelId);
+		if(rs.next()){
+			baseDao.execute("update barcode@ERP_JMDZ_HF set bar_remain=?,bar_status = 2 where bar_id=?",Quantity,rs.getString("bar_id"));
+			baseDao.execute("insert into barcodechange@ERP_JMDZ_HF(BC_ID,BC_INDATE, BC_REASON, BC_QTY, BC_BARCODE,  BC_PRODCODE, BC_NEWQTY)" +
+					"values(barcodechange_seq.nextval@ERP_JMDZ_HF,sysdate,'点料机更新条码数量',?,?,?,?)",rs.getString("bar_remain"),ReelId,rs.getString("bar_prodcode"),Quantity);
+			baseDao.execute("update barcode set bar_remain=?,bar_status = 1,bar_outno = '' where bar_code=?",Quantity,ReelId);
+			baseDao.execute("insert into barcodechange(BC_ID,BC_INDATE, BC_REASON, BC_QTY, BC_BARCODE,  BC_PRODCODE, BC_NEWQTY)" +
+					"values(barcodechange_seq.nextval,sysdate,'点料机更新条码数量',?,?,?,?)",rs.getString("bar_remain"),ReelId,rs.getString("bar_prodcode"),Quantity);
+			rmap.put("Status","OK");
+			rmap.put("Meassage","通过");
+			rmap.put("PN",rs.getString("bar_prodcode"));
+			rmap.put("MPN",rs.getString("pr_spec"));
+			rmap.put("DataCode",rs.getString("bar_madedate"));
+		}else {
+			rmap.put("Status","NG");
+			rmap.put("Meassage","条码不存在");
+			return rmap;
+		}
+		return rmap;
+	}
+
 	@Override
 	public Map<Object,Object> DLLMain(String accessKey, String requestId, String data) {
 		String AE_MASTER = "N_MES";
@@ -1779,18 +1824,6 @@ public class MESHelperServiceImpl implements MESHelperService {
 
 
 
-	private String checkAccessKey(String accessKey,String requestId){
-		Object accessSecret_O = baseDao.getFieldDataByCondition("APIEMPLOYEE", "AE_SECRET", "AE_KEY='" + accessKey + "'");
-		Object AE_MASTER = baseDao.getFieldDataByCondition("APIEMPLOYEE", "AE_MASTER", "AE_KEY='" + accessKey + "'");
-		String accessSecret = accessSecret_O == null ? "" : accessSecret_O.toString();
-		// 检查KEY是否合理
-		if (StringUtils.isEmpty(accessKey) || StringUtils.isEmpty(accessSecret) || AE_MASTER== null || "".equals(AE_MASTER.toString())) {
-			ApiResult apiResult = new ApiResult(ErrorMessage.ACCESSKEY_ILLEGAL.getCode(),ErrorMessage.ACCESSKEY_ILLEGAL.getMessage(),requestId);
-			throw new ApiSystemException(apiResult);
-		}
-		return AE_MASTER.toString();
-	}
-
 	@Override
 	public Map<Object,Object> getMESSnCode(String data) {
 		Map<String, Object> map=null;

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
+        username: N_MES_ZS
         password: select!#%*(
-        url: jdbc:oracle:thin:@10.98.0.21:1521:orcl
+        url: jdbc:oracle:thin:@127.0.0.1:1521:orcl
     http:
         encoding:
             force: true