zcy
/
jee_wms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

上下架读取商品名称

master
e 2020-01-10 12:18:21 +08:00
parent cceda3ab5c
commit 5aaf024c3e
2 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/main/java/com/zzjee/tms/controller/TmsYwDingdanController.java
View File

@ -192,17 +192,17 @@ public class TmsYwDingdanController extends BaseController {
throw new BusinessException(e.getMessage());
}
cq.eq("zhuangtai","已下单");
TSUser user = ResourceUtil.getSessionUser();
if(!StringUtil.isEmpty(user.getCurrentDepart().getOrgCode())){
cq.like("sysOrgCode",user.getCurrentDepart().getOrgCode()+"%");
}
if(!StringUtil.isEmpty(user.getUserType())){
if(user.getUserType().equals("4")){
cq.eq("username",user.getUserName());
}
}
// TSUser user = ResourceUtil.getSessionUser();
// if(!StringUtil.isEmpty(user.getCurrentDepart().getOrgCode())){
// cq.like("sysOrgCode",user.getCurrentDepart().getOrgCode()+"%");
//
// }
// if(!StringUtil.isEmpty(user.getUserType())){
// if(user.getUserType().equals("4")){
// cq.eq("username",user.getUserName());
// }
//
// }
cq.add();
this.tmsYwDingdanService.getDataGridReturn(cq, true);
TagUtil.datagrid(response, dataGrid);

2
src/main/java/com/zzjee/wm/controller/WmOmNoticeHController.java
View File

@ -2474,6 +2474,8 @@ public class WmOmNoticeHController extends BaseController {
tms.setShrdh(wmOmNoticeH.getDelvAddr());//收货人地址
tms.setBy1(wmOmNoticeH.getReMember());//区域
tms.setFadh(noticeid);
tms.setZhuangtai("已下单");
tms.setFahuoren(wmOmNoticeH.getPiClass());//配送点
systemService.save(tms);
D0.setOK(true);
//按照Restful风格约定，创建指向新任务的url, 也可以直接返回id或对象.