产品不良现象记录、产品不良维修记录 接口

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

@@ -33,4 +33,30 @@ public class MESDataController {
         return ApiResponse.successRsp("0",requestId,"OK");
     }
 
+    /**
+     * 产品不良现象记录
+     * @param data
+     * @return
+     */
+    @RequestMapping("/api/mes/makeBad")
+    public ApiResult<String> 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,"OK");
+    }
+
+    /**
+     * 产品不良现象记录
+     * @param data
+     * @return
+     */
+    @RequestMapping("/api/mes/makeBadReason")
+    public ApiResult<String> 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,"OK");
+    }
+
 }

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

@@ -4,4 +4,7 @@ public interface MESDataService {
 
 	public String snStepPass(String accessKey, String requestId, String data);
 
+	public void MAKEBAD(String accessKey, String requestId, String data);
+
+	public void makeBadReason(String accessKey, String requestId, String data);
 }

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

@@ -26,17 +26,7 @@ public class MESDataServiceImpl implements MESDataService {
 
 	@Override
 	public String snStepPass(String accessKey, String requestId, String data) {
-		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) {
-			ApiResult apiResult = new ApiResult();
-			apiResult.setCode(ErrorMessage.ACCESSKEY_ILLEGAL.getCode());
-			apiResult.setMessage(ErrorMessage.ACCESSKEY_ILLEGAL.getMessage());
-			apiResult.setRequestId(requestId);
-			throw new ApiSystemException(apiResult);
-		}
+		String AE_MASTER = checkAccessKey(accessKey, requestId);
 		String sob = "MES";
 		List<Map<Object, Object>> maps = BaseUtil.parseGridStoreToMaps(data);
 		for (Map<Object, Object> map : maps) {
@@ -44,12 +34,58 @@ public class MESDataServiceImpl implements MESDataService {
 			map.put("T_KEY",accessKey);
 			map.put("T_INDATE", Timestamp.valueOf(DateUtil.currentDateString(Constant.YMD_HMS)));
 		}
-		SpObserver.putSp(AE_MASTER.toString());
-		List<String> Sqls = SqlUtil.getInsertSqlbyGridStore(maps, "TEMP_STEPPASSED");
-		baseDao.execute(Sqls);
+		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)");
 		SpObserver.putSp(sob);
 		return null;
 	}
 
+	@Override
+	public void MAKEBAD(String accessKey, String requestId, String data) {
+		String AE_MASTER = checkAccessKey(accessKey, requestId);
+		String sob = "MES";
+		List<Map<Object, Object>> maps = BaseUtil.parseGridStoreToMaps(data);
+		for (Map<Object, Object> map : maps) {
+			map.put("T_STATUS","W");
+			map.put("T_KEY",accessKey);
+			map.put("T_INDATE", Timestamp.valueOf(DateUtil.currentDateString(Constant.YMD_HMS)));
+		}
+		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(sob);
+	}
+
+	@Override
+	public void makeBadReason(String accessKey, String requestId, String data) {
+		String AE_MASTER = checkAccessKey(accessKey, requestId);
+		String sob = "MES";
+		List<Map<Object, Object>> maps = BaseUtil.parseGridStoreToMaps(data);
+		for (Map<Object, Object> map : maps) {
+			map.put("T_STATUS","W");
+			map.put("T_KEY",accessKey);
+			map.put("T_INDATE", Timestamp.valueOf(DateUtil.currentDateString(Constant.YMD_HMS)));
+		}
+		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)");
+		SpObserver.putSp(sob);
+	}
+
+	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();
+			apiResult.setCode(ErrorMessage.ACCESSKEY_ILLEGAL.getCode());
+			apiResult.setMessage(ErrorMessage.ACCESSKEY_ILLEGAL.getMessage());
+			apiResult.setRequestId(requestId);
+			throw new ApiSystemException(apiResult);
+		}
+		return AE_MASTER.toString();
+	}
+
 }