UDI
/
udi-wms-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

确认明细查询

Browse Source
dev_2.5_optimize
yewj 4 months ago
parent 2b6f1fe39b
commit 84929e5f93
2 changed files with 28 additions and 15 deletions
Show Stats Download Patch File Download Diff File

26
src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java
Unescape Escape View File

@ -195,8 +195,6 @@ public class IoCodeTempController extends BaseController {
//取药确认
if (addEnterCodeRequest.getSelectType() != null) {
//判断是都绑定灯组
List<SysOrderLed> orderLeds = sysOrderLedService.list(new LambdaQueryWrapper<SysOrderLed>().isNull(SysOrderLed::getOrderId)
.or()
.eq(SysOrderLed::getOrderId, "")
@ -224,7 +222,6 @@ public class IoCodeTempController extends BaseController {
collectOrderRequest.setBusType(addEnterCodeRequest.getBusType());
collectOrderRequest.setWorkPlaceCode(addEnterCodeRequest.getWorkPlaceCode());
collectOrderRequest.setBillNo(code);
collectOrderRequest.setForceAllot(true);
BaseResponse baseResponse = collectOriginService.downloadOrderV2(collectOrderRequest);
if (ResultEnum.SUCCESS.getCode() == baseResponse.getCode()) {
collectOrder = collectOrderService.unionSearch(null, null, code);
@ -3145,25 +3142,25 @@ public class IoCodeTempController extends BaseController {
@AuthRuleAnnotation("")
@PostMapping("/udiwms/warehouse/inout/deleteCode")
public BaseResponse deleteCode(@RequestBody FilterCodeRequest filterCodeRequest) {
public BaseResponse deleteCode(@RequestBody FilterCodeRequest filterCodeRequest){
// 已经做过校验了 所以 要上药队列 还是库存队列 的码 然后进行扣减库存 删码
IoCodeTempEntity ioCodeTemp = codeTempService.selectOone(filterCodeRequest);
if (ioCodeTemp != null) {
if (ioCodeTemp != null){
codeTempService.removeCodeById(ioCodeTemp);
return ResultVOUtils.success(processUdiAndReturnSuccess(filterCodeRequest));
}
IoSplitFifoCodeEntity ioSplitFifoCode = ioSplitFifoCodeService.selectOne(filterCodeRequest);
if (ioSplitFifoCode != null) {
if (ioSplitFifoCode != null){
ArrayList<String> codes = new ArrayList<>();
codes.add(ioSplitFifoCode.getCode());
ioSplitFifoInvService.removeByCodes(codes, filterCodeRequest.getWorkPlaceCode());
ioSplitFifoInvService.removeByCodes(codes,filterCodeRequest.getWorkPlaceCode());
return ResultVOUtils.success(processUdiAndReturnSuccess(filterCodeRequest));
}
//判断是上位队列 还是 库存
return ResultVOUtils.error(500, "追溯码不存在");
return ResultVOUtils.error(500,"追溯码不存在");
}
public AddEnterCodeResponse processUdiAndReturnSuccess(FilterCodeRequest filterCodeRequest) {
public AddEnterCodeResponse processUdiAndReturnSuccess(FilterCodeRequest filterCodeRequest){
UdiEntity udiEntity = FilterUdiUtils.getUdi(filterCodeRequest.getCode());
UdiRelevanceResponse checkUdi = udiRelevanceService.selectByNameCode(udiEntity.getUdi());
udiEntity.setCode(filterCodeRequest.getCode());
@ -3173,7 +3170,7 @@ public class IoCodeTempController extends BaseController {
@AuthRuleAnnotation("")
@PostMapping("/udiwms/warehouse/inout/deleteCodes")
public BaseResponse deleteCodes(@RequestBody FilterCodeRequest filterCodeRequest) {
public BaseResponse deleteCodes(@RequestBody FilterCodeRequest filterCodeRequest){
List<String> codeList = filterCodeRequest.getCodeList();
AddCodeResult addCodeResult = new AddCodeResult();
List<VailCodeResultResponse> vailCodeResultResponses = new ArrayList<>();
@ -3181,7 +3178,7 @@ public class IoCodeTempController extends BaseController {
VailCodeResultResponse vailCodeResultResponse = new VailCodeResultResponse();
filterCodeRequest.setCode(code);
IoCodeTempEntity ioCodeTemp = codeTempService.selectOone(filterCodeRequest);
if (ioCodeTemp != null) {
if (ioCodeTemp != null){
codeTempService.removeCodeById(ioCodeTemp);
vailCodeResultResponse.setCode(code);
vailCodeResultResponse.setStatus(1);
@ -3190,10 +3187,10 @@ public class IoCodeTempController extends BaseController {
continue;
}
IoSplitFifoCodeEntity ioSplitFifoCode = ioSplitFifoCodeService.selectOne(filterCodeRequest);
if (ioSplitFifoCode != null) {
if (ioSplitFifoCode != null){
ArrayList<String> codes = new ArrayList<>();
codes.add(ioSplitFifoCode.getCode());
ioSplitFifoInvService.removeByCodes(codes, filterCodeRequest.getWorkPlaceCode());
ioSplitFifoInvService.removeByCodes(codes,filterCodeRequest.getWorkPlaceCode());
vailCodeResultResponse.setCode(code);
vailCodeResultResponse.setStatus(1);
vailCodeResultResponse.setErrMsg("正确");
@ -3211,7 +3208,7 @@ public class IoCodeTempController extends BaseController {
@AuthRuleAnnotation("")
@PostMapping("/udiwms/warehouse/inout/fallback")
public BaseResponse fallback(@RequestBody FilterCodeRequest filterCodeRequest) {
public BaseResponse fallback(@RequestBody FilterCodeRequest filterCodeRequest){
List<IoCodeTempEntity> codeList = codeTempService.selectListByGroupNumber(filterCodeRequest.getGroupNumber());
for (IoCodeTempEntity codeTempEntity : codeList) {
codeTempService.removeCodeById(codeTempEntity);
@ -3220,4 +3217,5 @@ public class IoCodeTempController extends BaseController {
}
}

17
src/main/java/com/glxp/api/service/inout/IoSplitFifoInvService.java
Unescape Escape View File

@ -123,10 +123,25 @@ public class IoSplitFifoInvService extends ServiceImpl<IoSplitFifoInvMapper, IoS
splitFifoInv.setAvailableCount(IntUtil.value(splitFifoInv.getAvailableCount()) + IntUtil.value(ioSplitFifoCodeEntity.getTotalCount()));
updateById(splitFifoInv);
} else {
splitFifoInv = IoSplitFifoInv.builder().id(IdUtil.getSnowflakeNextId()).workPlaceCode(ioSplitFifoCodeEntity.getWorkPlaceCode()).deptCode(ioSplitFifoCodeEntity.getDeptCode()).invCode(ioSplitFifoCodeEntity.getInvCode()).productType(ioSplitFifoCodeEntity.getProductType()).fifoSplit(ioSplitFifoCodeEntity.getFifoSplit()).relId(ioSplitFifoCodeEntity.getRelId()).inCodeCount(ioSplitFifoCodeEntity.getScanCount()).batchNo(ioSplitFifoCodeEntity.getBatchNo()).produceDate(ioSplitFifoCodeEntity.getProduceDate()).expireDate(ioSplitFifoCodeEntity.getExpireDate()).supId(ioSplitFifoCodeEntity.getSupId()).inCount(ioSplitFifoCodeEntity.getTotalCount()).outCount(0).reCount(IntUtil.value(ioSplitFifoCodeEntity.getTotalCount())).availableCount(IntUtil.value(ioSplitFifoCodeEntity.getTotalCount())).lockCount(0).createTime(new Date()).updateTime(new Date()).remark(null).enableRemind(false).invRemindCount(0).workPlaceQueueCode(orderEntity.getWorkPlaceQueueCode() == null ? setQueueCode(ioSplitFifoCodeEntity.getWorkPlaceCode(), orderEntity.getCreateUser()) : orderEntity.getWorkPlaceQueueCode()).build();
splitFifoInv = IoSplitFifoInv.builder()
.id(IdUtil.getSnowflakeNextId()).workPlaceCode(ioSplitFifoCodeEntity.getWorkPlaceCode())
.deptCode(ioSplitFifoCodeEntity.getDeptCode())
.invCode(ioSplitFifoCodeEntity.getInvCode())
.productType(ioSplitFifoCodeEntity.getProductType())
.fifoSplit(ioSplitFifoCodeEntity.getFifoSplit()).relId(ioSplitFifoCodeEntity.getRelId())
.inCodeCount(ioSplitFifoCodeEntity.getScanCount())
.batchNo(ioSplitFifoCodeEntity.getBatchNo())
.produceDate(ioSplitFifoCodeEntity.getProduceDate())
.expireDate(ioSplitFifoCodeEntity.getExpireDate())
.supId(ioSplitFifoCodeEntity.getSupId())
.inCount(ioSplitFifoCodeEntity.getTotalCount()).outCount(0)
.reCount(IntUtil.value(ioSplitFifoCodeEntity.getTotalCount()))
.availableCount(IntUtil.value(ioSplitFifoCodeEntity.getTotalCount())).lockCount(0).createTime(new Date()).updateTime(new Date()).remark(null).enableRemind(false).invRemindCount(0).workPlaceQueueCode(orderEntity.getWorkPlaceQueueCode() == null ? setQueueCode(ioSplitFifoCodeEntity.getWorkPlaceCode(), orderEntity.getCreateUser()) : orderEntity.getWorkPlaceQueueCode()).build();
// if (isOnlyInv) {
// splitFifoInv.setBusType(ioSplitFifoCodeEntity.getBusType());
// }
splitFifoInv.setReCodeCount(IntUtil.value(splitFifoInv.getInCodeCount()) - IntUtil.value(splitFifoInv.getOutCodeCount()));
save(splitFifoInv);
//更新库存工位关联
List<SysWorkplacePutRel> sysWorkplacePutRels = sysWorkplacePutRelService.selectByWorkPutCode(orderEntity.getWorkPlaceCode());

Write Preview
Loading…
Cancel
Save