|
|
|
@ -297,8 +297,6 @@ public class IoSplitCodeService extends ServiceImpl<IoSplitCodeMapper, IoSplitCo
|
|
|
|
|
.findFirst();
|
|
|
|
|
if (firstMatch1.isPresent()) {
|
|
|
|
|
result = firstMatch1.get();
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if (result != null) {
|
|
|
|
|
IoSplitCodeEntity ioSplitCodeEntity = IoSplitCodeEntity.builder().code(result.getUdiCode())
|
|
|
|
|
.errUdiCode(result.getUdiCode())
|
|
|
|
@ -320,6 +318,20 @@ public class IoSplitCodeService extends ServiceImpl<IoSplitCodeMapper, IoSplitCo
|
|
|
|
|
this.decorateUnpackExpireTime(ioSplitCodeEntity);
|
|
|
|
|
splitCodeService.save(ioSplitCodeEntity);
|
|
|
|
|
}
|
|
|
|
|
} else {
|
|
|
|
|
firstMatch1 = collectOrderCodeMEN.stream()
|
|
|
|
|
.filter(item ->
|
|
|
|
|
IntUtil.value(item.getSplitFlag()) && item.getBizIdFk().equals(collectOrderBiz.getId()))
|
|
|
|
|
.findFirst();
|
|
|
|
|
if (firstMatch1.isPresent()) {
|
|
|
|
|
result = firstMatch1.get();
|
|
|
|
|
IoSplitCodeEntity splitCodeEntity = splitCodeService.findByCode(result.getUdiCode(), putWorkPlaceCode);
|
|
|
|
|
splitCodeEntity.setRemainCount(-unTagCount);
|
|
|
|
|
splitCodeService.updateById(splitCodeEntity);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|