添加样品判断

src/main/java/com/patzn/cloud/service/lims/hmhj/service/impl/EntrustServiceImpl.java

@@ -190,6 +190,7 @@ public class EntrustServiceImpl extends BaseServiceImpl<EntrustMapper, Entrust>
 
         String sampleCode = null;
         String replaceStr = "XX", inspectNo = "", secondCode = "", thirdCode = "";
+        // ==
         if ("已有编码物资".equals(parentCategory)) {
             sampleCode = sample.getCode();
         } else {
@@ -266,6 +267,12 @@ public class EntrustServiceImpl extends BaseServiceImpl<EntrustMapper, Entrust>
             }
         }
     }
+    // 验证样品非空字段
+    private void judgeSampleFields(EntrustSample sample) {
+        RestAssert.fail(StringUtils.isBlank(sample.getCode()), "样品编号不能为空");
+        RestAssert.fail(StringUtils.isBlank(sample.getName()), "样品名称(物资名称)不能为空");
+        RestAssert.fail(StringUtils.isBlank(sample.getSampleFrom()), "样品来源不能为空");
+    }
 
     @Transactional(rollbackFor = Exception.class)
     @Override
@@ -297,6 +304,7 @@ public class EntrustServiceImpl extends BaseServiceImpl<EntrustMapper, Entrust>
                 sample.setEntrustId(entrust.getId());
                 //生成样品编号
                 initSampleCode(sample);
+                judgeSampleFields(sample);
                 sample.setId(IdWorker.getId());
                 sample.setOrderBy(incNum);
                 saveSampleList.add(sample);
@@ -460,6 +468,7 @@ public class EntrustServiceImpl extends BaseServiceImpl<EntrustMapper, Entrust>
 
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public boolean editEntrust(EntrustDTO entrustDTO, Account account) {
         if (null == entrustDTO.getId()) {
             return false;
@@ -494,6 +503,8 @@ public class EntrustServiceImpl extends BaseServiceImpl<EntrustMapper, Entrust>
                     saveSampleList.add(sample);
                 }
 
+                judgeSampleFields(sample);
+
                 List<EntrustSampleItem> viewItemList = dto.getItemList();
                 if (CollectionUtils.isNotEmpty(viewItemList)) {
                     for (EntrustSampleItem item : viewItemList) {
@@ -1015,6 +1026,7 @@ public class EntrustServiceImpl extends BaseServiceImpl<EntrustMapper, Entrust>
                 sample.setCode(null);
                 //生成样品编号,可能存在为空的情况
                 initSampleCode(sample);
+                judgeSampleFields(sample);
                 sample.setEntrustId(entrust.getId()).setOrderBy(sampleIndex).setStatus(EntrustSampleStatusEnum.DRAFT).setProgress(EntrustSampleStatusEnum.DRAFT)
                         .setOrderBy(sampleIndex).setOkJudge(null).setJudgerId(null).setJudgeProgress(null).setJudger(null).setJudgeStatus(null).setJudgeCheckTime(null)
                         .setJudgeCheckerId(null).setAppearanceResult(null).setSurplusSampleLimit(null).setReceiver(null).setReceiverId(null).setReceiveTime(null)