master
parent
193490b1b9
commit
b0b024e525
|
@ -219,11 +219,6 @@ public class WmsApiController {
|
||||||
CriteriaQuery cq = new CriteriaQuery(MdCusEntity.class, dataGrid);
|
CriteriaQuery cq = new CriteriaQuery(MdCusEntity.class, dataGrid);
|
||||||
//查询条件组装器
|
//查询条件组装器
|
||||||
org.jeecgframework.core.extend.hqlsearch.HqlGenerateUtil.installHql(cq, mdCus, request.getParameterMap());
|
org.jeecgframework.core.extend.hqlsearch.HqlGenerateUtil.installHql(cq, mdCus, request.getParameterMap());
|
||||||
try{
|
|
||||||
//自定义追加查询条件
|
|
||||||
}catch (Exception e) {
|
|
||||||
throw new BusinessException(e.getMessage());
|
|
||||||
}
|
|
||||||
Map<String,Object> map1 = new HashMap<String,Object>();
|
Map<String,Object> map1 = new HashMap<String,Object>();
|
||||||
map1.put("zhuJiMa", "desc");
|
map1.put("zhuJiMa", "desc");
|
||||||
cq.setOrder(map1);
|
cq.setOrder(map1);
|
||||||
|
@ -251,7 +246,6 @@ public class WmsApiController {
|
||||||
message = "客户编码已经存在";
|
message = "客户编码已经存在";
|
||||||
j.setSuccess(false);
|
j.setSuccess(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
}catch(Exception e){
|
}catch(Exception e){
|
||||||
e.printStackTrace();
|
e.printStackTrace();
|
||||||
throw new BusinessException(e.getMessage());
|
throw new BusinessException(e.getMessage());
|
||||||
|
@ -352,7 +346,6 @@ public class WmsApiController {
|
||||||
AjaxJson j = new AjaxJson();
|
AjaxJson j = new AjaxJson();
|
||||||
String message = "进货通知添加成功";
|
String message = "进货通知添加成功";
|
||||||
try {
|
try {
|
||||||
|
|
||||||
String noticeid = wmUtil.getNextNoticeid(wmImNoticeH.getOrderTypeCode()) ;
|
String noticeid = wmUtil.getNextNoticeid(wmImNoticeH.getOrderTypeCode()) ;
|
||||||
wmImNoticeH.setNoticeId(noticeid);
|
wmImNoticeH.setNoticeId(noticeid);
|
||||||
wmImNoticeH.setCreateDate(DateUtils.getDate());
|
wmImNoticeH.setCreateDate(DateUtils.getDate());
|
||||||
|
@ -505,7 +498,6 @@ public class WmsApiController {
|
||||||
wmomNoticeIEntity.setGoodsId(mvgoods.getGoodsCode());
|
wmomNoticeIEntity.setGoodsId(mvgoods.getGoodsCode());
|
||||||
wmomNoticeIEntity.setGoodsName(mvgoods.getShpMingCheng());
|
wmomNoticeIEntity.setGoodsName(mvgoods.getShpMingCheng());
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
// TODO: handle exception
|
|
||||||
logger.error(ExceptionUtil.getExceptionMessage(e));
|
logger.error(ExceptionUtil.getExceptionMessage(e));
|
||||||
}
|
}
|
||||||
wmomNoticeIListnew.add(wmomNoticeIEntity);
|
wmomNoticeIListnew.add(wmomNoticeIEntity);
|
||||||
|
@ -623,12 +615,10 @@ public class WmsApiController {
|
||||||
CriteriaQuery cq = new CriteriaQuery(WmOmNoticeHEntity.class, dataGrid);
|
CriteriaQuery cq = new CriteriaQuery(WmOmNoticeHEntity.class, dataGrid);
|
||||||
//查询条件组装器
|
//查询条件组装器
|
||||||
org.jeecgframework.core.extend.hqlsearch.HqlGenerateUtil.installHql(cq, wmOmNoticeH);
|
org.jeecgframework.core.extend.hqlsearch.HqlGenerateUtil.installHql(cq, wmOmNoticeH);
|
||||||
|
|
||||||
try {
|
try {
|
||||||
// 自定义追加查询条件
|
// 自定义追加查询条件
|
||||||
String query_imData_begin = request.getParameter("delvData_begin1");
|
String query_imData_begin = request.getParameter("delvData_begin1");
|
||||||
String query_imData_end = request.getParameter("delvData_end2");
|
String query_imData_end = request.getParameter("delvData_end2");
|
||||||
|
|
||||||
if (StringUtil.isNotEmpty(query_imData_begin)) {
|
if (StringUtil.isNotEmpty(query_imData_begin)) {
|
||||||
cq.ge("delvData", new SimpleDateFormat("yyyy-MM-dd hh:mm:ss")
|
cq.ge("delvData", new SimpleDateFormat("yyyy-MM-dd hh:mm:ss")
|
||||||
.parse(query_imData_begin));
|
.parse(query_imData_begin));
|
||||||
|
@ -640,10 +630,8 @@ public class WmsApiController {
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
throw new BusinessException(e.getMessage());
|
throw new BusinessException(e.getMessage());
|
||||||
}
|
}
|
||||||
|
|
||||||
if(StringUtil.isNotEmpty(wmUtil.getCusCode())){
|
if(StringUtil.isNotEmpty(wmUtil.getCusCode())){
|
||||||
cq.eq("cusCode", wmUtil.getCusCode());
|
cq.eq("cusCode", wmUtil.getCusCode());
|
||||||
|
|
||||||
}
|
}
|
||||||
if (wmOmNoticeH.getOmSta() == null) {
|
if (wmOmNoticeH.getOmSta() == null) {
|
||||||
cq.notEq("omSta", Constants.wm_sta4);
|
cq.notEq("omSta", Constants.wm_sta4);
|
||||||
|
|
Loading…
Reference in New Issue