Commit 8ad2988f by jiangxuming

处理编号顺序与orderBy顺序不一致的问题

parent 403de2a5
......@@ -1705,6 +1705,7 @@ public class EntrustServiceImpl extends BaseServiceImpl<EntrustMapper, Entrust>
List<EntrustSample> sampleList = entrustSampleService.getByEntrustId(entrust.getId());
RestAssert.fail(CollectionUtils.isEmpty(sampleList), String.format("委托编号为的【%s】样品为空!", entrust.getCode()));
// 若存在任何一个样品的编号为空,那么需要自动生成其编号
int incNum = 10;
for (EntrustSample sample : sampleList) {
sampleSlotNoHandler(sample);
if (StringUtils.isBlank(sample.getCode()) || Objects.nonNull(sample.getSamplingId())) {
......@@ -1714,6 +1715,8 @@ public class EntrustServiceImpl extends BaseServiceImpl<EntrustMapper, Entrust>
sampleCodeHandler(sample);
// 处理重取原编号
retakeSourceCodeHandle(sample);
sample.setOrderBy(incNum);
incNum += 10;
RestAssert.fail(entrustSampleService.isRepeatSampleCode(sample), String.format("样品编号【%s】重复!", sample.getCode()));
}
entrustSampleService.updateBatchById(sampleList);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment