接口初始化提交

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

@@ -1,104 +0,0 @@
-package com.uas.eis.controller;
-
-import com.uas.eis.sdk.entity.ApiResult;
-import com.uas.eis.sdk.resp.ApiResponse;
-import com.uas.eis.service.MESDataService;
-import org.springframework.beans.factory.annotation.Autowired;
-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
- * @date 2021/12/20 17:03
- * MES数据写入到中间表
- **/
-@RestController
-public class MESDataController {
-
-    @Autowired
-    private MESDataService mesDataService;
-
-    /**
-     * 产品SN工序过站记录
-     * @param data
-     * @return
-     */
-    @RequestMapping("/api/mes/snStepPass")
-    public ApiResult<List<Map<Object,Object>>> snStepPass(HttpServletRequest request, String data){
-        String accessKey = request.getHeader("AccessKey");
-        String requestId = request.getHeader("RequestId");
-        List<Map<Object,Object>> list = mesDataService.snStepPass(accessKey,requestId,data);
-        return ApiResponse.successRsp("0","Success",requestId,list);
-    }
-
-    /**
-     * 产品SN烧写绑定记录
-     * @param data
-     * @return
-     */
-    @RequestMapping("/api/mes/snInfo")
-    public ApiResult<List<Map<Object,Object>>> snInfo(HttpServletRequest request, String data){
-        String accessKey = request.getHeader("AccessKey");
-        String requestId = request.getHeader("RequestId");
-        List<Map<Object,Object>> list = mesDataService.snInfo(accessKey,requestId,data);
-        return ApiResponse.successRsp("0","Success",requestId,list);
-    }
-
-    /**
-     * 产品SN烧写转号记录
-     * @param data
-     * @return
-     */
-    @RequestMapping("/api/mes/makeSnRelation")
-    public ApiResult<List<Map<Object,Object>>> makeSnRelation(HttpServletRequest request, String data){
-        String accessKey = request.getHeader("AccessKey");
-        String requestId = request.getHeader("RequestId");
-        List<Map<Object,Object>> list = mesDataService.makeSnRelation(accessKey,requestId,data);
-        return ApiResponse.successRsp("0","Success",requestId,list);
-    }
-
-    /**
-     * 产品不良现象记录
-     * @param data
-     * @return
-     */
-    @RequestMapping("/api/mes/makeBad")
-    public ApiResult<List<Map<Object,Object>>> makeBad(HttpServletRequest request, String data){
-        String accessKey = request.getHeader("AccessKey");
-        String requestId = request.getHeader("RequestId");
-        List<Map<Object,Object>> list = mesDataService.MAKEBAD(accessKey,requestId,data);
-        return ApiResponse.successRsp("0","Success",requestId,list);
-    }
-
-    /**
-     * 产品不良维修记录
-     * @param data
-     * @return
-     */
-    @RequestMapping("/api/mes/makeBadReason")
-    public ApiResult<List<Map<Object,Object>>> makeBadReason(HttpServletRequest request, String data){
-        String accessKey = request.getHeader("AccessKey");
-        String requestId = request.getHeader("RequestId");
-        List<Map<Object,Object>> list = mesDataService.makeBadReason(accessKey,requestId,data);
-        return ApiResponse.successRsp("0","Success",requestId,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","Success",requestId,list);
-    }
-
-
-}

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

@@ -23,11 +23,11 @@ public class MESHelperController {
     private MESHelperService mesHelperService;
 
     @RequestMapping(value="/dllMain")
-    public ApiResult<Map<Object,Object>> DLLMain(HttpServletRequest request, String data){
+    public ApiResult<List<Map<Object, Object>>> DLLMain(HttpServletRequest request, String data){
         Map<String, Object> modelMap = new HashMap<String, Object>();
         String accessKey = request.getHeader("AccessKey");
         String requestId = request.getHeader("RequestId");
-        Map<Object,Object> map = mesHelperService.DLLMain(accessKey,requestId,data);
+        List<Map<Object, Object>> map = mesHelperService.DLLMain(accessKey,requestId,data);
         return ApiResponse.successRsp(requestId,map);
     }
 

src/main/java/com/uas/eis/entity/HelperType.java

@@ -5,21 +5,8 @@ package com.uas.eis.entity;
  * MES对接写号定义类型与代码
  */
 public enum HelperType {
-    CheckRoutePassed("CheckRoutePassed","检测岗位资源是否正确") , //检测岗位资源是否正确
-    CheckUserAndResourcePassed("CheckUserAndResourcePassed","验证序列号执行工序") , //验证序列号执行工序
-    GetAddressRangeByMO("GetAddressRangeByMO","分配MAC和BT信息") ,//分配MAC和BT信息
-    GetMEIOrNetCodeRange("GetMEIOrNetCodeRange","分配IMEI和NetCode信息") ,//分配IMEI和NetCode信息
-    GetRcardMOInfo("GetRcardMOInfo","获取序列号对应工单信息") ,//获取序列号对应工单信息
-    GetMobileAllInfo("GetMobileAllInfo","查询已分配的信息") ,//查询已分配的信息
-    SetAddressInfo("SetAddressInfo","写入SN的Wifi,BT信息") ,//写入SN的Wifi,BT信息
-    GetMaster("GetMaster","获取账套信息") ,//获取账套信息
-    SetMobileData("SetMobileData","设置测试结果，结果必须为NG或者OK") ,//设置测试结果，结果必须为NG或者OK
-    SetIMEIInfo("SetIMEIInfo","设置IMEI信息") ,//设置IMEI信息
-    SetTestDetail("SetTestDetail","设置测试结果") ,//设置测试结果
-    SetPcbaData("SetPcbaData","检测XXX") ,//设置测试结果
-    GoMo("GoMo","检测XXX") ,//序列号归属工单
-    GetInfoByMaterial("GetInfoByMaterial","根据上料信息获取到SN相关信息"),
-    GetMakeInfoBySN("GetMakeInfoBySN","根据SN获取工单相关信息");
+    UploadBaraccept("UploadBaraccept","上传条码数据") , //上传条码数据
+    GetBaraccept("GetBaraccept","生成送货通知单号") ; //生成送货通知单号
 
     private String code;
     private String name;

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

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

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

@@ -5,5 +5,5 @@ import java.util.Map;
 
 public interface MESHelperService {
 
-	Map<Object, Object> DLLMain(String accessKey, String requestId, String data);
+	List<Map<Object, Object>> DLLMain(String accessKey, String requestId, String data);
 }

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

@@ -1,261 +0,0 @@
-package com.uas.eis.serviceImpl;
-
-import com.uas.eis.core.config.SpObserver;
-import com.uas.eis.dao.BaseDao;
-import com.uas.eis.dto.DataCenter;
-import com.uas.eis.entity.ErrorMessage;
-import com.uas.eis.exception.ApiSystemException;
-import com.uas.eis.sdk.entity.ApiResult;
-import com.uas.eis.service.MESDataService;
-import com.uas.eis.utils.BaseUtil;
-import com.uas.eis.utils.Constant;
-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;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-@Service
-public class MESDataServiceImpl implements MESDataService {
-
-	@Autowired
-	private BaseDao baseDao;
-
-	@Value("${spring.datasource.username}")
-	private String username;
-
-	@Override
-	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<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);
-		}
-		//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 relist;
-	}
-
-	@Override
-	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<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(username);
-		return relist;
-	}
-
-	@Override
-	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<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(username);
-		return relist;
-	}
-
-	@Override
-	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<Object, Object> remap = new HashMap<>();
-			String remark = "";
-			int cn = baseDao.getJdbcTemplate().queryForObject("select count(1) from TEMP_MAKEBAD where MB_CODE=? and nvl(t_status,'W')='W' ",Integer.class,map.get("MB_CODE"));
-			remap.put("id",map.get("MB_CODE"));
-			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(username);
-		return relist;
-	}
-
-	@Override
-	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<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);
-		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){
-		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();
-	}
-
-}

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

