物资-过期物资筛选

jeeplus-modules/jeeplus-psi-management/src/main/java/com/jeeplus/psimanage/psiWareHouse/controller/PsiWareHouseController.java

@@ -198,6 +198,13 @@ public class PsiWareHouseController {
         return ResponseEntity.ok(iPage);
     }
 
+    @ApiOperation(value = "即将过期物资查询")
+    @GetMapping("/nearExpiryList")
+    public ResponseEntity<IPage<PsiWareHouseDto>> nearExpiryList(Page<PsiWareHouseDto> page, PsiWareHouseDto dto) {
+        IPage<PsiWareHouseDto> iPage = basicService.nearExpiryList(page, dto);
+        return ResponseEntity.ok(iPage);
+    }
+
 
 
     /**

jeeplus-modules/jeeplus-psi-management/src/main/java/com/jeeplus/psimanage/psiWareHouse/mapper/PsiWareHouseBasicMapper.java

@@ -62,6 +62,8 @@ public interface PsiWareHouseBasicMapper extends BaseMapper<PsiWareHouseBasic> {
 
     IPage<PsiWareHouseDto> getByProduceDateNotMerge(Page<PsiWareHouseDto> page,@Param(Constants.WRAPPER) QueryWrapper<PsiWareHouseDto> queryWrapper);
 
+    IPage<PsiWareHouseDto> nearExpiryList(Page<PsiWareHouseDto> page, @Param("dto") PsiWareHouseDto dto);
+
     IPage<PsiWareHouseDto> wareHouseHistoryList(Page<PsiWareHouseDto> page,@Param(Constants.WRAPPER) QueryWrapper<PsiWareHouseDto> queryWrapper);
 
     IPage<PsiWareHouseDto> collectHistoryList(Page<PsiWareHouseDto> page,@Param(Constants.WRAPPER) QueryWrapper<PsiWareHouseDto> queryWrapper);

jeeplus-modules/jeeplus-psi-management/src/main/java/com/jeeplus/psimanage/psiWareHouse/service/dto/PsiWareHouseDto.java

@@ -356,4 +356,23 @@ public class PsiWareHouseDto {
      */
     private String lossNumber;
 
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date expiryDate;
+
+    private Integer remainingDays;
+
+    private Integer warnDays;
+
+    /**
+     * 退回量
+     */
+    private String returnedNum;
+
+    /**
+     * 未退回量
+     */
+    private String notSurplusStock;
+
+
+
 }