|
@@ -1769,13 +1769,15 @@ public class MESHelperServiceImpl implements MESHelperService {
|
|
|
rmap.put("message","单号和序号不能为空");
|
|
rmap.put("message","单号和序号不能为空");
|
|
|
return rmap;
|
|
return rmap;
|
|
|
}
|
|
}
|
|
|
|
|
+ String filepath="";
|
|
|
List<String> list = new ArrayList<String>();
|
|
List<String> list = new ArrayList<String>();
|
|
|
list = baseDao.callProcedureWithOut("SP_VERGETBARCODE", new Object[]{
|
|
list = baseDao.callProcedureWithOut("SP_VERGETBARCODE", new Object[]{
|
|
|
String.valueOf(macode),
|
|
String.valueOf(macode),
|
|
|
String.valueOf(detno),
|
|
String.valueOf(detno),
|
|
|
String.valueOf(count),
|
|
String.valueOf(count),
|
|
|
- }, new Integer[]{1, 2, 3}, new Integer[]{4});
|
|
|
|
|
|
|
+ }, new Integer[]{1, 2, 3}, new Integer[]{4,5});
|
|
|
oErrMessage=list.get(0);
|
|
oErrMessage=list.get(0);
|
|
|
|
|
+ filepath=list.get(1);
|
|
|
if(oErrMessage!=null){
|
|
if(oErrMessage!=null){
|
|
|
rmap.put("code",-1);
|
|
rmap.put("code",-1);
|
|
|
rmap.put("message",oErrMessage);
|
|
rmap.put("message",oErrMessage);
|
|
@@ -1796,6 +1798,7 @@ public class MESHelperServiceImpl implements MESHelperService {
|
|
|
msl_id+=rs.getGeneralInt("msl_id")+",";
|
|
msl_id+=rs.getGeneralInt("msl_id")+",";
|
|
|
}
|
|
}
|
|
|
rmap.put("code",0);
|
|
rmap.put("code",0);
|
|
|
|
|
+ rmap.put("filepath",filepath);
|
|
|
rmap.put("data",maps);
|
|
rmap.put("data",maps);
|
|
|
return rmap;
|
|
return rmap;
|
|
|
}
|
|
}
|