优化

platform-dao/src/main/java/com/platform/dao/dto/sqarepartmanage/SparePartInfoDTO.java

@@ -27,6 +27,7 @@ import java.util.List;
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = true)
 public class SparePartInfoDTO extends BaseDTO implements Serializable {
+    private Integer oldOrNew;
     /**
      * 是否专用备件
      */

platform-rest/src/main/java/com/platform/rest/controller/yongyou/YongyouController.java

@@ -110,8 +110,8 @@ public class YongyouController {
         return new R<>(yongyouService.selectPageList2(spareStoreDTO, pageNum, pageSize));
     }
 
-    @GetMapping("/spareStore/page3")
-    public R<List<SpareStoreVO>> querySpareStore3(SpareStoreDTO spareStoreDTO) {
+    @PostMapping("/spareStore/page3")
+    public R<List<SpareStoreVO>> querySpareStore3(@RequestBody SpareStoreDTO spareStoreDTO) {
         return new R<>(yongyouService.selectPageList3(spareStoreDTO));
     }
 

platform-service/src/main/java/com/platform/service/sb/impl/SbModelSpareBomServiceImpl.java

@@ -84,6 +84,7 @@ public class SbModelSpareBomServiceImpl extends BaseServiceImpl<SbModelSpareBomM
             sparePartInfoDTO.setNo(vo.getNo());
             sparePartInfoDTO.setGgxh(vo.getGgxh());
             sparePartInfoDTO.setName(vo.getSpareName());
+            sparePartInfoDTO.setOldOrNew(vo.getOldOrNew());
             sparePartInfoDTOS.add(sparePartInfoDTO);
         }
         List<String> spareIds = sparePartInfoDTOS.stream().map(SparePartInfoDTO::getId).collect(Collectors.toList());
@@ -115,6 +116,7 @@ public class SbModelSpareBomServiceImpl extends BaseServiceImpl<SbModelSpareBomM
         sbModelSpareBom.setSpareName(dto.getName());
         sbModelSpareBom.setModelId(sbId);
         sbModelSpareBom.setNo(dto.getNo());
+        sbModelSpareBom.setOldOrNew(dto.getOldOrNew());
         sbModelSpareBom.setCreatedUserId(userInfo.getUserId());
         sbModelSpareBom.setCreatedUserName(userInfo.getUsername());
         sbModelSpareBom.setCreatedTime(LocalDateTime.now());

platform-service/src/main/java/com/platform/service/store/impl/OutStoreFormServiceImpl.java

@@ -383,10 +383,10 @@ public class OutStoreFormServiceImpl extends BaseServiceImpl<OutStoreFormMapper,
                                 }
                             }
                             if (!flag) {
-                                packageBom(boms, detailDTO, form.getSbId());
+                                packageBom(boms, detailDTO, form.getSbId(),model.getOldOrNew());
                             }
                         } else {
-                            packageBom(boms, detailDTO, form.getSbId());
+                            packageBom(boms, detailDTO, form.getSbId(),model.getOldOrNew());
                         }
 
                     }
@@ -423,7 +423,7 @@ public class OutStoreFormServiceImpl extends BaseServiceImpl<OutStoreFormMapper,
     }
 
 
-    private void packageBom(List<SbModelSpareBom> boms,OutStoreDetailDTO detailDTO,String sbId){
+    private void packageBom(List<SbModelSpareBom> boms,OutStoreDetailDTO detailDTO,String sbId,Integer oldOrNew){
         SbModelSpareBom sbModelSpareBom = new SbModelSpareBom();
         sbModelSpareBom.setSpareId(detailDTO.getSpareId());
         sbModelSpareBom.setSbId(sbId);
@@ -433,6 +433,7 @@ public class OutStoreFormServiceImpl extends BaseServiceImpl<OutStoreFormMapper,
         sbModelSpareBom.setSpareName(detailDTO.getSpareName());
         sbModelSpareBom.setModelId(sbId);
         sbModelSpareBom.setNo(detailDTO.getSpareNo());
+        sbModelSpareBom.setOldOrNew(oldOrNew);
         boms.add(sbModelSpareBom);
     }