修改样品：添加电解质标样编码规则；

调整铝成品发送处理逻辑；
铝成品查询优化；

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

@@ -1453,7 +1453,10 @@ public class EntrustSampleItemServiceImpl extends BaseServiceImpl<EntrustSampleI
             // 处理一级编码的报告文件
             handleSampleBrand(ids, finalSampleBrandMap, true);
 
+        });
+
         // 针对铝成品和原铝进行发送ERP数据处理
+        executor1.execute(() -> {
             logger.error("{}开始执行发送ERP请求:---->ERP---", DateUtils.toYearMonthDayTime(new Date()));
             sendTestDataToErp(Arrays.asList(ids), finalSampleBrandMap);
         });
@@ -1529,7 +1532,8 @@ public class EntrustSampleItemServiceImpl extends BaseServiceImpl<EntrustSampleI
         } else {
             dataList = entrustSampleItemIndexService.listCpSampleItemIndex(null, ids);
         }
-
+        // ==
+        RestAssert.fail(CollectionUtils.isEmpty(dataList), String.format("【%s】要发送的数据为空!", sampleName));
         // == search data loop
         dataList.forEach(t -> {
             Long sampleId = Long.valueOf(t.get("id").toString());

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

@@ -290,6 +290,8 @@ public class EntrustServiceImpl extends BaseServiceImpl<EntrustMapper, Entrust>
         if (HmConst.EXIST_CODE_MATERIALS.equals(parentCategory)) {
             sampleCode = sample.getCode().toUpperCase();
         } else {
+            // 不为空时处理逻辑：
+            if (null != codeType) {
                 Integer codeTypeVal = (Integer) codeType.getValue();
                 sampleCode = codeRuleService.getKey(codeTypeVal, codeType.getName(), sample);
                 // 生成编号，赋予编号规则类型
@@ -340,6 +342,7 @@ public class EntrustServiceImpl extends BaseServiceImpl<EntrustMapper, Entrust>
                         sampleCode = newSampleCode;
                     }
                 }
+
                 // 电解质散样样品编号处理
                 // else if (CodeTypeEnum.ELECT_BULK_SAMPLE_CODE == codeType) {
                 //     // D+@yyMMdd&-&${et.slotNo}
@@ -355,6 +358,13 @@ public class EntrustServiceImpl extends BaseServiceImpl<EntrustMapper, Entrust>
                 //     String queryKey = sampleCode.substring(0, sampleCode.length() - 1);
                 //     sampleCode = entrustSampleService.getNewCode(queryKey, 1);
                 // }
+            } else {
+                // 默认年月日，有槽号，带上槽号
+                sampleCode = DateUtils.dateTransfer(new Date(), "yyyyMMdd");
+                if (StringUtils.isNotBlank(sample.getSlotNo())) {
+                    sampleCode += "-" + sample.getSlotNo();
+                }
+            }
         }
 
         if (StringUtils.isNotBlank(sampleCode)) {

src/main/resources/mapper/hmhj/EntrustSampleItemIndexMapper.xml

@@ -170,6 +170,7 @@
     <!--查询铝成品要发送ERP数据-->
     <select id="selectCpSampleItemIndex" resultType="java.util.Map">
         SELECT
+            s.id,
             s.code "sample_code",
             s.name "sample_name",
             s.sample_from,
@@ -205,7 +206,7 @@
             </foreach>
         </if>
         group by
-            s.code,s.name,s.sample_from,s.sample_grading
+            s.id,s.code,s.name,s.sample_from,s.sample_grading
     </select>
 
     <delete id="physicalDeleteByItemIds">

src/main/resources/mapper/hmhj/EntrustSampleItemMapper.xml

@@ -710,7 +710,7 @@
                 JOIN entrust_sample s ON s.ID = i.entrust_sample_id
         WHERE
             ii.deleted = 0
-          AND is_numeric ( ii.test_value )
+          AND TRIM(ii.test_value) ~ '^([0-9]+[.]?[0-9]*|[.][0-9]+)$'
           AND s.NAME = '铝成品'
           AND s.entrust_id = #{entrustId}
         GROUP BY