Browse Source

添加点料机接口

callm 9 months ago
parent
commit
9e07a979f6

+ 7 - 0
src/main/java/com/uas/eis/controller/MESHelperController.java

@@ -90,6 +90,13 @@ public class MESHelperController {
         return 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="/Radium")
     public Map<Object,Object> Radium(HttpServletRequest request,  @RequestBody String json){

+ 2 - 0
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);

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

@@ -656,6 +656,48 @@ public class MESHelperServiceImpl implements MESHelperService {
 		return time.replaceAll("T"," ").substring(0,19);
 	}
 
+	@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 from barcode@ERP where bar_code=?",ReelId);
+		if(rs.next()){
+			baseDao.execute("update barcode@ERP set bar_remain=? where bar_id=?",Quantity,rs.getString("bar_id"));
+			baseDao.execute("insert into barcodechange@ERP(BC_ID,BC_INDATE, BC_REASON, BC_QTY, BC_BARCODE,  BC_PRODCODE, BC_NEWQTY)" +
+					"values(barcodechange_seq.nextval@erp,sysdate,'点料机更新条码数量',?,?,?,?)",rs.getString("bar_remain"),ReelId,rs.getString("bar_prodcode"),Quantity);
+			rmap.put("Status","OK");
+			rmap.put("Meassage","通过");
+			rmap.put("PN","");
+			rmap.put("MPN","");
+			rmap.put("DataCode","");
+		}else {
+			rmap.put("Status","NG");
+			rmap.put("Meassage","条码不存在");
+			return rmap;
+		}
+		return rmap;
+	}
+
 	@Override
 	public Map<Object,Object> Weigh(String data) {
 		Map<Object, Object> rmap = new HashMap<Object, Object>();