feat(配套设备库): 新增序列号和数量的校验，修改了自动序列号生成的规则，以及入库做了序列号的校验

dev-matching/src/main/java/com/tykj/dev/device/matching/controller/MatchingDeviceController.java

@@ -122,6 +122,18 @@ public class MatchingDeviceController {
     public ResponseEntity matchingDeviceSplit(@RequestBody List<MatchingDeviceSaveVo> matchingDeviceSaveVos) {
         List<MatchingDeviceSaveVo> matchingDeviceSaveVoList = new ArrayList<>();
 
+        //当手动输入序列号的时候  需要进行遍历成集合
+        matchingDeviceSaveVos.forEach(matchingDeviceSaveVo -> {
+            List<String> deviceSeqs = DeviceSeqUtil.createDeviceSeqs(matchingDeviceSaveVo.getSeqNumber(), matchingDeviceSaveVo.getStorageCount());
+            matchingDeviceSaveVo.setSeqList(deviceSeqs);
+        });
+        //做校验  数量跟序列号
+        matchingDeviceSaveVos.forEach(matchingDeviceSaveVo -> {
+            if (matchingDeviceSaveVo.getStorageCount()!=matchingDeviceSaveVo.getSeqList().size()){
+                throw new ApiException("序列号与入库数量不匹配");
+            }
+        });
+
         for (MatchingDeviceSaveVo matchingDeviceSaveVo : matchingDeviceSaveVos) {
             List<String> seqList = matchingDeviceSaveVo.getSeqList();
             for (int i = 0; i < seqList.size(); i++) {
@@ -143,7 +155,15 @@ public class MatchingDeviceController {
 //        MatchingDeviceBill matchingDeviceBillEntity = matchingDeviceBillSaveVo.toDo();
 //        matchingDeviceBillEntity.setFileRets(FilesUtil.stringFileToList(matchingDeviceBillSaveVo.getFileRets()));
 //        MatchingDeviceBill m = matchingDeviceBillService.addEntity(matchingDeviceBillEntity);
-
+        //校验
+        List<String> seqNumList = matchingDeviceBillSaveVo.getMatchingDeviceSaveVoList().stream().
+                map(MatchingDeviceSaveVo::getSeqNumber).collect(Collectors.toList());
+        //所有的入库配套设备的序列号
+        List<String> matchingDeviceLibraryListSeqNumberList = matchingDeviceLibraryService.getAllMatchingDeviceLibraryListSeqNumberList();
+        matchingDeviceLibraryListSeqNumberList.retainAll(seqNumList);
+        if (matchingDeviceLibraryListSeqNumberList.size()>0){
+            throw new ApiException("序列号"+matchingDeviceLibraryListSeqNumberList+"已存在");
+        }
         StringBuffer stringBuffer = new StringBuffer();
         stringBuffer.append("x");
         Integer userId = userUtils.getCurrentUserId();
@@ -558,7 +578,8 @@ public class MatchingDeviceController {
 
         String model = createSeqVo.getModel();
         //通过型号查询对应的id
-        MatchingDeviceModel matchingDeviceModel = matchingDeviceModelService.findByModel(model);
+//        MatchingDeviceModel matchingDeviceModel = matchingDeviceModelService.findByModel(model);
+        MatchingDeviceModel matchingDeviceModel = matchingDeviceModelService.findByModelAndName(model, createSeqVo.getName());
         String idString;
         if (matchingDeviceModel != null){
             idString = matchingDeviceModel.getId().toString();

dev-matching/src/main/java/com/tykj/dev/device/matching/repository/MatchingDeviceModelDao.java

@@ -10,4 +10,5 @@ import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 public interface MatchingDeviceModelDao extends JpaRepository<MatchingDeviceModel, Integer>, JpaSpecificationExecutor<MatchingDeviceModel> {
 
         MatchingDeviceModel findByModel(String model);
+        MatchingDeviceModel findByModelAndName(String model,String name);
 }

dev-matching/src/main/java/com/tykj/dev/device/matching/service/MatchingDeviceModelService.java

@@ -14,4 +14,9 @@ public interface MatchingDeviceModelService {
      */
     MatchingDeviceModel findByModel(String model);
 
+    /**
+     * 通过型号和名称查询
+     */
+    MatchingDeviceModel findByModelAndName(String model,String name);
+
 }

dev-matching/src/main/java/com/tykj/dev/device/matching/service/impl/MatchingDeviceModelServiceImpl.java

@@ -21,4 +21,9 @@ public class MatchingDeviceModelServiceImpl implements MatchingDeviceModelServic
     public MatchingDeviceModel findByModel(String model) {
         return matchingDeviceModelDao.findByModel(model);
     }
+
+    @Override
+    public MatchingDeviceModel findByModelAndName(String model, String name) {
+        return matchingDeviceModelDao.findByModelAndName(model,name);
+    }
 }

dev-matching/src/main/java/com/tykj/dev/device/matching/subject/domin/MatchingDeviceModel.java

@@ -35,6 +35,9 @@ public class MatchingDeviceModel {
     @ApiModelProperty(value = "型号")
     private String model;
 
+    @ApiModelProperty(value = "名称")
+    private String name;
+
     /**
      * delete_tag
      */