|
|
@@ -210,8 +210,33 @@ public class MESHelperServiceImpl implements MESHelperService {
|
|
|
}
|
|
|
|
|
|
private Map<Object,Object> GetMakeSN(JSONObject map){
|
|
|
-
|
|
|
-
|
|
|
+ List<Map<String, Object>> maps = new ArrayList<>();
|
|
|
+ String ma_custname="";
|
|
|
+ String TIME_BEGIN="";
|
|
|
+ String TIME_END="";
|
|
|
+ if(map.get("MA_CUSTNAME")==null){
|
|
|
+ oErrMessage = "客户名称不能为空";
|
|
|
+ rmap.put("oErrMessage",oErrMessage);
|
|
|
+ return rmap;
|
|
|
+ }
|
|
|
+ if(map.get("TIME_BEGIN")==null){
|
|
|
+ oErrMessage = "开始时间不能为空";
|
|
|
+ rmap.put("oErrMessage",oErrMessage);
|
|
|
+ return rmap;
|
|
|
+ }
|
|
|
+ if(map.get("TIME_END")==null){
|
|
|
+ oErrMessage = "结束时间不能为空";
|
|
|
+ rmap.put("oErrMessage",oErrMessage);
|
|
|
+ return rmap;
|
|
|
+ }
|
|
|
+ ma_custname=map.get("MA_CUSTNAME");
|
|
|
+ TIME_BEGIN=map.get("TIME_BEGIN");
|
|
|
+ TIME_END=map.get("TIME_END");
|
|
|
+ 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>();
|
|
|
+ rmap.put("data",rs.getResultList());
|
|
|
+ return rmap;
|
|
|
}
|
|
|
|
|
|
private Map<Object,Object> GetFeeReason(JSONObject map){
|