调整写入MES中间表数据接口

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

@@ -8,6 +8,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+import java.util.Map;
 
 /**
  * @author xiaost
@@ -26,11 +28,11 @@ public class MESDataController {
      * @return
      */
     @RequestMapping("/api/mes/snStepPass")
-    public ApiResult<String> snStepPass(HttpServletRequest request, String data){
+    public ApiResult<List<Map<Object,Object>>> snStepPass(HttpServletRequest request, String data){
         String accessKey = request.getHeader("AccessKey");
         String requestId = request.getHeader("RequestId");
-        mesDataService.snStepPass(accessKey,requestId,data);
-        return ApiResponse.successRsp("0",requestId,"Success");
+        List<Map<Object,Object>> list = mesDataService.snStepPass(accessKey,requestId,data);
+        return ApiResponse.successRsp("0",requestId,"Success",list);
     }
 
     /**
@@ -39,11 +41,11 @@ public class MESDataController {
      * @return
      */
     @RequestMapping("/api/mes/snInfo")
-    public ApiResult<String> snInfo(HttpServletRequest request, String data){
+    public ApiResult<List<Map<Object,Object>>> snInfo(HttpServletRequest request, String data){
         String accessKey = request.getHeader("AccessKey");
         String requestId = request.getHeader("RequestId");
-        mesDataService.snInfo(accessKey,requestId,data);
-        return ApiResponse.successRsp("0",requestId,"Success");
+        List<Map<Object,Object>> list = mesDataService.snInfo(accessKey,requestId,data);
+        return ApiResponse.successRsp("0",requestId,"Success",list);
     }
 
     /**
@@ -52,11 +54,11 @@ public class MESDataController {
      * @return
      */
     @RequestMapping("/api/mes/makeSnRelation")
-    public ApiResult<String> makeSnRelation(HttpServletRequest request, String data){
+    public ApiResult<List<Map<Object,Object>>> makeSnRelation(HttpServletRequest request, String data){
         String accessKey = request.getHeader("AccessKey");
         String requestId = request.getHeader("RequestId");
-        mesDataService.makeSnRelation(accessKey,requestId,data);
-        return ApiResponse.successRsp("0",requestId,"Success");
+        List<Map<Object,Object>> list = mesDataService.makeSnRelation(accessKey,requestId,data);
+        return ApiResponse.successRsp("0",requestId,"Success",list);
     }
 
     /**
@@ -65,11 +67,11 @@ public class MESDataController {
      * @return
      */
     @RequestMapping("/api/mes/makeBad")
-    public ApiResult<String> makeBad(HttpServletRequest request, String data){
+    public ApiResult<List<Map<Object,Object>>> makeBad(HttpServletRequest request, String data){
         String accessKey = request.getHeader("AccessKey");
         String requestId = request.getHeader("RequestId");
-        mesDataService.MAKEBAD(accessKey,requestId,data);
-        return ApiResponse.successRsp("0",requestId,"Success");
+        List<Map<Object,Object>> list = mesDataService.MAKEBAD(accessKey,requestId,data);
+        return ApiResponse.successRsp("0",requestId,"Success",list);
     }
 
     /**
@@ -78,11 +80,25 @@ public class MESDataController {
      * @return
      */
     @RequestMapping("/api/mes/makeBadReason")
-    public ApiResult<String> makeBadReason(HttpServletRequest request, String data){
+    public ApiResult<List<Map<Object,Object>>> makeBadReason(HttpServletRequest request, String data){
         String accessKey = request.getHeader("AccessKey");
         String requestId = request.getHeader("RequestId");
-        mesDataService.makeBadReason(accessKey,requestId,data);
-        return ApiResponse.successRsp("0",requestId,"Success");
+        List<Map<Object,Object>> list = mesDataService.makeBadReason(accessKey,requestId,data);
+        return ApiResponse.successRsp("0",requestId,"Success",list);
     }
 
+    /**
+     * 包装信息
+     * @param data
+     * @return
+     */
+    @RequestMapping("/api/mes/package")
+    public ApiResult<List<Map<Object,Object>>> packageDetail(HttpServletRequest request, String data){
+        String accessKey = request.getHeader("AccessKey");
+        String requestId = request.getHeader("RequestId");
+        List<Map<Object,Object>> list = mesDataService.packageDetail(accessKey,requestId,data);
+        return ApiResponse.successRsp("0",requestId,"Success",list);
+    }
+
+
 }

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

@@ -1,14 +1,19 @@
 package com.uas.eis.service;
 
+import java.util.List;
+import java.util.Map;
+
 public interface MESDataService {
 
-	public String snStepPass(String accessKey, String requestId, String data);
+	List<Map<Object,Object>> snStepPass(String accessKey, String requestId, String data);
+
+	List<Map<Object,Object>> snInfo(String accessKey, String requestId, String data);
 
-	public void snInfo(String accessKey, String requestId, String data);
+	List<Map<Object,Object>> makeSnRelation(String accessKey, String requestId, String data);
 
-	public void makeSnRelation(String accessKey, String requestId, String data);
+	List<Map<Object,Object>> MAKEBAD(String accessKey, String requestId, String data);
 
-	public void MAKEBAD(String accessKey, String requestId, String data);
+	List<Map<Object,Object>> makeBadReason(String accessKey, String requestId, String data);
 
-	public void makeBadReason(String accessKey, String requestId, String data);
+	List<Map<Object,Object>> packageDetail(String accessKey, String requestId, String data);
 }

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

@@ -17,6 +17,8 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import java.sql.Timestamp;
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -30,79 +32,215 @@ public class MESDataServiceImpl implements MESDataService {
 	private String username;
 
 	@Override
-	public String snStepPass(String accessKey, String requestId, String data) {
+	public List<Map<Object,Object>> snStepPass(String accessKey, String requestId, String data) {
 		String AE_MASTER = checkAccessKey(accessKey, requestId);
 		List<Map<Object, Object>> maps = BaseUtil.parseGridStoreToMaps(data);
+		SpObserver.putSp(AE_MASTER);
+		List<Map<Object, Object>> relist = new ArrayList<>();
 		for (Map<Object, Object> map : maps) {
-			map.put("T_STATUS","W");
+			Map<Object, Object> remap = new HashMap<>();
+			String remark = "";
+			int cn = baseDao.getJdbcTemplate().queryForObject("select count(1) from TEMP_STEPPASSED where sp_id=? and nvl(t_status,'W')='W' ",Integer.class,map.get("SP_ID"));
+			remap.put("id",map.get("SP_ID"));
+			if(cn>0){
+				map.put("T_STATUS","D");
+				map.put("T_REMAKR","重复");
+				remark = "重复";
+			}else{
+				map.put("T_STATUS","W");
+			}
 			map.put("T_KEY",accessKey);
 			map.put("T_INDATE", Timestamp.valueOf(DateUtil.currentDateString(Constant.YMD_HMS)));
+			try {
+				baseDao.execute(SqlUtil.getInsertSqlByMap(map,"TEMP_STEPPASSED"));
+				remap.put("result","OK");
+				remap.put("remark",remark);
+			}catch (Exception e){
+				remap.put("result","NG");
+				remap.put("remark",e.getMessage());
+				e.printStackTrace();
+			}
+			relist.add(remap);
 		}
-		SpObserver.putSp(AE_MASTER);
-		baseDao.execute(SqlUtil.getInsertSqlbyGridStore(maps, "TEMP_STEPPASSED"));
-		baseDao.execute("update temp_steppassed set t_status='D',T_REMAKR='重复' where t_id in (select t_id from (select temp_steppassed.*,row_number()over(partition by sp_id order by t_id desc) cn from temp_steppassed where nvl(t_status,'W')='W' ) where cn>1)");
+		//baseDao.execute(SqlUtil.getInsertSqlbyGridStore(maps, "TEMP_STEPPASSED"));
+		//baseDao.execute("update temp_steppassed set t_status='D',T_REMAKR='重复' where t_id in (select t_id from (select temp_steppassed.*,row_number()over(partition by sp_id order by t_id desc) cn from temp_steppassed where nvl(t_status,'W')='W' ) where cn>1)");
 		SpObserver.putSp(username);
-		return null;
+		return relist;
 	}
 
 	@Override
-	public void snInfo(String accessKey, String requestId, String data) {
+	public List<Map<Object,Object>> snInfo(String accessKey, String requestId, String data) {
 		String AE_MASTER = checkAccessKey(accessKey, requestId);
 		List<Map<Object, Object>> maps = BaseUtil.parseGridStoreToMaps(data);
+		SpObserver.putSp(AE_MASTER);
+		List<Map<Object, Object>> relist = new ArrayList<>();
 		for (Map<Object, Object> map : maps) {
-			map.put("T_STATUS","W");
+			Map<Object, Object> remap = new HashMap<>();
+			String remark = "";
+			int cn = baseDao.getJdbcTemplate().queryForObject("select count(1) from TEMP_SNINFO where SI_ID=? and nvl(t_status,'W')='W' ",Integer.class,map.get("SI_ID"));
+			remap.put("id",map.get("SI_ID"));
+			if(cn>0){
+				map.put("T_STATUS","D");
+				map.put("T_REMAKR","重复");
+				remark = "重复";
+			}else{
+				map.put("T_STATUS","W");
+			}
 			map.put("T_KEY",accessKey);
 			map.put("T_INDATE", Timestamp.valueOf(DateUtil.currentDateString(Constant.YMD_HMS)));
+			try {
+				baseDao.execute(SqlUtil.getInsertSqlByMap(map,"TEMP_SNINFO"));
+				remap.put("result","OK");
+				remap.put("remark",remark);
+			}catch (Exception e){
+				remap.put("result","NG");
+				remap.put("remark",e.getMessage());
+				e.printStackTrace();
+			}
+			relist.add(remap);
 		}
-		SpObserver.putSp(AE_MASTER);
-		baseDao.execute(SqlUtil.getInsertSqlbyGridStore(maps, "TEMP_MAKEBAD"));
-		baseDao.execute("update temp_snInfo set t_status='D',T_REMAKR='重复' where t_id in (select t_id from (select temp_snInfo.*,row_number()over(partition by si_id order by t_id desc) cn from temp_snInfo where nvl(t_status,'W')='W' ) where cn>1)");
 		SpObserver.putSp(username);
+		return relist;
 	}
 
 	@Override
-	public void makeSnRelation(String accessKey, String requestId, String data) {
+	public List<Map<Object,Object>> makeSnRelation(String accessKey, String requestId, String data) {
 		String AE_MASTER = checkAccessKey(accessKey, requestId);
 		List<Map<Object, Object>> maps = BaseUtil.parseGridStoreToMaps(data);
+		SpObserver.putSp(AE_MASTER);
+		List<Map<Object, Object>> relist = new ArrayList<>();
 		for (Map<Object, Object> map : maps) {
-			map.put("T_STATUS","W");
+			Map<Object, Object> remap = new HashMap<>();
+			String remark = "";
+			int cn = baseDao.getJdbcTemplate().queryForObject("select count(1) from TEMP_MAKESNRELATION where ID=? and nvl(t_status,'W')='W' ",Integer.class,map.get("ID"));
+			remap.put("id",map.get("ID"));
+			if(cn>0){
+				map.put("T_STATUS","D");
+				map.put("T_REMAKR","重复");
+				remark = "重复";
+			}else{
+				map.put("T_STATUS","W");
+			}
 			map.put("T_KEY",accessKey);
 			map.put("T_INDATE", Timestamp.valueOf(DateUtil.currentDateString(Constant.YMD_HMS)));
+			try {
+				baseDao.execute(SqlUtil.getInsertSqlByMap(map,"TEMP_MAKESNRELATION"));
+				remap.put("result","OK");
+				remap.put("remark",remark);
+			}catch (Exception e){
+				remap.put("result","NG");
+				remap.put("remark",e.getMessage());
+				e.printStackTrace();
+			}
+			relist.add(remap);
 		}
-		SpObserver.putSp(AE_MASTER);
-		baseDao.execute(SqlUtil.getInsertSqlbyGridStore(maps, "TEMP_MAKESNRELATION"));
-		baseDao.execute("update TEMP_MAKESNRELATION set t_status='D',T_REMAKR='重复' where t_id in (select t_id from (select TEMP_MAKESNRELATION.*,row_number()over(partition by id order by t_id desc) cn from TEMP_MAKESNRELATION where nvl(t_status,'W')='W' ) where cn>1)");
 		SpObserver.putSp(username);
+		return relist;
 	}
 
 	@Override
-	public void MAKEBAD(String accessKey, String requestId, String data) {
+	public List<Map<Object,Object>> MAKEBAD(String accessKey, String requestId, String data) {
 		String AE_MASTER = checkAccessKey(accessKey, requestId);
 		List<Map<Object, Object>> maps = BaseUtil.parseGridStoreToMaps(data);
+		SpObserver.putSp(AE_MASTER);
+		List<Map<Object, Object>> relist = new ArrayList<>();
 		for (Map<Object, Object> map : maps) {
-			map.put("T_STATUS","W");
+			Map<Object, Object> remap = new HashMap<>();
+			String remark = "";
+			int cn = baseDao.getJdbcTemplate().queryForObject("select count(1) from TEMP_MAKEBAD where MB_ID=? and nvl(t_status,'W')='W' ",Integer.class,map.get("MB_ID"));
+			remap.put("id",map.get("MB_ID"));
+			if(cn>0){
+				map.put("T_STATUS","D");
+				map.put("T_REMAKR","重复");
+				remark = "重复";
+			}else{
+				map.put("T_STATUS","W");
+			}
 			map.put("T_KEY",accessKey);
 			map.put("T_INDATE", Timestamp.valueOf(DateUtil.currentDateString(Constant.YMD_HMS)));
+			try {
+				baseDao.execute(SqlUtil.getInsertSqlByMap(map,"TEMP_MAKEBAD"));
+				remap.put("result","OK");
+				remap.put("remark",remark);
+			}catch (Exception e){
+				remap.put("result","NG");
+				remap.put("remark",e.getMessage());
+				e.printStackTrace();
+			}
+			relist.add(remap);
 		}
-		SpObserver.putSp(AE_MASTER);
-		baseDao.execute(SqlUtil.getInsertSqlbyGridStore(maps, "TEMP_MAKEBAD"));
-		baseDao.execute("update TEMP_MAKEBAD set t_status='D',T_REMAKR='重复' where t_id in (select t_id from (select TEMP_MAKEBAD.*,row_number()over(partition by mb_id order by t_id desc) cn from TEMP_MAKEBAD where nvl(t_status,'W')='W' ) where cn>1)");
 		SpObserver.putSp(username);
+		return relist;
 	}
 
 	@Override
-	public void makeBadReason(String accessKey, String requestId, String data) {
+	public List<Map<Object,Object>> makeBadReason(String accessKey, String requestId, String data) {
 		String AE_MASTER = checkAccessKey(accessKey, requestId);
 		List<Map<Object, Object>> maps = BaseUtil.parseGridStoreToMaps(data);
+		SpObserver.putSp(AE_MASTER);
+		List<Map<Object, Object>> relist = new ArrayList<>();
 		for (Map<Object, Object> map : maps) {
-			map.put("T_STATUS","W");
+			Map<Object, Object> remap = new HashMap<>();
+			String remark = "";
+			int cn = baseDao.getJdbcTemplate().queryForObject("select count(1) from TEMP_MAKEBADREASON where MBR_ID=? and nvl(t_status,'W')='W' ",Integer.class,map.get("MBR_ID"));
+			remap.put("id",map.get("MBR_ID"));
+			if(cn>0){
+				map.put("T_STATUS","D");
+				map.put("T_REMAKR","重复");
+				remark = "重复";
+			}else{
+				map.put("T_STATUS","W");
+			}
 			map.put("T_KEY",accessKey);
 			map.put("T_INDATE", Timestamp.valueOf(DateUtil.currentDateString(Constant.YMD_HMS)));
+			try {
+				baseDao.execute(SqlUtil.getInsertSqlByMap(map,"TEMP_MAKEBADREASON"));
+				remap.put("result","OK");
+				remap.put("remark",remark);
+			}catch (Exception e){
+				remap.put("result","NG");
+				remap.put("remark",e.getMessage());
+				e.printStackTrace();
+			}
+			relist.add(remap);
 		}
+		SpObserver.putSp(username);
+		return relist;
+	}
+
+	@Override
+	public List<Map<Object,Object>> packageDetail(String accessKey, String requestId, String data) {
+		String AE_MASTER = checkAccessKey(accessKey, requestId);
+		List<Map<Object, Object>> maps = BaseUtil.parseGridStoreToMaps(data);
 		SpObserver.putSp(AE_MASTER);
-		baseDao.execute(SqlUtil.getInsertSqlbyGridStore(maps, "TEMP_makeBadReason"));
-		baseDao.execute("update TEMP_makeBadReason set t_status='D',T_REMAKR='重复' where t_id in (select t_id from (select TEMP_makeBadReason.*,row_number()over(partition by mbr_id order by t_id desc) cn from TEMP_makeBadReason where nvl(t_status,'W')='W' ) where cn>1)");
+		List<Map<Object, Object>> relist = new ArrayList<>();
+		for (Map<Object, Object> map : maps) {
+			Map<Object, Object> remap = new HashMap<>();
+			String remark = "";
+			int cn = baseDao.getJdbcTemplate().queryForObject("select count(1) from TEMP_PACKAGEDETAIL where PD_ID=? and nvl(t_status,'W')='W' ",Integer.class,map.get("MBR_ID"));
+			remap.put("id",map.get("PD_ID"));
+			if(cn>0){
+				map.put("T_STATUS","D");
+				map.put("T_REMAKR","重复");
+				remark = "重复";
+			}else{
+				map.put("T_STATUS","W");
+			}
+			map.put("T_KEY",accessKey);
+			map.put("T_INDATE", Timestamp.valueOf(DateUtil.currentDateString(Constant.YMD_HMS)));
+			try {
+				baseDao.execute(SqlUtil.getInsertSqlByMap(map,"TEMP_PACKAGEDETAIL"));
+				remap.put("result","OK");
+				remap.put("remark",remark);
+			}catch (Exception e){
+				remap.put("result","NG");
+				remap.put("remark",e.getMessage());
+				e.printStackTrace();
+			}
+			relist.add(remap);
+		}
 		SpObserver.putSp(username);
+		return relist;
 	}
 
 	private String checkAccessKey(String accessKey,String requestId){