Ver Fonte

添加抽檢項目接口

callm há 10 meses atrás
pai
commit
6bf2e19170

+ 8 - 0
src/main/java/com/uas/eis/controller/MESDataController.java

@@ -139,4 +139,12 @@ public class MESDataController {
         List<Map<Object,Object>> list = mesDataService.makeserial(accessKey,requestId,data);
         return ApiResponse.successRsp("0","Success",requestId,list);
     }
+
+    @RequestMapping("/api/mes/oqcitemsamples")
+    public ApiResult<List<Map<Object,Object>>> oqcitemsamples(HttpServletRequest request, String data){
+        String accessKey = request.getHeader("AccessKey");
+        String requestId = request.getHeader("RequestId");
+        List<Map<Object,Object>> list = mesDataService.oqcitemsamples(accessKey,requestId,data);
+        return ApiResponse.successRsp("0","Success",requestId,list);
+    }
 }

+ 1 - 0
src/main/java/com/uas/eis/service/MESDataService.java

@@ -27,4 +27,5 @@ public interface MESDataService {
 
 	List<Map<Object,Object>> makeserial(String accessKey, String requestId, String data);
 
+	List<Map<Object,Object>> oqcitemsamples(String accessKey, String requestId, String data);
 }

+ 35 - 0
src/main/java/com/uas/eis/serviceImpl/MESDataServiceImpl.java

@@ -383,6 +383,41 @@ public class MESDataServiceImpl implements MESDataService {
 		return relist;
 	}
 
+	@Override
+	public List<Map<Object, Object>> oqcitemsamples(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<Object, Object> remap = new HashMap<>();
+			String remark = "";
+			int cn = baseDao.getJdbcTemplate().queryForObject("select count(1) from temp_oqcitemsamples where OIS_ID=? and nvl(t_status,'W')='W' ",Integer.class,map.get("OIS_ID"));
+			remap.put("id",map.get("OIS_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_OQCITEMSAMPLES"));
+				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>> makeserial(String accessKey, String requestId, String data) {
 		String AE_MASTER = checkAccessKey(accessKey, requestId);