@@ -7,18 +7,14 @@ import com.uas.eis.entity.ErrorMessage;
 import com.uas.eis.entity.HelperType;
 import com.uas.eis.exception.ApiSystemException;
 import com.uas.eis.sdk.entity.ApiResult;
-import com.uas.eis.service.MESDataService;
 import com.uas.eis.service.MESHelperService;
 import com.uas.eis.utils.*;
 import net.sf.json.JSONObject;
-import net.sf.json.JsonConfig;
 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 sun.awt.TimedWindowEvent;
 
-import java.sql.Timestamp;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -34,7 +30,7 @@ public class MESHelperServiceImpl implements MESHelperService {
 	private String username;
 
 	@Override
-	public Map<Object,Object> DLLMain(String accessKey, String requestId, String data) {
+	public List<Map<Object, Object>> DLLMain(String accessKey, String requestId, String data) {
 		String AE_MASTER = checkAccessKey(accessKey, requestId);
 		SpObserver.putSp(AE_MASTER);
 		Map<Object, Object> map = BaseUtil.parseFormStoreToMap(data);
@@ -53,52 +49,13 @@ public class MESHelperServiceImpl implements MESHelperService {
 		}
 		int err = 0;
 		//返回值
-		Map<Object, Object> remap = new HashMap<Object, Object>();
+		List<Map<Object, Object>> remap = new ArrayList<>();
 		switch(helperType){
-			case CheckRoutePassed:
-				remap = CheckRoutePassed(json);
+			case UploadBaraccept:
+				remap = UploadBaraccept(data);
 				break;
-			case CheckUserAndResourcePassed:
-				remap = CheckUserAndResourcePassed(json);
-				break;
-			case GetAddressRangeByMO:
-				remap = GetAddressRangeByMO(json);
-				break;
-			case GetMEIOrNetCodeRange:
-				remap = GetMEIOrNetCodeRange(json);
-				break;
-			case GetRcardMOInfo:
-				remap = GetRcardMOInfo(json);
-				break;
-			case GetMobileAllInfo:
-				remap = GetMobileAllInfo(json);
-				break;
-			case SetAddressInfo:
-				remap = SetAddressInfo(json);
-				break;
-			case GetMaster:
-				remap = GetMaster(json);
-				break;
-			case SetMobileData:
-				remap = SetMobileData(json);
-				break;
-			case SetIMEIInfo:
-				remap = SetIMEIInfo(json);
-				break;
-			case SetTestDetail:
-				remap = SetTestDetail(json);
-				break;
-			case SetPcbaData:
-				remap = SetPcbaData(json);
-				break;
-			case GetInfoByMaterial:
-				remap = GetInfoByMaterial(json);
-				break;
-			case GoMo:
-				remap = GoMo(json);
-				break;
-			case GetMakeInfoBySN:
-				remap = GetMakeInfoBySN(json);
+			case GetBaraccept:
+				remap = GetBaraccept(data);
 				break;
 			default:
 				err = -1;
@@ -111,806 +68,62 @@ public class MESHelperServiceImpl implements MESHelperService {
 		return remap;
 	}
 
-	private Map<Object,Object> GoMo(JSONObject map){
-		Map<Object, Object> rmap = new HashMap<Object, Object>();
-		String iSN=null;
-		String iResCode=null;
-		String iMo=null;
-		String oErrMessage=null;
-		if(map.get("iMo")==null){
-			oErrMessage = "工单号不能为空";
-			rmap.put("oErrMessage",oErrMessage);
-			return rmap;
-		}
-		if(map.get("iResCode")==null){
-			oErrMessage = "岗位资源不能为空";
-			rmap.put("oErrMessage",oErrMessage);
-			return rmap;
-		}
-		if(map.get("iSN")==null){
-			oErrMessage = "SN不能为空";
-			rmap.put("oErrMessage",oErrMessage);
-			return rmap;
-		}
-		iSN=map.get("iSN").toString();
-		iResCode=map.get("iResCode").toString();
-		iMo=map.get("iMo").toString();
-		List<String> list = new ArrayList<String>();
-		list = baseDao.callProcedureWithOut("CS_CHECKSTEPSNANDMACODE", new Object[]{
-				String.valueOf(iMo),
-				String.valueOf(iResCode),
-				String.valueOf(iSN),
-				String.valueOf("")
-		}, new Integer[]{1, 2, 3, 4}, new Integer[]{5, 6, 7});
-		oErrMessage=list.get(2);
-
-		SqlRowList rs = baseDao.queryForRowSet("select ms_status,ms_stepcode,ms_nextstepcode from makeserial where ms_id=(  select max(ms_id) from makeserial where ms_sncode  in ( select '" + iSN + "' from dual union select sn from makesnrelation where beforesn='" + iSN + "' and sn<>' '  union select beforesn from makesnrelation where sn='" + iSN + "' and beforesn<>' '))");
-		String ms_status = "";
-		String ms_stepcode = "";
-		String ms_nextstepcode = "";
-		if(rs.next()){
-			ms_status= rs.getString("ms_status");
-			ms_stepcode=rs.getString("ms_stepcode");
-			ms_nextstepcode=rs.getString("ms_nextstepcode");
-		}
-		String stepcode = GetStepCodeBySource(iResCode);
-		if ( oErrMessage == null || (ms_status == "3" && ms_stepcode == stepcode))
-		{
-			if (ms_status == "3")
-			{
-				oErrMessage =  null;
-			}
-		}
-		rmap.put("oErrMessage",oErrMessage);
-		return rmap;
-	}
-
-	private Map<Object,Object> GetInfoByMaterial(JSONObject map){
-		Map<Object, Object> rmap = new HashMap<Object, Object>();
-		String iPCBA=null;
-		String oErrMessage=null;
-		if(map.get("iPCBA")==null){
-			oErrMessage = "主板SN不能为空";
-			rmap.put("oErrMessage",oErrMessage);
-			return rmap;
-		}
-		iPCBA=map.get("iPCBA").toString();
-		SqlRowList rs=baseDao.queryForRowSet("select nvl(max(ms_id),0)ms_id from CRAFTMATERIAL left join makeserial on ms_firstsn=cm_firstsn  where cm_barcode='"+iPCBA+"' and nvl(cm_status,0)<>-1 order by cm_id desc");
-		if(rs.next()){
-			if(!rs.getString("ms_id").equals("0")){
-				rs=baseDao.queryForRowSet("select ma_bios,ma_ec,ms_sncode,ma_hardware from makeserial left join make on ms_makecode=ma_code where ms_id='"+rs.getString("ms_id")+"'");
-				if (rs.next()){
-					rmap.put("oSN",rs.getString("ms_sncode"));
-					rmap.put("oBIOS",rs.getString("ma_bios"));
-					rmap.put("oEC",rs.getString("ma_ec"));
-					rmap.put("oHardWare",rs.getString("ma_hardware"));
-				}
-			}else{
-				oErrMessage = "主板SN未查询到关联信息";
-				rmap.put("oErrMessage",oErrMessage);
-				return rmap;
-			}
-		}
-		return rmap;
-	}
-
-	private Map<Object,Object> CheckRoutePassed(JSONObject map){
-		//实际业务数据
-		Map<Object, Object> rmap = new HashMap<>();
-		String iSN=map.get("iSN").toString();
-		String iResCode=map.get("iResCode").toString();
-		String oErrMessage="";
-		if (iSN ==null)
-		{
-			oErrMessage = "SN不能为空";
-		}
-		List<String> list = new ArrayList<String>();
-		list = baseDao.callProcedureWithOut("CS_CHECKSTEPSNANDMACODE", new Object[]{
-				String.valueOf(""),
-				String.valueOf(iResCode),
-				String.valueOf(iSN),
-				String.valueOf("")
-		}, new Integer[]{1, 2, 3, 4}, new Integer[]{5, 6, 7});
-		oErrMessage=list.get(2);
-		if(oErrMessage!=null){
-			rmap.put("oErrMessage",oErrMessage);
-			return rmap;
-		}
-		SqlRowList rs = baseDao.queryForRowSet("select ms_status,ms_stepcode,ms_nextstepcode from makeserial where ms_id=(  select max(ms_id) from makeserial where ms_sncode  in ( select '" + iSN + "' from dual union select sn from makesnrelation where beforesn='" + iSN + "' and sn<>' '  union select beforesn from makesnrelation where sn='" + iSN + "' and beforesn<>' '))");
-		String ms_status = "";
-		String ms_stepcode = "";
-		String ms_nextstepcode = "";
-		if(rs.next()){
-			ms_status= rs.getString("ms_status");
-			ms_stepcode=rs.getString("ms_stepcode");
-			ms_nextstepcode=rs.getString("ms_nextstepcode");
-		}
-		String stepcode = GetStepCodeBySource(iResCode);
-		if (ms_nextstepcode != "" && !ms_nextstepcode.equals(stepcode))
-		{
-			oErrMessage = "当前序列号下一工序" + ms_nextstepcode;
-		}
-		rmap.put("oErrMessage",oErrMessage);
-		return rmap;
-	}
-
-	private Map<Object,Object> CheckUserAndResourcePassed(JSONObject map){
-		//实际业务数据
-		Map<Object, Object> rmap = new HashMap<>();
-		String oErrMessage = null;
-		if (map.get("iUserCode") == null || map.get("iResCode") == null || map.get("iPassWord") == null)
-		{
-			oErrMessage = "用户名,密码,岗位资源必须填写";
-			rmap.put("oErrMessage",oErrMessage);
-			return rmap;
-		}
-		String iUserCode=map.get("iUserCode").toString();
-		String iPassWord=map.get("iPassWord").toString();
-		String iResCode=map.get("iResCode").toString();
-		if (CheckUserLogin(iUserCode, iPassWord))
-		{
-			String SQL = "select em_code,em_type,em_name from employee where em_code=? ";
-			SqlRowList rs = baseDao.queryForRowSet(SQL,  iUserCode);
-			if (rs.next())
-			{
-				String em_name = rs.getString("em_name");
-				String em_type = rs.getString("em_type");
-				if (iResCode ==null)
-				{
-					oErrMessage = "岗位资源不允许为空";
-					rmap.put("oErrMessage",oErrMessage);
-					return rmap;
-				}
-				if (em_type.equals("admin"))
-				{
-					if (!baseDao.checkIf("Source", "sc_code='" + iResCode + "' and sc_statuscode='AUDITED'"))
-					{
-						oErrMessage = "岗位资源编号错误或者未审核！";
-					}
-				}
-				else
-				{
-					SqlRowList rs1=baseDao.queryForRowSet("select ur_resourcecode from cs$empgroup left join cs$userresource on ur_groupcode=eg_groupcode left join source on ur_resourcecode=sc_code where eg_emcode = '"+ iUserCode + "' and sc_statuscode='AUDITED'");
-					//如果存在该编号
-					if (rs1.next())
-					{
-						//判断如果多个岗位资源存在，用户输入的只要在其中就行
-						while (rs.next())
-						{
-							if (!rs.getString("ur_resourcecode").equals("iResCode")){
-								oErrMessage = "用户不处于当前资源所属分组!";
-							}else
-							{
-								oErrMessage=null;
-								continue;
-							}
-						}
-					}
-					else
-						oErrMessage = "岗位资源编号错误或者未审核！";
-				}
-			}
-			else
-				oErrMessage = "用户不存在!";
-		}else{
-			oErrMessage = "用户名密码不正确!";
-		}
-		rmap.put("oErrMessage",oErrMessage);
-		return rmap;
-	}
-	private Map<Object,Object> GetAddressRangeByMO(JSONObject map){
-		//实际业务数据
-		Map<Object, Object> rmap = new HashMap<>();
-		String iSN="";
-		String oErrMessage = null;
-		String oWIFI = "";
-		String oBT = "";
-		String oCode1 = "";
-		String oCode2 = "";
-		String oCode3 = "";
-		if(map.get("iSN")==null){
-			oErrMessage = "SN不能为空";
-			rmap.put("oErrMessage",oErrMessage);
-			return rmap;
-		}
-		iSN=map.get("iSN").toString();
-		//判断工单是否归属
-		JSONObject map3=new JSONObject();
-		map3.put("iSN",iSN);
-		Map<Object, Object> map2=GetRcardMOInfo(map3);
-		if(map2.get("oErrMessage")!=null){
-			oErrMessage=map2.get("oErrMessage").toString();
-			rmap.put("oErrMessage",oErrMessage);
-			return rmap;
-		}
-		List<String> list = new ArrayList<String>();
-		list = baseDao.callProcedureWithOut("CS_GETADDRESSBYMAKECODE", new Object[]{
-				String.valueOf(iSN),
-				String.valueOf(map2.get("oMoCode").toString()),
-		}, new Integer[]{1,2}, new Integer[]{3,4,5,6,7,8});
-		oWIFI = list.get(0);
-		oBT =  list.get(1);
-		oCode1 =  list.get(2);
-		oCode2 = list.get(3);
-		oCode3 =  list.get(4);
-		oErrMessage= list.get(5);
-		if (oErrMessage == "" || oErrMessage == null || oErrMessage == "null"){
-			rmap.put("oWIFI",oWIFI);
-			rmap.put("oBT",oBT);
-			rmap.put("oCode1",oCode1);
-			rmap.put("oCode2",oCode2);
-			rmap.put("oCode3",oCode3);
-		}
-		else
-			rmap.put("oErrMessage",oErrMessage);
-		return rmap;
-	}
-
-	private Map<Object,Object> GetMEIOrNetCodeRange(JSONObject map){
-		//实际业务数据
-		Map<Object, Object> rmap = new HashMap<>();
-		String iSN="";
-		String oErrMessage = null;
-		String oIMEI1 = "";
-		String oIMEI2 = "";
-		String oMEID = "";
-		String oNetCode = "";
-		String oPSN = "";
-		String oID1 = "";
-		String oID2 = "";
-		String oID3 = "";
-		String oID4 = "";
-		String oID5 = "";
-		if(map.get("iSN")==null){
-			oErrMessage = "SN不能为空";
-			rmap.put("oErrMessage",oErrMessage);
-			return rmap;
-		}
-		if(map.get("iIMEI1")!=null){
-			oIMEI1=map.get("iIMEI1").toString();
-		}
-		if(map.get("iNetCode")!=null){
-			oNetCode=map.get("iNetCode").toString();
-		}
-		iSN=map.get("iSN").toString();
-		List<String> list = new ArrayList<String>();
-		list = baseDao.callProcedureWithOut("CS_GETIMEIORNETCODERANGE", new Object[]{
-				String.valueOf(iSN),
-				String.valueOf(""),
-				String.valueOf(oIMEI1),
-				String.valueOf(oNetCode),
-		}, new Integer[]{1,2,3,4}, new Integer[]{5,6,7,8,9,10,11,12,13,14});
-		oIMEI1 = list.get(0);
-		oIMEI2 =  list.get(1);
-		oMEID =  list.get(2);
-		oNetCode = list.get(3);
-		oID1 =  list.get(4);
-		oID2 =  list.get(5);
-		oID3 =  list.get(6);
-		oID4 =  list.get(7);
-		oID5 =  list.get(8);
-		oErrMessage= list.get(9);
-		if (oErrMessage == "" || oErrMessage == null || oErrMessage == "null"){
-			rmap.put("oIMEI1",oIMEI1);
-			rmap.put("oIMEI2",oIMEI2);
-			rmap.put("oMEID",oMEID);
-			rmap.put("oNetCode",oNetCode);
-			rmap.put("oPSN",oPSN);
-			rmap.put("oID1",oID1);
-			rmap.put("oID2",oID2);
-			rmap.put("oID3",oID3);
-			rmap.put("oID4",oID4);
-			rmap.put("oID5",oID5);
-		}
-		else
-			rmap.put("oErrMessage",oErrMessage);
-		return rmap;
-	}
-
-	private Map<Object,Object> GetRcardMOInfo(JSONObject map){
-		//实际业务数据
-		Map<Object, Object> rmap = new HashMap<>();
-		//取MakeProcess表中的执行记录ID最大的一个工单的号码
-		String oErrMessage = null;
-		if(map.get("iSN")==null){
-			oErrMessage = "SN不能为空";
-			rmap.put("oErrMessage",oErrMessage);
-			return rmap;
-		}
-		String iSN=map.get("iSN").toString();
-		StringBuffer sql=new StringBuffer();
-		sql.append("select max(ms_id)ms_id from makeserial where ms_sncode in (select '" + iSN + "' from dual union select sn from ");
-		sql.append("makesnrelation where beforesn='" + iSN + "' and sn<>' '  union select beforesn from makesnrelation where sn='" + iSN + "' and beforesn<>' ')");
-		SqlRowList rs = baseDao.queryForRowSet(sql.toString());
-		String ms_id="";
-		if(rs.next()){
-			if(rs.getString("ms_id")==null){
-				oErrMessage = "序列号:" + iSN + " 未归属工单";
-				rmap.put("oErrMessage",oErrMessage);
-				return rmap;
+	private List<Map<Object, Object>> UploadBaraccept(String data)
+	{
+		List<Map<Object, Object>> maps = BaseUtil.parseGridStoreToMaps(data);
+		List<Map<Object, Object>> relist = new ArrayList<>();
+		for (Map<Object, Object> map : maps) {
+			Map<Object, Object> remap = new HashMap<>();
+			String remark = "";
+			SqlRowList rs=baseDao.queryForRowSet("select ban_id from baracceptnotify where ban_barcode='"+map.get("ban_barcode")+"'");
+			remap.put("ban_id",baseDao.getSeqId("baracceptnotify_seq"));
+			if(rs.hasNext()){
+				remark = "重复";
+				remap.put("remark",remark);
+				relist.add(remap);
+				return relist;
 			}
-			else{
-				ms_id= rs.getString("ms_id");
+			try {
+				baseDao.execute(SqlUtil.getInsertSqlByMap(map,"BARACCEPTNOTIFY"));
+				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);
 		}
-		Object oMoCode = baseDao.getFieldDataByCondition("MakeSerial", "ms_makecode", "ms_id='" + ms_id + "'");
-		if (oMoCode != null){
-			rmap.put("oMoCode",oMoCode);
-			oErrMessage= null;
-		}
-		else
-		{
-			oErrMessage = "序列号:" + iSN + " 未归属工单";
-		}
-		rmap.put("oErrMessage",oErrMessage);
-		return rmap;
+		return relist;
 	}
 
-
-
-	private Map<Object,Object> GetMobileAllInfo(JSONObject map){
-		//实际业务数据
-		Map<Object, Object> rmap = new HashMap<>();
-		String iSN="";
-		String oErrMessage = null;
-		String oIMEI1 = "";
-		String oIMEI2 = "";
-		String oMEID = "";
-		String oNetCode = "";
-		String oPSN = "";
-		String oID1 = "";
-		String oID2 = "";
-		String oID3 = "";
-		String oID4 = "";
-		String oID5 = "";
-		String oWIFI = "";
-		String oBT = "";
-		String oCode1 = "";
-		String oCode2 = "";
-		String oCode3 = "";
-		if(map.get("iSN")==null){
-			oErrMessage = "SN不能为空";
-			rmap.put("oErrMessage",oErrMessage);
-			return rmap;
-		}
-		iSN=map.get("iSN").toString();
-		Object ms_id =baseDao.getFieldDataByCondition("makeserial", "max(ms_id)", "ms_sncode='" + iSN + "'");
-		if(ms_id!=null)
-		{
-			SqlRowList rs=baseDao.queryForRowSet("select ms_id, ms_mac, ms_bt, ms_meid, ms_netcode, ms_psn, ms_imei1, ms_imei2, ms_imei3, ms_othcode1, ms_othcode2, ms_othcode3, ms_othid1, ms_othid2, ms_othid3 from MakeSerial where ms_id="+ms_id.toString());
-			if(rs.next()){
-				oWIFI = rs.getString("ms_mac");
-				oBT = rs.getString("ms_bt");
-				oPSN = rs.getString("ms_psn");
-				oNetCode = rs.getString("ms_netcode");
-				oMEID = rs.getString("ms_meid");
-				oIMEI1 = rs.getString("ms_imei1");
-				oIMEI2 = rs.getString("ms_imei2");
-				oCode1 = rs.getString("ms_othcode1");
-				oCode2 = rs.getString("ms_othcode2");
-				oCode3 = rs.getString("ms_othcode3");
-				oID1 = rs.getString("ms_othid3");
-				oID2 = rs.getString("ms_othid3");
-				oID3 = rs.getString("ms_othid3");
-			}
-		}else
-		{
-			oErrMessage = "序列号" + iSN + "不存在";
-			rmap.put("oErrMessage",oErrMessage);
-			return rmap;
-		}
-		if (oErrMessage == "" || oErrMessage == null || oErrMessage == "null"){
-			rmap.put("oIMEI1",oIMEI1);
-			rmap.put("oIMEI2",oIMEI2);
-			rmap.put("oMEID",oMEID);
-			rmap.put("oNetCode",oNetCode);
-			rmap.put("oPSN",oPSN);
-			rmap.put("oID1",oID1);
-			rmap.put("oID2",oID2);
-			rmap.put("oID3",oID3);
-			rmap.put("oID4",oID4);
-			rmap.put("oID5",oID5);
-			rmap.put("oWIFI",oWIFI);
-			rmap.put("oBT",oBT);
-			rmap.put("oCode1",oCode1);
-			rmap.put("oCode2",oCode2);
-			rmap.put("oCode3",oCode3);
-		}
-		else
-			rmap.put("oErrMessage",oErrMessage);
-		return rmap;
-	}
-
-	private Map<Object,Object> SetAddressInfo(JSONObject map){
-		//实际业务数据
-		Map<Object, Object> rmap = new HashMap<>();
-		String oErrMessage = null;
-		if(map.get("iSN")==null){
-			oErrMessage = "SN不能为空";
-			rmap.put("oErrMessage",oErrMessage);
-			return rmap;
-		}
-		String iSN=map.get("iSN").toString();
-		String iWIFI = null;
-		String iBT = null;
-		String iCode1 = null;
-		String iCode2 = null;
-		String iCode3 = null;
-		if(map.get("iWIFI")!=null){
-			iWIFI=map.get("iWIFI").toString();
-		}
-		if(map.get("iBT")!=null){
-			iBT=map.get("iBT").toString();
-		}
-		if(map.get("iCode1")!=null){
-			iCode1=map.get("iCode1").toString();
-		}
-		if(map.get("iCode2")!=null){
-			iCode2=map.get("iCode2").toString();
-		}
-		if(map.get("iCode3")!=null){
-			iCode3=map.get("iCode3").toString();
-		}
-		List<String> list = new ArrayList<String>();
-		list = baseDao.callProcedureWithOut("CS_SETADDRESSINFO", new Object[]{
-				String.valueOf(iSN),
-				String.valueOf(iWIFI),
-				String.valueOf(iBT),
-				String.valueOf(iCode1),
-				String.valueOf(iCode2),
-				String.valueOf(iCode3)
-		}, new Integer[]{1, 2, 3, 4, 5, 6}, new Integer[]{7});
-		oErrMessage = list.get(0);
-		rmap.put("oErrMessage",oErrMessage);
-		return rmap;
-	}
-
-	private Map<Object,Object> GetMaster(JSONObject map){
-		//实际业务数据
-		Map<Object, Object> rmap = new HashMap<>();
-		SqlRowList rs=baseDao.queryForRowSet("select ma_user from mes.master");
-		while(rs.next())
-		{
-			rmap.put(rs.getString("ma_user"),rs.getString("ma_user"));
-		}
-		return rmap;
-	}
-
-	private Map<Object,Object> SetMobileData(JSONObject map){
-		//实际业务数据
-		Map<Object, Object> rmap = new HashMap<>();
-		String oErrMessage = null;
-		if(map.get("iSN")==null||map.get("iTSN")==null){
-			oErrMessage = "SN不能为空";
-			rmap.put("oErrMessage",oErrMessage);
-			return rmap;
-		}
-		String iSN=map.get("iSN").toString();
-		String iTSN=map.get("iTSN").toString();
-		String iSourceCode = null;
-		String iOperater = null;
-		String iResult = null;
-		String flag = null;
-		String iErrCode = null;
-		if(map.get("iSourceCode")!=null){
-			iSourceCode=map.get("iSourceCode").toString();
-		}
-		if(map.get("iOperater")!=null){
-			iOperater=map.get("iOperater").toString();
-		}
-		if(map.get("iResult")!=null){
-			iResult=map.get("iResult").toString();
-		}
-		if(map.get("flag")!=null){
-			flag=map.get("flag").toString();
-		}
-		if(map.get("iErrCode")!=null){
-			iErrCode=map.get("iErrCode").toString();
-		}
-		List<String> list = new ArrayList<String>();
-		list = baseDao.callProcedureWithOut("CS_DLLSNCHANGE", new Object[]{
-				String.valueOf(iTSN),
-				String.valueOf(iSN),
-				String.valueOf(iSourceCode),
-				String.valueOf(iOperater),
-				String.valueOf(iResult),
-				String.valueOf(iErrCode),
-		}, new Integer[]{1, 2, 3, 4, 5, 6}, new Integer[]{7});
-		oErrMessage = list.get(0);
-		rmap.put("oErrMessage",oErrMessage);
-		return rmap;
-	}
-	private Map<Object,Object> SetIMEIInfo(JSONObject map){
-		//实际业务数据
-		Map<Object, Object> rmap = new HashMap<>();
-		String oErrMessage = null;
-		if(map.get("iSN")==null){
-			oErrMessage = "SN不能为空";
-			rmap.put("oErrMessage",oErrMessage);
-			return rmap;
-		}
-		String iSN=map.get("iSN").toString();
-		String iIMEI1=null;
-		String iIMEI2 = null;
-		String iIMEI3 = null;
-		String iMEID = null;
-		String iNET = null;
-		String iID1 = null;
-		String iID2 = null;
-		String iID3 = null;
-		if(map.get("iIMEI1")!=null){
-			iIMEI1=map.get("iIMEI1").toString();
-		}
-		if(map.get("iIMEI2")!=null){
-			iIMEI2=map.get("iIMEI2").toString();
-		}
-		if(map.get("iIMEI3")!=null){
-			iIMEI3=map.get("iIMEI3").toString();
-		}
-		if(map.get("iMEID")!=null){
-			iMEID=map.get("iMEID").toString();
-		}
-		if(map.get("iNET")!=null){
-			iNET=map.get("iNET").toString();
-		}
-		if(map.get("iID1")!=null){
-			iID1=map.get("iID1").toString();
-		}
-		if(map.get("iID2")!=null){
-			iID2=map.get("iID2").toString();
-		}
-		if(map.get("iID3")!=null){
-			iID3=map.get("iID3").toString();
-		}
-		List<String> list = new ArrayList<String>();
-		list = baseDao.callProcedureWithOut("CS_SETIMEIINFO", new Object[]{
-				String.valueOf(iSN),
-				String.valueOf(iIMEI1),
-				String.valueOf(iIMEI2),
-				String.valueOf(iIMEI3),
-				String.valueOf(iMEID),
-				String.valueOf(iNET),
-				String.valueOf(""),
-				String.valueOf(iID1),
-				String.valueOf(iID2),
-				String.valueOf(iID3),
-		}, new Integer[]{1, 2, 3, 4, 5, 6,7,8,9,10}, new Integer[]{11});
-		oErrMessage = list.get(0);
-		rmap.put("oErrMessage",oErrMessage);
-		return rmap;
-	}
-	private Map<Object,Object> SetTestDetail(JSONObject map){
-		//实际业务数据
-		Map<Object, Object> rmap = new HashMap<>();
-		String oErrMessage=null;
-		if(map.get("iSN")==null){
-			oErrMessage = "SN不能为空";
-			rmap.put("oErrMessage",oErrMessage);
-			return rmap;
-		}
-		String iSN=map.get("iSN").toString();
-		String iTestResult= "";
-		String iResCode= "";
-		String iClassName="";
-		String iTestDetail= "";
-		if(map.get("iTestResult")!=null){
-			iTestResult=map.get("iTestResult").toString();
-		}
-		if(map.get("iClassName")!=null){
-			iClassName=map.get("iClassName").toString();
-		}
-		if(map.get("iResCode")!=null){
-			iResCode=map.get("iResCode").toString();
-		}
-		if(map.get("iTestDetail")!=null){
-			iTestDetail=map.get("iTestDetail").toString();
-		}
-		JSONObject map3=new JSONObject();
-		map3.put("iSN",iSN);
-		Map<Object, Object> map2=GetRcardMOInfo(map3);
-		String omakeCode = "";
-		StringBuffer sql=new StringBuffer();
-		String[] name=iClassName.split("\\|");
-		String[] result=iTestResult.split("\\|");
-		String[] value=iTestDetail.split("\\|");
-		if(name.length!=value.length||name.length!=result.length){
-			rmap.put("oErrMessage","测试项目名称和值的项次不一致");
-			return rmap;
-		}
-		for (int i=0;i<name.length;i++){
-			sql.setLength(0);
-			sql.append("Insert into STEPTESTDETAIL (STD_ID,STD_CLASS,STD_SN,STD_MAKECODE,STD_ACTUALVALUE,STD_TESTRESULT,STD_INDATE,STD_RESCODE)");
-			sql.append("values(STEPTESTDETAIL_SEQ.nextval,'"+name[i]+"','" + iSN + "','" + map2.get("oMoCode") + "','" + value[i] + "','" + result[i] + "',sysdate,'" + iResCode + "')");
-			baseDao.execute(sql.toString());
-		}
-		rmap.put("oErrMessage",oErrMessage);
-		return rmap;
-	}
-
-	private Map<Object,Object> SetPcbaData(JSONObject map){
-		//实际业务数据
-		Map<Object, Object> rmap = new HashMap<>();
-		String oErrMessage = null;
-		if(map.get("iSN")==null){
-			oErrMessage = "SN不能为空";
-			rmap.put("oErrMessage",oErrMessage);
-			return rmap;
-		}
-		String iSN=map.get("iSN").toString();
-		String iResCode = null;
-		String iOperator = null;
-		String iResult = null;
-		String iErrCode = null;
-		if(map.get("iResCode")!=null){
-			iResCode=map.get("iResCode").toString();
-		}
-		if(map.get("iOperater")!=null){
-			iOperator=map.get("iOperater").toString();
-		}
-		if(map.get("iResult")!=null){
-			iResult=map.get("iResult").toString();
-		}
-		if(map.get("iErrCode")!=null){
-			iErrCode=map.get("iErrCode").toString();
-		}
-		JSONObject map3=new JSONObject();
-		map3.put("iSN",iSN);
-		Map<Object, Object> map2=GetRcardMOInfo(map3);
-		String oMoCode=null;
-		if(map2.get("oMoCode")!=null){
-			oMoCode=map2.get("oMoCode").toString();
-		}
-		if (map2.get("oErrMessage")==null)
-			return SetStepFinish(oMoCode, iResCode, iSN, "", iResult, iOperator, iErrCode);
-		return rmap;
-	}
-
-	/// <summary>
-	/// 获取步骤代码
-	/// </summary>
-	/// <param name="Source"></param>
-	/// <returns></returns>
-	private String GetStepCodeBySource(String Source)
-	{
-		Object o=baseDao.getFieldDataByCondition("source", "sc_stepcode", "sc_code='" + Source + "'");
-		if(o!=null)
-			return o.toString();
-		else
-			return "";
-	}
-
-	private Boolean CheckUserLogin(String iUserCode, String iPassWord)
+	private List<Map<Object, Object>> GetBaraccept(String data)
 	{
-		SqlRowList rs =baseDao.queryForRowSet("select em_code from employee where em_code='"+iUserCode+"' and em_password =?",iPassWord);
-		if (rs.next())
-			return true;
-		else
-		{
-			return false;
-		}
-	}
-
-	private Map<Object,Object> GetMakeInfoBySN(JSONObject map)
-	{
-		Map<Object, Object> rmap = new HashMap<Object, Object>();
-		String iSN=null;
-		String oErrMessage=null;
-		if(map.get("iSN")==null){
-			oErrMessage = "SN不能为空";
-			rmap.put("oErrMessage",oErrMessage);
-			return rmap;
-		}
-		iSN=map.get("iSN").toString();
-		SqlRowList rs=baseDao.queryForRowSet("select ma_remark1,ma_remark2,ma_remark3,ma_remark4,ma_remark5,ma_remark6,ma_remark7,ma_remark8,ma_remark9,ma_remark10,ma_remark11,ma_remark12,ma_remark13,ma_remark14,ma_remark15,ma_remark16 from  make  " +
-				"left join makeserial on ms_makecode=ma_code  where ms_sncode='"+iSN+"'");
-		if(rs.next()){
-			rmap.put("oMaremark1",rs.getString("ma_remark1"));
-			rmap.put("oMaremark2",rs.getString("ma_remark2"));
-			rmap.put("oMaremark3",rs.getString("ma_remark3"));
-			rmap.put("oMaremark4",rs.getString("ma_remark4"));
-			rmap.put("oMaremark5",rs.getString("ma_remark5"));
-			rmap.put("oMaremark6",rs.getString("ma_remark6"));
-			rmap.put("oMaremark7",rs.getString("ma_remark7"));
-			rmap.put("oMaremark8",rs.getString("ma_remark8"));
-			rmap.put("oMaremark9",rs.getString("ma_remark9"));
-			rmap.put("oMaremark10",rs.getString("ma_remark10"));
-			rmap.put("oMaremark11",rs.getString("ma_remark11"));
-			rmap.put("oMaremark12",rs.getString("ma_remark12"));
-			rmap.put("oMaremark13",rs.getString("ma_remark13"));
-			rmap.put("oMaremark14",rs.getString("ma_remark14"));
-			rmap.put("oMaremark15",rs.getString("ma_remark15"));
-			rmap.put("oMaremark16",rs.getString("ma_remark16"));
-			return rmap;
-		}else{
-			oErrMessage = "SN未查询到关联信息";
-			rmap.put("oErrMessage",oErrMessage);
-			return rmap;
-		}
-	}
-
-	public Map<Object,Object> SetStepFinish(String iMakeCode, String iSourceCode, String iSN, String iMPKind, String iResult, String iUserCode, String iErrCode)
-	{
-		String oErrMessage = null;
-		Object StepCode = baseDao.getFieldDataByCondition("Makeserial", "ms_stepcode", "ms_sncode='" + iSN + "' and ms_makecode='" + iMakeCode + "'");
-		String CurrentStep = GetStepCodeBySource(iSourceCode);
-		Object BgCode = baseDao.getFieldDataByCondition("step", "nvl(st_badgroupcode,' ')", "st_code='" + CurrentStep + "'");
-		Map<Object, Object> rmap = new HashMap<>();
-		switch (iResult)
-		{
-			case "OK":
-				break;
-			case "NG":
-				if (iErrCode == "")
-				{
-					oErrMessage = "测试结果为NG时必须传递不良代码";
-					rmap.put("oErrMessage",oErrMessage);
-					return rmap;
-				}
-				else
-				{
-					baseDao.updateByCondition("makebad", "mb_status=-1", "mb_sncode='" + iSN + "' and mb_makecode='" + iMakeCode + "' and mb_stepcode='" + CurrentStep + "' and mb_status=0");
-					String[] BadCode = iErrCode.split(",");
-					StringBuffer sql=new StringBuffer();
-					for (int i = 0; i < BadCode.length; i++)
-					{
-						if(!baseDao.checkIf("badcode","bc_code='"+ BadCode[i]+"'")){
-							oErrMessage = "不良代码"+BadCode[i]+"不存在";
-							rmap.put("oErrMessage",oErrMessage);
-							return rmap;
-						}
-						int mb_id = baseDao.getSeqId("makebad_seq");
-						sql.setLength(0);
-						sql.append("insert into makebad(mb_id,mb_makecode,mb_mscode,mb_sncode,mb_inman,mb_indate,mb_stepcode");
-						sql.append(",mb_sourcecode,mb_badcode,mb_badtable,mb_bgcode,mb_soncode,mb_status) select '" + mb_id + "'");
-						sql.append(",ma_code,ms_code,ms_sncode,'" + iUserCode + "',sysdate,'" + CurrentStep + "','" + iSourceCode + "','" + BadCode[i] + "','',");
-						sql.append("'" + BgCode + "',sp_soncode,'0' from make left join makeSerial on ms_makecode=ma_code left join stepProduct on ");
-						sql.append("sp_mothercode=ma_prodcode and sp_stepcode=ms_nextstepcode where ms_sncode='" + iSN + "' and ms_makecode='" + iMakeCode + "'");
-						baseDao.execute(sql.toString());
-					}
-					//将不良的序列号的状态码设为3
-					baseDao.execute("update makeserial set ms_status='3' where ms_sncode='" + iSN + "' and ms_makecode='" + iMakeCode + "'");
-				}
-				break;
-			default:
-				oErrMessage = "测试结果必须为NG或者OK";
-				rmap.put("oErrMessage",oErrMessage);
-				return rmap;
-		}
-		//不良采集为良品是更新
-		if (StepCode!=null &&StepCode.toString().equals(CurrentStep) && iResult == "OK")
-		{
-			Object[] ob = baseDao.getFieldsDataByCondition("makeserial", "ms_status,ms_craftcode,ms_prodcode", "ms_sncode='" + iSN + "' and ms_makecode='" + iMakeCode + "'");
-			if (ob!=null)
-			{
-				String ms_status =ob[0].toString();
-				String ms_craftcode= ob[1].toString();
-				String ms_prodcode = ob[2].toString();
-				if (ms_status == "3")
-				{
-					String nextstepcode =baseDao.getFieldDataByCondition("craft left join craftdetail on cr_id=cd_crid ", "cd_nextstepcode", "cr_code='" + ms_craftcode + "' and cr_prodcode='" + ms_prodcode + "' and cd_stepcode='" + CurrentStep + "'").toString();
-					baseDao.updateByCondition("makeserial", "ms_status=1,ms_nextstepcode='" + nextstepcode + "'", "ms_sncode='" + iSN + "' and ms_makecode='" + iMakeCode + "'");
-					baseDao.updateByCondition("makebad", "mb_status=-1", "mb_sncode='" + iSN + "' and mb_makecode='" + iMakeCode + "'");
-				}
+		List<Map<Object, Object>> maps = BaseUtil.parseGridStoreToMaps(data);
+		List<Map<Object, Object>> relist = new ArrayList<>();
+		for (Map<Object, Object> map : maps) {
+			Map<Object, Object> remap = new HashMap<>();
+			String remark = "";
+			SqlRowList rs=baseDao.queryForRowSet("select ban_id from baracceptnotify where ban_barcode='"+map.get("ban_barcode")+"'");
+			remap.put("ban_id",baseDao.getSeqId("baracceptnotify_seq"));
+			if(rs.hasNext()){
+				remark = "重复";
+				remap.put("remark",remark);
+				relist.add(remap);
+				return relist;
+			}
+			try {
+				baseDao.execute(SqlUtil.getInsertSqlByMap(map,"BARACCEPTNOTIFY"));
+				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);
 		}
-		return CS_SetFinish(iMakeCode, iSourceCode, iSN, iUserCode, iResult);
-	}
-
-	private Map<Object,Object> CS_SetFinish(String iMakeCode, String iSourceCode, String iSN, String iUserCode, String iResult)
-	{
-		Map<Object, Object> rmap = new HashMap<>();
-		String oErrMessage=null;
-		List<String> list = new ArrayList<String>();
-		list = baseDao.callProcedureWithOut("CS_SETSTEPRESULT", new Object[]{
-				String.valueOf(iMakeCode),
-				String.valueOf(iSourceCode),
-				String.valueOf(iSN),
-				String.valueOf(iUserCode),
-				String.valueOf(iResult),
-		}, new Integer[]{1, 2, 3, 4, 5}, new Integer[]{6});
-		oErrMessage = list.get(0);
-		rmap.put("oErrMessage",oErrMessage);
-		return rmap;
+		return relist;
 	}
 
 

src/test/java/com/uas/eis/UasEisApplicationTests.java

@@ -17,11 +17,7 @@ public class UasEisApplicationTests {
 
 	@Test
 	public void Test() {
-		UasEvent uasEvent = new UasEvent();
-		uasEvent.setOperation("POST");
-		uasEvent.setCaller("ProdInOut!Picking");
-		uasEvent.setKey(50769674);
-		uasProdInOutListener.onProdInOutPost_picking(uasEvent);
+
 
 	}