|
|
@@ -80,7 +80,7 @@ public class MESHelperServiceImpl implements MESHelperService {
|
|
|
case GetMobileAllInfo:
|
|
|
remap = GetMobileAllInfo(json);
|
|
|
break;
|
|
|
- case SetAddressInfo:
|
|
|
+ case Info:
|
|
|
remap = SetAddressInfo(json);
|
|
|
break;
|
|
|
case GetMaster:
|
|
|
@@ -730,6 +730,7 @@ public class MESHelperServiceImpl implements MESHelperService {
|
|
|
String iWIFI = null;
|
|
|
String iBT = null;
|
|
|
String iNetCard=null;
|
|
|
+ String iNetCard2=null;
|
|
|
String iCode1 = null;
|
|
|
String iCode2 = null;
|
|
|
String iCode3 = null;
|
|
|
@@ -745,6 +746,9 @@ public class MESHelperServiceImpl implements MESHelperService {
|
|
|
if(map.get("iNetCard")!=null){
|
|
|
iNetCard=map.get("iNetCard").toString();
|
|
|
}
|
|
|
+ if(map.get("iNetCard2")!=null){
|
|
|
+ iNetCard2=map.get("iNetCard").toString();
|
|
|
+ }
|
|
|
if(map.get("iCode1")!=null){
|
|
|
iCode1=map.get("iCode1").toString();
|
|
|
}
|
|
|
@@ -755,15 +759,16 @@ public class MESHelperServiceImpl implements MESHelperService {
|
|
|
iCode3=map.get("iCode3").toString();
|
|
|
}
|
|
|
List<String> list = new ArrayList<String>();
|
|
|
- list = baseDao.callProcedureWithOut(Master+".CS_SETADDRESSINFO_TOOL", new Object[]{
|
|
|
+ list = baseDao.callProcedureWithOut(Master+".CS_SETADDRESSINFO_TOOL_NEW", new Object[]{
|
|
|
String.valueOf(iSN),
|
|
|
String.valueOf(iWIFI),
|
|
|
String.valueOf(iBT),
|
|
|
String.valueOf(iNetCard),
|
|
|
+ String.valueOf(iNetCard2),
|
|
|
String.valueOf(iCode1),
|
|
|
String.valueOf(iCode2),
|
|
|
String.valueOf(iCode3)
|
|
|
- }, new Integer[]{1, 2, 3, 4, 5, 6,7}, new Integer[]{8});
|
|
|
+ }, new Integer[]{1, 2, 3, 4, 5, 6,7,8}, new Integer[]{9});
|
|
|
oErrMessage = list.get(0);
|
|
|
rmap.put("oErrMessage",oErrMessage);
|
|
|
return rmap;
|