|
|
@@ -431,6 +431,7 @@ public class MESHelperServiceImpl implements MESHelperService {
|
|
|
String oErrMessage = null;
|
|
|
String oWIFI = "";
|
|
|
String oBT = "";
|
|
|
+ String oNetCard = "";
|
|
|
String oCode1 = "";
|
|
|
String oCode2 = "";
|
|
|
String oCode3 = "";
|
|
|
@@ -450,19 +451,21 @@ public class MESHelperServiceImpl implements MESHelperService {
|
|
|
return rmap;
|
|
|
}
|
|
|
List<String> list = new ArrayList<String>();
|
|
|
- list = baseDao.callProcedureWithOut(Master+".CS_GETADDRESSBYMAKECODE", new Object[]{
|
|
|
+ list = baseDao.callProcedureWithOut(Master+".CS_GETADDRESSBYMAKECODE_TOOL", new Object[]{
|
|
|
String.valueOf(iSN),
|
|
|
String.valueOf(map2.get("oMoCode").toString()),
|
|
|
- }, new Integer[]{1,2}, new Integer[]{3,4,5,6,7,8});
|
|
|
+ }, new Integer[]{1,2}, new Integer[]{3,4,5,6,7,8,9});
|
|
|
oWIFI = list.get(0);
|
|
|
oBT = list.get(1);
|
|
|
- oCode1 = list.get(2);
|
|
|
- oCode2 = list.get(3);
|
|
|
- oCode3 = list.get(4);
|
|
|
- oErrMessage= list.get(5);
|
|
|
+ oNetCard = list.get(2);
|
|
|
+ oCode1 = list.get(3);
|
|
|
+ oCode2 = list.get(4);
|
|
|
+ oCode3 = list.get(5);
|
|
|
+ oErrMessage= list.get(6);
|
|
|
if (oErrMessage == "" || oErrMessage == null || oErrMessage == "null"){
|
|
|
rmap.put("oWIFI",oWIFI);
|
|
|
rmap.put("oBT",oBT);
|
|
|
+ rmap.put("oNetCard",oNetCard);
|
|
|
rmap.put("oCode1",oCode1);
|
|
|
rmap.put("oCode2",oCode2);
|
|
|
rmap.put("oCode3",oCode3);
|