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

PDA API 整理到一个文件

master
erzhongxmu 2022-06-01 12:38:02 +08:00
parent 649f0017e4
commit 4abf18ba8b
4 changed files with 119 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,11 +1,38 @@
package com.zzjee.api;
import com.zzjee.md.entity.MdCusEntity;
import com.zzjee.md.entity.MdGoodsEntity;
import com.zzjee.md.entity.MvGoodsEntity;
import com.zzjee.wm.controller.WmInQmIController;
import com.zzjee.wm.controller.WmToDownGoodsController;
import com.zzjee.wm.controller.WmToUpGoodsController;
import com.zzjee.wm.entity.WmImNoticeHEntity;
import com.zzjee.wm.entity.WmImNoticeIEntity;
import com.zzjee.wm.entity.WmInQmIEntity;
import com.zzjee.wmapi.controller.WvGiNoticeController;
import com.zzjee.wmapi.controller.WvNoticeController;
import com.zzjee.wmapi.entity.WvNoticeEntity;
import com.zzjee.wmutil.wmUtil;
import io.swagger.models.HttpMethod;
import org.apache.commons.lang.StringUtils;
import org.jeecgframework.core.beanvalidator.BeanValidators;
import org.jeecgframework.core.common.model.json.AjaxJson;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.RestController;
import org.jeecgframework.core.util.DateUtils;
import org.jeecgframework.core.util.JSONHelper;
import org.jeecgframework.core.util.ResourceUtil;
import org.jeecgframework.core.util.StringUtil;
import org.jeecgframework.web.system.pojo.base.TSBaseUser;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.MediaType;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.util.UriComponentsBuilder;
import javax.validation.ConstraintViolation;
import java.util.ArrayList;
import java.util.List;
import java.util.Set;
/**
* @Package com.zzjee.api
@ -15,60 +42,107 @@ import org.springframework.web.bind.annotation.RestController;
@RestController
@RequestMapping("/pdaapi")
public class ApiController {
@Autowired
private WvNoticeController wvNoticeController;
@Autowired
private WmInQmIController wmInQmIController;
@Autowired
private WmToUpGoodsController wmToUpGoodsController;
@Autowired
private WvGiNoticeController wvGiNoticeController;
@Autowired
private WmToDownGoodsController wmToDownGoodsController;
//收货相关接口begin
//收货列表
public static final String NoticeController = "/rest/pdaapi/wvNoticeController";
@RequestMapping(value = "/wvNoticeController/list", method = RequestMethod.GET)
@ResponseBody
public ResponseEntity<?> list1(@RequestParam(value = "username", required = false) String username,
@RequestParam(value = "searchstr", required = false) String searchstr,
@RequestParam(value = "searchstr2", required = false) String searchstr2) {
return wvNoticeController.list(username, searchstr, searchstr2);
}
//收货保存
public static final String wmInQmIController = "/rest/pdaapi/wmInQmIController";
@RequestMapping(value = "/wmInQmIController/save", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON_VALUE)
@ResponseBody
public ResponseEntity<?> create1(@RequestParam String wmInQmIstr,
UriComponentsBuilder uriBuilder) {
return wmInQmIController.create(wmInQmIstr, uriBuilder);
}
//收货相关接口end
//上架相关接口begin
//上架列表
public static final String InQmIController = "/rest/pdaapi/wmInQmIController";
@RequestMapping(value = "/wmInQmIController/list", method = RequestMethod.GET)
@ResponseBody
public ResponseEntity<?> list2(@RequestParam(value = "username", required = false) String username,
@RequestParam(value = "searchstr", required = false) String searchstr,
@RequestParam(value = "searchstr2", required = false) String searchstr2) {
return wmInQmIController.list(username, searchstr, searchstr2);
}
//保存上架
public static final String wmToUpGoodsController = "/rest/pdaapi/wmToUpGoodsController";
@RequestMapping(value = "/wmToUpGoodsController/save", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON_VALUE)
@ResponseBody
public ResponseEntity<?> create2(@RequestParam String wmToUpGoodsstr, UriComponentsBuilder uriBuilder) {
return wmToUpGoodsController.create(wmToUpGoodsstr,uriBuilder);
}
//上架相关接口end
//下架相关接口begin
//按单拣货列表
public static final String GINOTICE = "/rest/pdaapi/wvGiNoticeController";
//下架任务 PDA接口
@RequestMapping(value = "/wvGiNoticeController/list", method = RequestMethod.GET)
@ResponseBody
public ResponseEntity<?> list3(@RequestParam(value = "username", required = false) String username,
@RequestParam(value = "searchstr", required = false) String searchstr,
@RequestParam(value = "searchstr2", required = false) String searchstr2,
@RequestParam(value = "searchstr3", required = false) String searchstr3) {
return wvGiNoticeController.lists(username,searchstr,searchstr2,searchstr3);
}
//保存下架
public static final String SAVEGINOTICE = "/rest/pdaapi/wmToDownGoodsController";
//下架
@RequestMapping(value = "/wmToDownGoodsController/save", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON_VALUE)
@ResponseBody
public synchronized ResponseEntity<?> create3(@RequestParam String wmToDownGoodsstr,
UriComponentsBuilder uriBuilder) {
return wmToDownGoodsController.create(wmToDownGoodsstr,uriBuilder);
}
//下架相关接口end
//盘点列表
public static final String SttInGoodsController = "/rest/pdaapi/wmSttInGoodsController";
//盘点保存
public static final String wmSttInGoodsControllerc = "/rest/pdaapi/wmSttInGoodsController/change";
//移储列表
public static final String ToMoveGoodsController = "/rest/pdaapi/wmToMoveGoodsController";
//移储保存
public static final String wmToMoveGoodsControllerc = "/rest/pdaapi/wmToMoveGoodsController/change";
//库存列表
public static final String StockController = "/rest/pdaapi/wvStockController";
//装车复核列表
public static final String wvGiController = "/rest/pdaapi/wvGiController";
public static final String wvGiController = "/rest/wvGiController";
//装车复核保存
public static final String wmToDownGoodsControllerc = "/rest/pdaapi/wmToDownGoodsController/change";
public static final String wmToDownGoodsControllerc = "/rest/wmToDownGoodsController/change";
//商品列表
public static final String GoodsController = "/rest/pdaapi/mdGoodsController";
//商品信息保存
public static final String mdGoodsControllerc = "/rest/pdaapi/mdGoodsController/change";
//商品下单
public static final String mdGoodsControllercorder = "/rest/pdaapi/mdGoodsController/order";
//波次下架列表
public static final String waveToDownList = "/rest/pdaapi/waveToDownController/list/todown";
public static final String waveToDownList = "/rest/waveToDownController/list/todown";
//波次下架保存
public static final String waveToDownSave = "/rest/pdaapi/waveToDownController";
public static final String waveToDownSave = "/rest/waveToDownController";
//波次分拣列表
public static final String waveToFjList = "/rest/pdaapi/waveToFjController/list/tofj";
public static final String waveToFjList = "/rest/waveToFjController/list/tofj";
//波次分拣保存
public static final String waveToFjSave = "/rest/pdaapi/waveToFjController";
public static final String waveToFjSave = "/rest/waveToFjController";
//库存列表
public static final String StockController = "/rest/wvStockController";
//移储列表
public static final String ToMoveGoodsController = "/rest/wmToMoveGoodsController";
//移储保存
public static final String wmToMoveGoodsControllerc = "/rest/wmToMoveGoodsController/change";
//盘点列表
public static final String SttInGoodsController = "/rest/wmSttInGoodsController";
//盘点保存
public static final String wmSttInGoodsControllerc = "/rest/wmSttInGoodsController/change";
//商品列表
public static final String GoodsController = "/rest/mdGoodsController";
//商品信息保存
public static final String mdGoodsControllerc = "/rest/mdGoodsController/change";
//商品下单
public static final String mdGoodsControllercorder = "/rest/mdGoodsController/order";
}

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

@ -934,7 +934,9 @@ public class WmInQmIController extends BaseController {
@RequestMapping(method = RequestMethod.GET)
@ResponseBody
public ResponseEntity<?> list(@RequestParam(value = "username", required = false) String username, @RequestParam(value = "searchstr", required = false) String searchstr, @RequestParam(value = "searchstr2", required = false) String searchstr2) {
public ResponseEntity<?> list(@RequestParam(value = "username", required = false) String username,
@RequestParam(value = "searchstr", required = false) String searchstr,
@RequestParam(value = "searchstr2", required = false) String searchstr2) {
// return listWvGis;

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

@ -339,7 +339,10 @@ public class WvGiNoticeController extends BaseController {
//下架任务 PDA接口
@RequestMapping(value = "/search", method = RequestMethod.GET)
@ResponseBody
public ResponseEntity<?> lists(@RequestParam(value = "username", required = false) String username, @RequestParam(value = "searchstr", required = false) String searchstr, @RequestParam(value = "searchstr2", required = false) String searchstr2, @RequestParam(value = "searchstr3", required = false) String searchstr3) {
public ResponseEntity<?> lists(@RequestParam(value = "username", required = false) String username,
@RequestParam(value = "searchstr", required = false) String searchstr,
@RequestParam(value = "searchstr2", required = false) String searchstr2,
@RequestParam(value = "searchstr3", required = false) String searchstr3) {
// return listWvGis;

15
src/main/java/com/zzjee/wmapi/controller/WvNoticeController.java
View File

@ -328,10 +328,9 @@ public class WvNoticeController extends BaseController {
//PDA接口
@RequestMapping(method = RequestMethod.GET)
@ResponseBody
public ResponseEntity<?> list(@RequestParam(value = "username", required = false) String username, @RequestParam(value = "searchstr", required = false) String searchstr, @RequestParam(value = "searchstr2", required = false) String searchstr2) {
// return listWvGis;
public ResponseEntity<?> list(@RequestParam(value = "username", required = false) String username,
@RequestParam(value = "searchstr", required = false) String searchstr,
@RequestParam(value = "searchstr2", required = false) String searchstr2) {
ResultDO D0 = new ResultDO();
String hql = " from WvNoticeEntity where 1 = 1 ";
D0.setOK(true);
@ -359,21 +358,16 @@ public class WvNoticeController extends BaseController {
} else {
insearch = "goodsCode = '" + s + "'";
}
}
hql = hql + " and (" + insearch + ")";
}
// hql=hql+" and goodsCode in (:alist)";
}
List<WvNoticeEntity> listWvNotices = wvNoticeService.findHql(hql);
D0.setOK(true);
List<WvNoticeEntity> result = new ArrayList<WvNoticeEntity>();
int i = 0;
for (WvNoticeEntity t : listWvNotices) {
i++;
if (i > 100) {
break;
@ -403,7 +397,6 @@ public class WvNoticeController extends BaseController {
if (!failures.isEmpty()) {
return new ResponseEntity(BeanValidators.extractPropertyAndMessage(failures), HttpStatus.BAD_REQUEST);
}
//保存
try {
wvNoticeService.save(wvNotice);
@ -416,7 +409,6 @@ public class WvNoticeController extends BaseController {
URI uri = uriBuilder.path("/rest/wvNoticeController/" + id).build().toUri();
HttpHeaders headers = new HttpHeaders();
headers.setLocation(uri);
return new ResponseEntity(headers, HttpStatus.CREATED);
}
@ -427,7 +419,6 @@ public class WvNoticeController extends BaseController {
if (!failures.isEmpty()) {
return new ResponseEntity(BeanValidators.extractPropertyAndMessage(failures), HttpStatus.BAD_REQUEST);
}
//保存
try {
wvNoticeService.saveOrUpdate(wvNotice);