[清退] 日志代码提交

dev-sendback/src/main/java/com/tykj/dev/device/sendback/service/impl/SendBackServiceImpl.java

@@ -444,19 +444,20 @@ public class SendBackServiceImpl implements SendBackService {
         sendBackOutVo.setActualOut(idList.size());
         sendBackOutVo.setShouldOut(idList.size());
         List<DeviceLibrary> deviceLibraries= new ArrayList<>();
-        deviceLibraryDao.getDeviceLibraryEntitiesByIdIn(idList).forEach(
-                deviceLibrary -> {
-                        if (!deviceLibrary.getOwnUnit().equals(deviceLibrary.getLocationUnit())){
-                            deviceLibrary.setManageStatus(0);
-                            sendBackOutVo.setIsNotOutbound(1);
-                        }
-                        deviceLibraries.add(deviceLibrary);
-                }
-        );
+        boolean flag=false;
+        for (DeviceLibrary deviceLibrary:deviceLibraryDao.getDeviceLibraryEntitiesByIdIn(idList)) {
+            if (!deviceLibrary.getOwnUnit().equals(deviceLibrary.getLocationUnit())){
+                deviceLibrary.setManageStatus(0);
+                sendBackOutVo.setIsNotOutbound(1);
+                flag=true;
+            }
+            deviceLibraries.add(deviceLibrary);
+        }
         sendBackOutVo.setDeviceLibraryEntities(deviceLibraries);
-        Task exlTask= taskDao.findByParentTaskIdAndAndTitle(taskId,"异常装备描述");
-        sendBackOutVo.setExcTask(exlTask.getId());
-
+        if (flag) {
+            Task exlTask = taskDao.findByParentTaskIdAndAndTitle(taskId, "异常装备描述");
+            sendBackOutVo.setExcTask(exlTask.getId());
+        }
         return ResponseEntity.ok(sendBackOutVo);
     }
 
@@ -531,7 +532,16 @@ public class SendBackServiceImpl implements SendBackService {
         Area area = areaDao.getOne(unit.getAreaId());
 
         List<Units> fatherUnit = unitsDao.findByAreaId(area.getFatherId());
-        taskEntity.setOwnUnit(fatherUnit.get(0).getUnitId());
+        Units father=fatherUnit.get(0);
+        taskEntity.setOwnUnit(father.getUnitId());
+        SendBackBill sendBackBill=  sendBackBillEntityDao.getOne(taskEntity.getBillId());
+        List<Integer> idList=stringToList(sendBackBill.getInvoleDevice());
+        deviceLibraryDao.getDeviceLibraryEntitiesByIdIn(idList).forEach(
+                deviceLibrary -> {
+                    DeviceLogDto deviceLogDto = new DeviceLogDto(deviceLibrary.getId(),"清退装备出库等待"+father.getName()+"签收",null);
+                    deviceLogService.addLog(deviceLogDto);
+                }
+        );
         taskService.moveToSpecial(taskEntity,StatusEnum.SEND_BACK_1206,0);
 
         return ResponseEntity.ok("装配入库申请发送成功");
@@ -566,9 +576,12 @@ public class SendBackServiceImpl implements SendBackService {
         List<Integer> idList = stringToList(bill.getInvoleDevice());
         List<DeviceLibrary> deviceList = deviceLibraryDao.getDeviceLibraryEntitiesByIdIn(idList);
         for (DeviceLibrary d:deviceList) {
+            DeviceLogDto deviceLogDto = new DeviceLogDto(d.getId(),"清退装备签收入库完成",null);
+            deviceLogService.addLog(deviceLogDto);
             d.setLocationUnit(unit.getName());
             d.setOwnUnit(unit.getName());
             d.setManageStatus(1);
+
         }
         deviceLibraryDao.saveAll(deviceList);