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

APP-自主移库接口修改

master
erzhongxmu 2022-09-09 18:06:32 +08:00
parent c5a28be247
commit ce8b5d989f
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/com/zzjee/api/ApiController.java
View File

@ -240,8 +240,9 @@ public class ApiController {
@ResponseBody @ResponseBody
public ResponseEntity<?> list7(@RequestParam(value = "username", required = false) String username, public ResponseEntity<?> list7(@RequestParam(value = "username", required = false) String username,
@RequestParam(value = "searchstr", required = false) String searchstr, @RequestParam(value = "searchstr", required = false) String searchstr,
@RequestParam(value = "searchstr2", required = false) String searchstr2) { @RequestParam(value = "searchstr2", required = false) String searchstr2,
return wvStockController.list(username, searchstr, searchstr2); @RequestParam(value = "searchstr2", required = false) String searchstr3) {
return wvStockController.list(username, searchstr, searchstr2,searchstr3);
} }
//移储列表 //移储列表
@ -297,7 +298,6 @@ public class ApiController {
} }
//商品信息保存 //商品信息保存
public static final String mdGoodsControllerc = "/rest/mdGoodsController/change";
@RequestMapping(value = "/mdGoodsController/save", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON_VALUE) @RequestMapping(value = "/mdGoodsController/save", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON_VALUE)
@ResponseBody @ResponseBody
@ -306,6 +306,14 @@ public class ApiController {
return mdGoodsController.update(mdGoodsstr, uriBuilder); return mdGoodsController.update(mdGoodsstr, uriBuilder);
} }
//PDA移储保存
@RequestMapping(value = "/wmToMoveGoodsController/save", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON_VALUE)
@ResponseBody
public ResponseEntity<?> update11(@RequestParam String wmToMoveGoodsstr,
UriComponentsBuilder uriBuilder) {
return wmToMoveGoodsController.update(wmToMoveGoodsstr, uriBuilder);
}
//商品下单 //商品下单
@RequestMapping(value = "/mdGoodsController/order", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON_VALUE) @RequestMapping(value = "/mdGoodsController/order", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON_VALUE)
@ResponseBody @ResponseBody

6
src/main/java/com/zzjee/wm/controller/WvStockController.java
View File

@ -824,7 +824,8 @@ public class WvStockController extends BaseController {
@ResponseBody @ResponseBody
public ResponseEntity<?> list(@RequestParam(value = "username", required = false) String username, public ResponseEntity<?> list(@RequestParam(value = "username", required = false) String username,
@RequestParam(value = "searchstr", required = false) String searchstr, @RequestParam(value = "searchstr", required = false) String searchstr,
@RequestParam(value = "searchstr2", required = false) String searchstr2) { @RequestParam(value = "searchstr2", required = false) String searchstr2,
@RequestParam(value = "searchstr2", required = false) String searchstr3) {
// return listWvGis; // return listWvGis;
@ -834,6 +835,9 @@ public class WvStockController extends BaseController {
if (!StringUtil.isEmpty(searchstr)) { if (!StringUtil.isEmpty(searchstr)) {
hql = hql + " and kuWeiBianMa like '%" + searchstr + "%'"; hql = hql + " and kuWeiBianMa like '%" + searchstr + "%'";
} }
if (!StringUtil.isEmpty(searchstr3)) {
hql = hql + " and binId like '%" + searchstr3 + "%'";
}
if (!StringUtil.isEmpty(searchstr2)) { if (!StringUtil.isEmpty(searchstr2)) {
try { try {
String shpbianma = wmUtil.getmdgoodsbytiaoma(searchstr2); String shpbianma = wmUtil.getmdgoodsbytiaoma(searchstr2);