Merge branch 'master' of http://120.76.47.59:3000/liu_li/yxk_StoreroomSystem

archives/src/main/java/com/storeroom/modules/archives/controller/BorrowController.java

@@ -0,0 +1,16 @@
+package com.storeroom.modules.archives.controller;
+
+import io.swagger.annotations.Api;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequiredArgsConstructor
+@Api(tags = "借还管理")
+@RequestMapping("/api/borrow")
+public class BorrowController {
+
+
+
+}

archives/src/main/java/com/storeroom/modules/archives/controller/StorageController.java

@@ -152,7 +152,7 @@ public class StorageController {
 
                     }
                 }catch (Exception e){
-                    e.printStackTrace();
+                    System.out.println("入库：连接设备第三方接口失败");
                 }
             }
         }
@@ -202,7 +202,7 @@ public class StorageController {
 
                         }
                     }catch(Exception e){
-                        e.printStackTrace();
+                        System.out.println("出库：连接设备第三方接口失败");
                     }
                 }
             }
@@ -215,10 +215,21 @@ public class StorageController {
     public ApiResponse<Object> rfidCollect(
             @Validated @RequestBody List<CollectDTO> dtos
     ){
-        
+        caseService.rfidCollect(dtos);
         return ApiResponse.success(dtos.size());
     }
 
+    @ApiOperation("手持机-出库")
+    @AnonymousPostMapping("/rfidGrant")
+    public ApiResponse<Object> rfidGrant(
+            @Validated @RequestBody List<String> caseIds
+    ){
+        for(String caseId:caseIds){
+            caseService.grant(false,caseId);
+        }
+        return ApiResponse.success(caseIds.size());
+    }
+
 //    第一版本 出库  防止业务回滚  注释不删
 //    @ApiOperation("出库")
 //    @PostMapping("/grant")

archives/src/main/java/com/storeroom/modules/archives/domain/BorrowSetting.java

@@ -0,0 +1,23 @@
+package com.storeroom.modules.archives.domain;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.persistence.*;
+
+@Entity
+@Getter
+@Setter
+@Table(name = "borrow_setting")
+public class BorrowSetting {
+
+    @Id
+    @GeneratedValue(strategy= GenerationType.IDENTITY)
+    private Integer id;
+
+    @Column(name = "is_type")
+    @ApiModelProperty(value = "状态 0.离线 1.在线")
+    private Boolean isType;
+
+}

archives/src/main/java/com/storeroom/modules/archives/repository/BorrowSettingRepository.java

@@ -0,0 +1,7 @@
+package com.storeroom.modules.archives.repository;
+
+import com.storeroom.modules.archives.domain.BorrowSetting;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface BorrowSettingRepository extends JpaRepository<BorrowSetting, Integer> {
+}

archives/src/main/java/com/storeroom/modules/archives/service/ArchivesCaseService.java

@@ -55,7 +55,9 @@ public interface ArchivesCaseService {
     Object initCaseByArchives(String archivesId);
     //入库
     List<ArchivesCase> collect(boolean isCallback, List<CollectDTO> dtos);
-    //预手动恰如苦
+    //手持盘点机 批量入库
+    Object rfidCollect( List<CollectDTO> dtos);
+    //预人工确认
     List<Map<String,Object>> readyCollectConfirm(List<String> caseIds);
     //手动入库确认
     Object collectConfirm(List<String> caseIds);

archives/src/main/java/com/storeroom/modules/archives/service/impl/ArchivesCaseServiceImpl.java

@@ -10,6 +10,7 @@ import com.storeroom.modules.archives.domain.vo.ArchivesCaseVO;
 import com.storeroom.modules.archives.service.dto.CaseDTO;
 import com.storeroom.modules.archives.service.dto.CollectDTO;
 import com.storeroom.modules.common.ArchivesTypeEnum;
+import com.storeroom.modules.device.domain.DeviceArchivesTag;
 import com.storeroom.modules.device.domain.DeviceInfo;
 import com.storeroom.modules.device.repository.DeviceArchivesTagRepository;
 import com.storeroom.modules.device.repository.DeviceInfoRepository;
@@ -505,6 +506,62 @@ public class ArchivesCaseServiceImpl implements ArchivesCaseService {
         return cases;
     }
 
+    @Override
+    public Object rfidCollect(List<CollectDTO> dtos) {
+        List<ArchivesCase> cases = new ArrayList<>();
+        Set<ArchivesSummary> archices = new HashSet<>();
+        for (CollectDTO dto : dtos){
+            Optional<DeviceArchivesTag> optional = deviceArchivesTagRepository.findById(dto.getShelfId());
+            if(!optional.isPresent())
+                break;
+            ArchivesCase archivesCase = caseRepository.findCaseById(dto.getCaseId());
+            archivesCase.setShelfId(dto.getShelfId());
+            archivesCase.setFolderLocation(dto.getPosition());
+            archivesCase.setFolderLocationDetails(dto.getPositionName());
+            archivesCase.setStorageType(2);
+            cases.add(archivesCase);
+
+            List<ArchivesSummary> thisSummarys = archivesSummaryRepository.findAllByCaseNoLike(dto.getCaseId());
+            for(ArchivesSummary summary : thisSummarys){
+                String summaryCaseIds =  summary.getCaseNo();
+                String[] caseIds = summaryCaseIds.split(",");
+                String newShelfId = "";String newLocation = "";String newLocationName="";
+                Integer resultOk = 0;
+                for (String caseId : caseIds){
+                    for(CollectDTO dto1 : dtos){
+                        if(caseId.equals(dto1.getCaseId())){
+                            Optional<DeviceArchivesTag> optional1 = deviceArchivesTagRepository.findById(dto1.getShelfId());
+                            if(!optional1.isPresent())
+                                break;
+                            DeviceArchivesTag tag1 = optional1.get();
+                            newShelfId += tag1.getId() + ",";
+                            newLocation += tag1.getPosition() + ",";
+                            newLocationName += tag1.getPosition_name()+",";
+                            resultOk++;
+                        }
+                    }
+                }
+                if(resultOk>0){
+                    newShelfId = newShelfId.substring(0,newShelfId.length()-1);
+                    newLocation = newLocation.substring(0,newLocation.length()-1);
+                    newLocationName = newLocationName.substring(0,newLocationName.length()-1);
+                }
+                summary.setShelfId(newShelfId);
+                summary.setFolderLocation(newLocation);
+                summary.setFolderLocationDetails(newLocationName);
+                archices.add(summary);
+            }
+        }
+        cases = caseRepository.saveAllAndFlush(cases);
+        archivesSummaryRepository.saveAllAndFlush(archices);
+        List<StorageLog> storageLogs = new ArrayList<>();
+        for (ArchivesCase archivesCase:cases){
+            this.recordStorage(archivesCase,2);
+        }
+        storageLogRepository.saveAll(storageLogs);
+        return cases;
+    }
+
     @Override
     public List<Map<String,Object>> readyCollectConfirm(List<String> caseIds) {
         return caseRepository.readyCollectConfirm(caseIds);