Merge branch '0.8.X' of https://gitee.com/hdka/klp-oa into 0.8.X
This commit is contained in:
@@ -2600,7 +2600,8 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
|
|||||||
if (StringUtils.isNotBlank(enterCoilNo)) {
|
if (StringUtils.isNotBlank(enterCoilNo)) {
|
||||||
LambdaQueryWrapper<WmsMaterialCoil> enterWrapper = Wrappers.lambdaQuery();
|
LambdaQueryWrapper<WmsMaterialCoil> enterWrapper = Wrappers.lambdaQuery();
|
||||||
enterWrapper.eq(WmsMaterialCoil::getEnterCoilNo, enterCoilNo)
|
enterWrapper.eq(WmsMaterialCoil::getEnterCoilNo, enterCoilNo)
|
||||||
.eq(WmsMaterialCoil::getDelFlag, 0);
|
.eq(WmsMaterialCoil::getDelFlag, 0)
|
||||||
|
.eq(WmsMaterialCoil::getDataType, 1);
|
||||||
long enterCount = baseMapper.selectCount(enterWrapper);
|
long enterCount = baseMapper.selectCount(enterWrapper);
|
||||||
enterCoilNoDuplicate = enterCount > 0;
|
enterCoilNoDuplicate = enterCount > 0;
|
||||||
}
|
}
|
||||||
@@ -2609,7 +2610,9 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
|
|||||||
if (StringUtils.isNotBlank(currentCoilNo)) {
|
if (StringUtils.isNotBlank(currentCoilNo)) {
|
||||||
LambdaQueryWrapper<WmsMaterialCoil> currentWrapper = Wrappers.lambdaQuery();
|
LambdaQueryWrapper<WmsMaterialCoil> currentWrapper = Wrappers.lambdaQuery();
|
||||||
currentWrapper.eq(WmsMaterialCoil::getCurrentCoilNo, currentCoilNo)
|
currentWrapper.eq(WmsMaterialCoil::getCurrentCoilNo, currentCoilNo)
|
||||||
.eq(WmsMaterialCoil::getDelFlag, 0);
|
.eq(WmsMaterialCoil::getDelFlag, 0)
|
||||||
|
.eq(WmsMaterialCoil::getDataType, 1);
|
||||||
|
|
||||||
long currentCount = baseMapper.selectCount(currentWrapper);
|
long currentCount = baseMapper.selectCount(currentWrapper);
|
||||||
currentCoilNoDuplicate = currentCount > 0;
|
currentCoilNoDuplicate = currentCount > 0;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user