PDA登录修改,单据查询post

dev_no_inv
yewj 10 months ago
parent 7e8b50d615
commit 8c94f1db23

@ -208,6 +208,8 @@ public class LoginController extends BaseController {
map.put("time", MsDateUtil.getDateTime());
LoginResponse loginResponse = new LoginResponse();
loginResponse.setId(authAdmin.getId() + "");
loginResponse.setUserName(authAdmin.getUserName());
loginResponse.setEmployeeName(authAdmin.getEmployeeName());
loginResponse.setToken(token);
loginResponse.setDept(authAdmin.getLocDeptCode());
loginResponse.setDeptName(authAdmin.getDeptName());

@ -36,7 +36,7 @@ public class BasicCollectUserController extends BaseController {
@GetMapping("/udiwms/sysWorkplace/getUserBindWork")
public BaseResponse getUserBindWork(BasicCollectUserRequest request) {
if (request != null && request.getAutoUserId() != null && request.getAutoUserId() == 1){
if (request != null && request.getAutoUserId() != null && request.getAutoUserId() == 1) {
request.setUserId(String.valueOf(getUserId()));
}
List<UserWorkResponse> page = basicCollectUserService.filterList(request);

@ -78,13 +78,13 @@ public class SysWorkplaceDocumentController extends BaseController {
public BaseResponse workplaceBindBusType(@RequestBody WorkBindBusTypeRequest request) {
Long workplaceCode = request.getWorkplaceCode();
List<String> documentTypeCodes = request.getDocumentTypeCodes();
if (documentTypeCodes.size() == 0){
if (documentTypeCodes.size() == 0) {
return ResultVOUtils.error("请选择绑定的业务类型");
}
List<SysWorkplaceBus> adds = new ArrayList<>();
for (String documentTypeCode : documentTypeCodes) {
SysWorkplaceBus one = sysWorkplaceBusService.getOne(new LambdaQueryWrapper<SysWorkplaceBus>().eq(SysWorkplaceBus::getBusTypeCode, documentTypeCode).eq(SysWorkplaceBus::getWorkplaceCode, workplaceCode));
if (one!= null) {
if (one != null) {
return ResultVOUtils.error("该工位已经绑定该单据类型");
}
SysWorkplaceBus sysWorkplaceBus = new SysWorkplaceBus();
@ -94,7 +94,7 @@ public class SysWorkplaceDocumentController extends BaseController {
}
boolean save = sysWorkplaceBusService.saveBatch(adds);
if (!save){
if (!save) {
return ResultVOUtils.success("绑定失败");
}
return ResultVOUtils.success("绑定成功");
@ -119,10 +119,10 @@ public class SysWorkplaceDocumentController extends BaseController {
@PostMapping("/udiwms/sysWorkplace/updateType")
public BaseResponse updateType(@RequestBody SysWorkplaceDocumentEntity entity) {
if (entity.getInvCode() == null){
if (entity.getInvCode() == null) {
entity.setInvCode(0);
}
if (entity.getScanType() == 1){
if (entity.getScanType() == 1) {
entity.setOrderFinishVerify(4);
}
@ -146,7 +146,7 @@ public class SysWorkplaceDocumentController extends BaseController {
@CusRedissonAnnotation(cacheName = RedissonCacheKey.RM_WORK_BUS_TYPE, key = {"#entity.documentTypeCode"}, waitTime = 3, timeOutMsg = "请勿重复提交")
@PostMapping("/udiwms/sysWorkplace/removeBusTypeByBusTypeAndWorkplace")
public BaseResponse removeBusTypeByBusTypeAndWorkplace(@RequestBody SysWorkplaceDocumentEntity entity) {
Boolean save = sysWorkplaceDocumentService.removeBusTypeByBusTypeAndWorkplace(entity.getWorkplaceCode(),entity.getDocumentTypeCode());
Boolean save = sysWorkplaceDocumentService.removeBusTypeByBusTypeAndWorkplace(entity.getWorkplaceCode(), entity.getDocumentTypeCode());
if (!save) {
return ResultVOUtils.error("移除失败");
}

@ -67,8 +67,8 @@ public class IoCollectOrderController extends BaseController {
@Resource
private BasicCollectUserService basicCollectUserService;
@GetMapping("/udiwms/basic/collect/order/filter")
public BaseResponse filterOrder(CollectOrderRequest collectOrderRequest) {
@PostMapping("/udiwms/basic/collect/order/filter")
public BaseResponse filterOrder(@RequestBody CollectOrderRequest collectOrderRequest) {
List<Long> workPlaceCodes = null;
List<SysWorkplaceDocumentResponse> sysWorkplaceDocumentResponses = null;

@ -15,6 +15,8 @@ public class LoginResponse {
private String dept;
private String deptName;
private String employeeName;
private String userName;
/**
* inout/IoCreateScanOrder
* inout/IoDealOrder

Loading…
Cancel
Save