更新

dev-packing/src/main/java/com/tykj/dev/device/packing/controller/PackingLibraryController.java

@@ -4,6 +4,7 @@ import com.tykj.dev.config.swagger.AutoDocument;
 import com.tykj.dev.device.library.repository.DeviceLibraryDao;
 import com.tykj.dev.device.library.service.DeviceLibraryService;
 import com.tykj.dev.device.library.subject.domin.DeviceLibrary;
+import com.tykj.dev.device.packing.repository.PackingLibraryDao;
 import com.tykj.dev.device.packing.service.PackingLibraryService;
 import com.tykj.dev.device.packing.subject.domin.PackingLibrary;
 import com.tykj.dev.device.packing.subject.vo.*;
@@ -42,6 +43,9 @@ public class PackingLibraryController {
     @Autowired
     DeviceLibraryService deviceLibraryService;
 
+    @Autowired
+    PackingLibraryDao packingLibraryDao;
+
     @ApiOperation(value = "获取装备单据显示", notes = "获取装备单据显示")
     @PostMapping("/getAllotScript")
     public ResponseEntity getAllotScript(@RequestBody List<Integer> ids){

dev-packing/src/main/java/com/tykj/dev/device/packing/repository/PackingLibraryDao.java

@@ -22,4 +22,6 @@ public interface PackingLibraryDao extends JpaRepository<PackingLibrary, Integer
     List<PackingLibrary> findAllByIsRootAndPackingStatus(Integer isRoot,Integer packingStatus);
 
     List<PackingLibrary> findAllByPartParentIdAndMatchingRange(Integer partParentId,Integer matchingRange);
+
+    List<PackingLibrary> findAllByDeleteTag(Integer deleteTag);
 }

dev-packing/src/main/java/com/tykj/dev/device/packing/service/impl/PackingLibraryServiceImpl.java

@@ -34,7 +34,6 @@ import org.springframework.stereotype.Service;
 
 import javax.persistence.Transient;
 import java.lang.reflect.Field;
-import java.sql.Timestamp;
 import java.util.*;
 import java.util.concurrent.CompletableFuture;
 import java.util.stream.Collectors;
@@ -223,8 +222,8 @@ public class PackingLibraryServiceImpl implements PackingLibraryService {
     @Override
     public void delete(Integer id) {
         PackingLibrary packingLibrary = getOne(id);
-        packingLibrary.setPackingStatus(3);
-        packingLibrary.setExitTime(Timestamp.from(new Date().toInstant()));
+        packingLibrary.setPackingStatus(4);
+//        packingLibrary.setExitTime(Timestamp.from(new Date().toInstant()));
         if (packingLibrary.getIsRoot()==1) {
             packingLibrary.setShowOrder(9999);
         }

dev-packing/src/main/java/com/tykj/dev/device/packing/subject/domin/PackingLibrary.java

@@ -72,7 +72,7 @@ public class PackingLibrary {
     /**
      * 列装状态(0:待审核,1:审核失败,2:已列装,3:已退装,4:退装待审核)
      */
-    @ApiModelProperty(value = "列装状态(0:待审核,1:审核失败,2:已列装,3:已退装,4:退装待审核)")
+    @ApiModelProperty(value = "列装状态(0:待审核,1:审核失败,2:已列装,3:已退装,4:已删除)")
     private Integer packingStatus;
     /**
      * 型号