处理原铝重取编号获取问题；

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

@@ -417,13 +417,15 @@ public class EntrustSampleItemServiceImpl extends BaseServiceImpl<EntrustSampleI
 
     public void changeExcelToPdf(Long[] ids, List<EntrustSampleItem> list) {
         List<ItemRelOriginalRecord> recordList = itemRelOriginalRecordService.list(Condition.create().setSqlSelect("record_id").in("item_id", ids).isNotNull("record_id").groupBy("record_id"));
-        if (CollectionUtils.isEmpty(recordList))
+        if (CollectionUtils.isEmpty(recordList)) {
             return;
+        }
         List<Long> recordsList = recordList.stream().map(ItemRelOriginalRecord::getRecordId).collect(Collectors.toList());
 
         List<OriginalRecord> originalRecordList = originalRecordService.list(Condition.create().in("id", recordsList).isNull("pdf_object_key"));
-        if (CollectionUtils.isEmpty(originalRecordList))
+        if (CollectionUtils.isEmpty(originalRecordList)) {
             return;
+        }
 
         excelToPdf(originalRecordList);
 
@@ -1469,7 +1471,7 @@ public class EntrustSampleItemServiceImpl extends BaseServiceImpl<EntrustSampleI
     /**
      * 发送判级后的样品检测数据至ERP
      *
-     * @param sampleVOList
+     * @param sampleBrandMap
      */
     private void sendTestDataToErp(List<Long> ids, Map<Long, String> sampleBrandMap) {
         log("执行发送的样品IDS:" + StringUtils.join(ids, ","));
@@ -1493,7 +1495,7 @@ public class EntrustSampleItemServiceImpl extends BaseServiceImpl<EntrustSampleI
         }
 
         // 获取检测项目指标数据
-        List<Map<String, Object>> dataList = null;
+        List<Map<String, Object>> dataList;
 
         // 此处原铝的和铝成品的查询分开了，实际上只用原铝的即可，铝成品的重写是为了不再对比重取数据
         if (Objects.equals(ylname, sampleName)) {
@@ -1516,7 +1518,9 @@ public class EntrustSampleItemServiceImpl extends BaseServiceImpl<EntrustSampleI
             //Y2112052110C2
             //测试环境中，原铝重取可能并不是同一天生成的，"Y" + DateUtils.dateTransfer(sample.getCtime(), "yyMMdd") + "-" + sample.getSlotNo().trim();
             //根据样品编号，查询出委托id
-            List<Long> entrustIds = entrustSampleService.getEntrustIdsBySampleCodes(sampleCodeList);
+            List<String> sampleCodes = sampleCodeHandle(sampleList);
+            RestAssert.fail(CollectionUtils.isEmpty(sampleCodes), "根据重取编号获取的原铝编号为空!");
+            List<Long> entrustIds = entrustSampleService.getEntrustIdsBySampleCodes(sampleCodes);
 
             logger.error("entrust id is : {}", entrustIds);
             // 基本上不可能为空的
@@ -1557,16 +1561,9 @@ public class EntrustSampleItemServiceImpl extends BaseServiceImpl<EntrustSampleI
         }
     }
 
-    private List<String> getSampleCodes(List<EntrustSample> sampleList) {
-        List<String> sampleCodes = new ArrayList<String>();
-        for (EntrustSample sample : sampleList) {
-            String sampleCode = getSampleCode(sample);
-            sampleCodes.add(sampleCode);
-        }
-        return sampleCodes;
-    }
-
-    private String getSampleCode(EntrustSample sample) {
+    private List<String> sampleCodeHandle(List<EntrustSample> samples) {
+        List<String> codeList = new ArrayList<>();
+        for (EntrustSample sample : samples) {
             String sampleCode = sample.getCode(), prefix = "Y";
             // == 只有旧数据会有这种情况，可以不去考虑
             if (StringUtils.isBlank(sampleCode)) {
@@ -1575,7 +1572,9 @@ public class EntrustSampleItemServiceImpl extends BaseServiceImpl<EntrustSampleI
                 sampleCode = sampleCode.startsWith(prefix) ? sampleCode : (prefix + sampleCode);
                 sampleCode = sampleCode.substring(0, 7) + "-" + sample.getSlotNo().trim();
             }
-        return sampleCode;
+            codeList.add(sampleCode);
+        }
+        return codeList;
     }
 
     private void log(String str) {
@@ -1629,7 +1628,9 @@ public class EntrustSampleItemServiceImpl extends BaseServiceImpl<EntrustSampleI
 
     @Override
     public List<EntrustSampleItemIndexVO> getItemTestByEntrustId(Long entrustId) {
-        if (null == entrustId) return null;
+        if (null == entrustId) {
+            return null;
+        }
         return baseMapper.selectItemTestByEntrustId(entrustId);
     }