|
|
@@ -210,10 +210,12 @@ public class MESHelperServiceImpl implements MESHelperService {
|
|
|
}
|
|
|
|
|
|
private Map<Object,Object> GetMakeSN(JSONObject map){
|
|
|
+ Map<Object, Object> rmap = new HashMap<Object, Object>();
|
|
|
List<Map<String, Object>> maps = new ArrayList<>();
|
|
|
String ma_custname="";
|
|
|
String TIME_BEGIN="";
|
|
|
String TIME_END="";
|
|
|
+ String oErrMessage="";
|
|
|
if(map.get("MA_CUSTNAME")==null){
|
|
|
oErrMessage = "客户名称不能为空";
|
|
|
rmap.put("oErrMessage",oErrMessage);
|
|
|
@@ -229,12 +231,11 @@ public class MESHelperServiceImpl implements MESHelperService {
|
|
|
rmap.put("oErrMessage",oErrMessage);
|
|
|
return rmap;
|
|
|
}
|
|
|
- ma_custname=map.get("MA_CUSTNAME");
|
|
|
- TIME_BEGIN=map.get("TIME_BEGIN");
|
|
|
- TIME_END=map.get("TIME_END");
|
|
|
+ ma_custname=map.get("MA_CUSTNAME").toString();
|
|
|
+ TIME_BEGIN=map.get("TIME_BEGIN").toString();
|
|
|
+ TIME_END=map.get("TIME_END").toString();
|
|
|
SqlRowList rs=baseDao.queryForRowSet("select ms_sncode from makeserial left join make on ma_code=ms_makecode where ms_enddate between to_date('"+TIME_BEGIN+"','yyyy-mm-dd') " +
|
|
|
- "and to_date('"+TIME_END+"','yyyy-mm-dd') and ma_custname='"+ma_custname+"'")
|
|
|
- Map<Object, Object> rmap = new HashMap<Object, Object>();
|
|
|
+ "and to_date('"+TIME_END+"','yyyy-mm-dd') and ma_custname='"+ma_custname+"'");
|
|
|
rmap.put("data",rs.getResultList());
|
|
|
return rmap;
|
|
|
}
|