|
@@ -383,6 +383,41 @@ public class MESDataServiceImpl implements MESDataService {
|
|
return relist;
|
|
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
|
|
@Override
|
|
public List<Map<Object, Object>> makeserial(String accessKey, String requestId, String data) {
|
|
public List<Map<Object, Object>> makeserial(String accessKey, String requestId, String data) {
|
|
String AE_MASTER = checkAccessKey(accessKey, requestId);
|
|
String AE_MASTER = checkAccessKey(accessKey, requestId);
|