fix(维护): 修改了master 拉取下来项目跑不起来

dev-library/src/main/java/com/tykj/dev/device/library/controller/DeviceLibraryPositionController.java

@@ -2,18 +2,14 @@ package com.tykj.dev.device.library.controller;
 
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.tykj.dev.config.swagger.AutoDocument;
-import com.tykj.dev.device.library.service.DeviceLibraryCacheService;
 import com.tykj.dev.device.library.service.DeviceLibraryPositionService;
-import com.tykj.dev.device.library.subject.domin.DeviceLibrary;
 import com.tykj.dev.device.library.subject.domin.DeviceLibraryPosition;
 import com.tykj.dev.device.library.subject.vo.DeviceLibraryPositionMessageVo;
 import com.tykj.dev.device.library.subject.vo.RotationVo;
-import com.tykj.dev.device.library.subject.vo.ScriptSaveVo;
 import com.tykj.dev.misc.utils.JacksonUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 

dev-readmachine/src/main/java/com/tykj/dev/readmachine/devreadmachine/service/impl/DeviceLibraryPositionServiceImpl.java

 package com.tykj.dev.readmachine.devreadmachine.service.impl;
 
-import com.github.wenhao.jpa.PredicateBuilder;
-import com.github.wenhao.jpa.Specifications;
 import com.tykj.dev.device.library.repository.DeviceLibraryPositionDao;
 import com.tykj.dev.device.library.service.DeviceLibraryPositionService;
 import com.tykj.dev.device.library.subject.domin.DeviceLibraryPosition;
@@ -43,7 +41,6 @@ public class DeviceLibraryPositionServiceImpl implements DeviceLibraryPositionSe
     @Override
     public List<DeviceLibraryPosition> findByStorageLocationId(Integer StorageLocationId) {
         return deviceLibraryPositionDao.findAllByStorageLocationId(StorageLocationId);
-
     }
 
     @Override

dev-storage/src/main/java/com/tykj/dev/device/storage/controller/StorageBillController.java

@@ -21,7 +21,6 @@ import com.tykj.dev.device.library.subject.vo.DeviceLibraryPositionMessageVo;
 import com.tykj.dev.device.library.subject.vo.DeviceLibrarySaveVo;
 import com.tykj.dev.device.library.subject.vo.FileVo;
 import com.tykj.dev.device.library.subject.vo.RotationVo;
-import com.tykj.dev.device.library.utils.DeviceNumberUtils;
 import com.tykj.dev.device.packing.service.PackingLibraryService;
 import com.tykj.dev.device.packing.subject.domin.PackingLibrary;
 import com.tykj.dev.device.storage.repository.StorageBillDao;

dev-taskselect/src/main/java/com/tykj/dev/device/taskselect/controller/TaskSelectController.java

@@ -10,7 +10,6 @@ import com.tykj.dev.device.apply.service.DeviceApplyBillService;
 import com.tykj.dev.device.apply.subject.domin.DeviceApplyBill;
 import com.tykj.dev.device.apply.subject.vo.ApplyBillDetailVo;
 import com.tykj.dev.device.apply.subject.vo.ReplyVo;
-import com.tykj.dev.device.file.entity.FileRet;
 import com.tykj.dev.device.file.service.FilesUtil;
 //import com.tykj.dev.device.library.repository.DeviceLibraryDao;
 import com.tykj.dev.device.library.service.DeviceLibraryService;
@@ -44,10 +43,10 @@ import com.tykj.dev.misc.utils.JacksonUtil;
 import com.tykj.dev.misc.utils.ResultUtil;
 import com.tykj.dev.misc.utils.Snowflake;
 import com.tykj.dev.misc.utils.StringSplitUtil;
-import com.tykj.dev.readmachine.devreadmachine.Entity.ReadMachineBill;
-import com.tykj.dev.readmachine.devreadmachine.Entity.ReadMachineLibrary;
-import com.tykj.dev.readmachine.devreadmachine.service.ReadMachineBillService;
-import com.tykj.dev.readmachine.devreadmachine.service.ReadMachineLibraryService;
+//import com.tykj.dev.readmachine.devreadmachine.Entity.ReadMachineBill;
+//import com.tykj.dev.readmachine.devreadmachine.Entity.ReadMachineLibrary;
+//import com.tykj.dev.readmachine.devreadmachine.service.ReadMachineBillService;
+//import com.tykj.dev.readmachine.devreadmachine.service.ReadMachineLibraryService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.checkerframework.checker.units.qual.Area;
@@ -118,11 +117,11 @@ public class TaskSelectController {
     @Autowired
     private TaskDao taskDao;
 
-    @Autowired
-    private ReadMachineBillService readMachineBillService;
-
-    @Autowired
-    private ReadMachineLibraryService readMachineLibraryService;
+//    @Autowired
+//    private ReadMachineBillService readMachineBillService;
+//
+//    @Autowired
+//    private ReadMachineLibraryService readMachineLibraryService;
 
 //    @Autowired
 //    private DeviceLibraryDao deviceLibraryDao;
@@ -486,18 +485,18 @@ public class TaskSelectController {
 
                 return ResponseEntity.ok(new ResultObj(list, "查询成功"));
 
-            case 30:
-                Map<String,Object> map1 = new HashMap<>();
-                ReadMachineBill readMachineBill = readMachineBillService.findById(taskBto.getBillId());
-                readMachineBill.setCreateUserName(userCache.findById(readMachineBill.getCreateUserId()).getName());
-                readMachineBill.setTaskId(taskId);
-                //通过盘存账单id查询盘存库
-                List<ReadMachineLibrary> readMachineLibraries =
-                        readMachineLibraryService.findByReadMachineBillId(readMachineBill.getId());
-                map1.put("readMachineBill",readMachineBill);
-                readMachineLibraries.forEach(ReadMachineLibrary::setConfigName);
-                map1.put("readMachineLibraries",readMachineLibraries);
-                return ResponseEntity.ok(map1);
+//            case 30:
+//                Map<String,Object> map1 = new HashMap<>();
+//                ReadMachineBill readMachineBill = readMachineBillService.findById(taskBto.getBillId());
+//                readMachineBill.setCreateUserName(userCache.findById(readMachineBill.getCreateUserId()).getName());
+//                readMachineBill.setTaskId(taskId);
+//                //通过盘存账单id查询盘存库
+//                List<ReadMachineLibrary> readMachineLibraries =
+//                        readMachineLibraryService.findByReadMachineBillId(readMachineBill.getId());
+//                map1.put("readMachineBill",readMachineBill);
+//                readMachineLibraries.forEach(ReadMachineLibrary::setConfigName);
+//                map1.put("readMachineLibraries",readMachineLibraries);
+//                return ResponseEntity.ok(map1);
             default:
                 throw new ApiException(ResultUtil.failed("该接口不支持当前task业务类型"));
         }