提交代码

dev-allot/src/main/java/com/tykj/dev/device/allot/subject/vo/AllotBillSaveVo.java

@@ -105,6 +105,9 @@ public class AllotBillSaveVo {
     @ApiModelProperty(value = "单据保存vo")
     private List<ScriptSaveVo> scriptSaveVos;
 
+    @ApiModelProperty(value = "")
+    private Integer matchingRange;
+
     /**
      * 转为配发单实体
      */

dev-library/src/main/java/com/tykj/dev/device/library/service/DeviceLibraryService.java

@@ -176,4 +176,9 @@ public interface DeviceLibraryService {
      */
     void judgeSeqNumbersInNotEqualLifeStatus(List<String> seqNumbers,Integer leftStatus);
 
+    /**
+     * 根据装备id集合查询出所有的装备
+     */
+
+    List<DeviceLibrary> getAllDevByDevIds(List<Integer> ids);
 }

dev-library/src/main/java/com/tykj/dev/device/library/service/impl/DeviceLibraryServiceImpl.java

@@ -564,6 +564,12 @@ public class DeviceLibraryServiceImpl implements DeviceLibraryService {
         }
     }
 
+    @Override
+    public List<DeviceLibrary> getAllDevByDevIds(List<Integer> ids) {
+        List<DeviceLibrary> allByIdIn = deviceLibraryDao.findAllByIdIn(ids);
+        return allByIdIn;
+    }
+
     @Override
     public void isNotLoss(List<Integer> ids) {
         ids.forEach(integer -> {

dev-packing/src/main/java/com/tykj/dev/device/packing/service/PackingLibraryService.java

@@ -171,4 +171,5 @@ public interface PackingLibraryService {
      */
     Boolean hasSamePack(Integer parentId,Integer type,Integer style,String name,Integer secretLevel,Integer invisibleRange);
 
+    List<PackingLibrary> getAllByPartPackingId(Integer partPackingId);
 }

dev-packing/src/main/java/com/tykj/dev/device/packing/service/impl/PackingLibraryServiceImpl.java

@@ -642,6 +642,14 @@ public class PackingLibraryServiceImpl implements PackingLibraryService {
         return packingLibraryDao.findAll(predicateBuilder.build()).size()>0;
     }
 
+    @Override
+    public List<PackingLibrary> getAllByPartPackingId(Integer partPackingId) {
+//        PredicateBuilder<PackingLibrary> and = Specifications.and();
+//        and.eq("partParentId",partPackingId);
+//        return packingLibraryDao.findAll(and.build());
+        return packingLibraryDao.findAllByPartParentId(partPackingId);
+    }
+
     private Specification<PackingLibrary> getSelectSpecification(PackingLibrarySelectVo packingLibrarySelectVo) {
         PredicateBuilder<PackingLibrary> predicateBuilder = Specifications.and();
         Integer level = userUtils.getCurrentUnitLevel();