platformx-device-biz/src/main/java/com/by4cloud/platformx/device/service/impl/DeviceLeasingLedgerServiceImpl.java
@@ -67,9 +67,9 @@ ) { for (DeviceLeasingLedgerItem item:deviceLeasingLedger.getLedgerItemList() ) { if (contractItem.getDeviceId()==item.getDeviceId()){ if (contractItem.getDeviceId().equals(item.getDeviceId())){ if (contractItem.getNum()!=item.getNum()) { return R.failed("合同中"+contract.getName()+"设备数量与台账明细中不一致"); return R.failed("合同中"+item.getDeviceName()+"设备数量与台账明细中不一致"); } } } platformx-device-biz/src/main/java/com/by4cloud/platformx/device/service/impl/ReceivingNoteServiceImpl.java
@@ -72,6 +72,20 @@ if (contractItem.getNum()!=item.getNum()) { return R.failed("合同中"+item.getDeviceName()+"设备数量与验收明细中不一致"); } } //设备序列号检查是否有相同的存在 List<String> serialArr = Arrays.stream(item.getSerialNos().split(",")).collect(Collectors.toList()); for (String serialNo:serialArr ) { QueryWrapper<DeviceInventory> inventoryQueryWrapper = new QueryWrapper<>(); inventoryQueryWrapper.eq("device_id",item.getDeviceId()); inventoryQueryWrapper.eq("serial_no",serialNo); List<DeviceInventory> inventoryList = inventoryMapper.selectList(inventoryQueryWrapper); if (inventoryList!=null&&inventoryList.size()>0){ return R.failed("合同明细中设备序列号"+serialNo+"已存在,请检查序列号"); } } } }