fix: 修复工位库存

panjc_field_management
chenhc 9 months ago
parent f23db0fe4a
commit 9e318b8f8e

@ -1,15 +1,23 @@
package com.glxp.api.controller.inout; package com.glxp.api.controller.inout;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.enums.ResultEnum;
import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.controller.BaseController; import com.glxp.api.controller.BaseController;
import com.glxp.api.dao.basic.SysWorkplaceDocumentDao;
import com.glxp.api.entity.auth.SysWorkplace;
import com.glxp.api.entity.basic.SysWorkplaceDocumentEntity;
import com.glxp.api.entity.basic.SysWorkplacePutRel;
import com.glxp.api.req.inout.IoSplitFifoInvRequest; import com.glxp.api.req.inout.IoSplitFifoInvRequest;
import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.res.PageSimpleResponse;
import com.glxp.api.res.inout.IoSplitInvResponse; import com.glxp.api.res.inout.IoSplitInvResponse;
import com.glxp.api.service.auth.SysWorkplaceService;
import com.glxp.api.service.basic.SysWorkplaceDocumentService;
import com.glxp.api.service.inout.IoSplitFifoInvService; import com.glxp.api.service.inout.IoSplitFifoInvService;
import com.glxp.api.service.thrsys.SysWorkplacePutRelService;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.validation.BindingResult; import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
@ -24,9 +32,12 @@ import java.util.List;
@RestController @RestController
public class IoSplitFifoInvController extends BaseController { public class IoSplitFifoInvController extends BaseController {
@Resource
SysWorkplaceService sysWorkplaceService;
@Resource @Resource
IoSplitFifoInvService splitFifoInvService; IoSplitFifoInvService splitFifoInvService;
@Resource
SysWorkplacePutRelService sysWorkplacePutRelService;
/** /**
* *
@ -39,6 +50,16 @@ public class IoSplitFifoInvController extends BaseController {
if (bindingResult.hasErrors()) { if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
} }
//判断是否为采集工位
Long workPlaceCode = ioSplitFifoInvRequest.getWorkPlaceCode();
SysWorkplace workplace = sysWorkplaceService.getWorkplace(workPlaceCode);
Integer workPlaceClass = workplace.getWorkPlaceClass();
if (workPlaceClass == 1){
SysWorkplacePutRel putWorkPlace = sysWorkplacePutRelService.findPutWorkPlace(workPlaceCode, null);
ioSplitFifoInvRequest.setWorkPlaceCode(putWorkPlace.getWorkPlaceCode());
}
List<IoSplitInvResponse> splitCodeEntities = splitFifoInvService.filterList(ioSplitFifoInvRequest); List<IoSplitInvResponse> splitCodeEntities = splitFifoInvService.filterList(ioSplitFifoInvRequest);
for (IoSplitInvResponse ioSplitCodeResponse : splitCodeEntities) { for (IoSplitInvResponse ioSplitCodeResponse : splitCodeEntities) {
if (StrUtil.isEmpty(ioSplitCodeResponse.getGgxh())) { if (StrUtil.isEmpty(ioSplitCodeResponse.getGgxh())) {

Loading…
Cancel
Save