更新

dev-rfid/src/main/java/com/tykj/dev/rfid/controller/RfidController.java

@@ -113,16 +113,26 @@ public class RfidController {
 
     @ApiOperation(value = "再次打印标签(已入库),未入库只能后台调打印", notes = "可以通过这个接口打印RFID")
     @PostMapping(value = "/print")
+    @org.springframework.transaction.annotation.Transactional(rollbackFor = Exception.class)
     public ResponseEntity printRfid(@RequestBody List<RfidPrintVo> rfid) {
         Map<String,DeviceLibrary> map = deviceLibraryService.getAllDeviceSeqMap();
         List<DeviceLogDto> deviceLogDtos = new ArrayList<>();
+        List<PrintVo> printVos = new ArrayList<>();
         //调用打印服务 批量打印
         for (RfidPrintVo printVo : rfid) {
             DeviceLibrary deviceLibrary = map.get(printVo.getDeviceNumber());
             PrintVo printVo1 = new PrintVo(RfidServiceImpl.completeRfidStr(String.valueOf(deviceLibrary.getId())), deviceLibrary.getModel(), deviceLibrary.getName(),deviceLibrary.getSeqNumber());
-            rfidService.printString(Collections.singletonList(printVo1));
-            deviceLogDtos.add(new DeviceLogDto(deviceLibrary.getId(), "打印标签", null));
+            printVos.add(printVo1);
+            if ("".equals(deviceLibrary.getRfidCardId())) {
+                deviceLibrary.setRfidCardId(RfidServiceImpl.completeRfidStr(String.valueOf(deviceLibrary.getId())));
+                deviceLibraryService.update(deviceLibrary);
+                deviceLogDtos.add(new DeviceLogDto(deviceLibrary.getId(), "打印标签", null));
+            }
+            else {
+                deviceLogDtos.add(new DeviceLogDto(deviceLibrary.getId(), "更换标签", null));
+            }
         }
+        rfidService.printString(printVos.stream().sorted(Comparator.comparing(PrintVo::getRfidContent)).collect(Collectors.toList()));
         deviceLogService.addAllLog(deviceLogDtos);
         return ResultUtil.success("打印成功");
     }

dev-storage/src/main/java/com/tykj/dev/device/storage/subject/vo/StorageBillSaveVo.java

@@ -129,7 +129,7 @@ public class StorageBillSaveVo {
             storageBillEntity.setApplyFiles(FilesUtil.stringFileToList(this.applyFiles));
         }
         if(this.allotFiles!=null&&this.allotFiles.size()>0){
-            storageBillEntity.setAllotFiles(FilesUtil.stringFileToList(this.applyFiles));
+            storageBillEntity.setAllotFiles(FilesUtil.stringFileToList(this.allotFiles));
         }
         return storageBillEntity;
     }