产品SN烧写绑定记录、产品SN烧写转号记录 接口

获取主账套方式修改

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

@@ -30,7 +30,33 @@ public class MESDataController {
         String accessKey = request.getHeader("AccessKey");
         String requestId = request.getHeader("RequestId");
         mesDataService.snStepPass(accessKey,requestId,data);
-        return ApiResponse.successRsp("0",requestId,"OK");
+        return ApiResponse.successRsp("0",requestId,"Success");
+    }
+
+    /**
+     * 产品SN烧写绑定记录
+     * @param data
+     * @return
+     */
+    @RequestMapping("/api/mes/snInfo")
+    public ApiResult<String> 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");
+    }
+
+    /**
+     * 产品SN烧写转号记录
+     * @param data
+     * @return
+     */
+    @RequestMapping("/api/mes/makeSnRelation")
+    public ApiResult<String> 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");
     }
 
     /**
@@ -43,11 +69,11 @@ public class MESDataController {
         String accessKey = request.getHeader("AccessKey");
         String requestId = request.getHeader("RequestId");
         mesDataService.MAKEBAD(accessKey,requestId,data);
-        return ApiResponse.successRsp("0",requestId,"OK");
+        return ApiResponse.successRsp("0",requestId,"Success");
     }
 
     /**
-     * 产品不良现象记录
+     * 产品不良维修记录
      * @param data
      * @return
      */
@@ -56,7 +82,7 @@ public class MESDataController {
         String accessKey = request.getHeader("AccessKey");
         String requestId = request.getHeader("RequestId");
         mesDataService.makeBadReason(accessKey,requestId,data);
-        return ApiResponse.successRsp("0",requestId,"OK");
+        return ApiResponse.successRsp("0",requestId,"Success");
     }
 
 }

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

@@ -4,6 +4,10 @@ public interface MESDataService {
 
 	public String snStepPass(String accessKey, String requestId, String data);
 
+	public void snInfo(String accessKey, String requestId, String data);
+
+	public void makeSnRelation(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

@@ -13,6 +13,7 @@ import com.uas.eis.utils.DateUtil;
 import com.uas.eis.utils.SqlUtil;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import java.sql.Timestamp;
@@ -25,11 +26,12 @@ public class MESDataServiceImpl implements MESDataService {
 	@Autowired
 	private BaseDao baseDao;
 
+	@Value("${spring.datasource.username}")
+	private String username;
+
 	@Override
 	public String snStepPass(String accessKey, String requestId, String data) {
 		String AE_MASTER = checkAccessKey(accessKey, requestId);
-		DataCenter dataCenter = DataCenter.INSTANCE;
-		String sob = dataCenter.getUsername();
 		List<Map<Object, Object>> maps = BaseUtil.parseGridStoreToMaps(data);
 		for (Map<Object, Object> map : maps) {
 			map.put("T_STATUS","W");
@@ -39,14 +41,43 @@ public class MESDataServiceImpl implements MESDataService {
 		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);
+		SpObserver.putSp(username);
 		return null;
 	}
 
+	@Override
+	public void snInfo(String accessKey, String requestId, String data) {
+		String AE_MASTER = checkAccessKey(accessKey, requestId);
+		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_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);
+	}
+
+	@Override
+	public void makeSnRelation(String accessKey, String requestId, String data) {
+		String AE_MASTER = checkAccessKey(accessKey, requestId);
+		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_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);
+	}
+
 	@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");
@@ -56,13 +87,12 @@ public class MESDataServiceImpl implements MESDataService {
 		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);
+		SpObserver.putSp(username);
 	}
 
 	@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");
@@ -72,7 +102,7 @@ public class MESDataServiceImpl implements MESDataService {
 		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);
+		SpObserver.putSp(username);
 	}
 
 	private String checkAccessKey(String accessKey,String requestId){