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

一步上架

master
e 2019-01-02 21:45:11 +08:00
parent 59e9bab475
commit 857844d9de
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/com/zzjee/wm/controller/WmInQmIController.java
View File

@ -950,7 +950,12 @@ for (WmInQmIEntity wmInQmIEntity : wmInQmIso) {
}catch (Exception e){
}
wmInQmIService.save(wmInQmI);
String id = wmInQmIService.save(wmInQmI).toString();
if("on".equals(ResourceUtil.getConfigByName("onestepup"))&&StringUtil.isNotEmpty(wmInQmI.getBinId())){
toup(id);
}
D0.setOK(true);
}
} catch (Exception e) {

12
src/main/java/com/zzjee/wmapi/controller/WvGiNoticeController.java
View File

@ -181,7 +181,6 @@ public class WvGiNoticeController extends BaseController {
/**
* 添加wv_gi_notice
*
* @param ids
* @return
*/
@RequestMapping(params = "doAdd")
@ -205,7 +204,6 @@ public class WvGiNoticeController extends BaseController {
/**
* 更新wv_gi_notice
*
* @param ids
* @return
*/
@RequestMapping(params = "doUpdate")
@ -376,6 +374,16 @@ public class WvGiNoticeController extends BaseController {
}
List<WvGiNoticeEntity> listWvGiNotices=wvGiNoticeService.findHql(hql);
if(listWvGiNotices==null||listWvGiNotices.size()==0){
hql = " from WvGiNoticeEntity where 1 = 1 ";
if(!StringUtil.isEmpty(searchstr)) {
hql=hql+" and omNoticeId like '%" + searchstr + "%'";
}
listWvGiNotices=wvGiNoticeService.findHql(hql);
}
// public ResponseEntity<?> list(@RequestParam String username, @RequestParam String searchstr) {
// ResultDO D0 = new ResultDO();
// List<WvGiNoticeEntity> listWvGiNotices=wvGiNoticeService.getList(WvGiNoticeEntity.class);