复核页面修改调整
This commit is contained in:
@@ -1,9 +1,12 @@
|
||||
package com.mhd.wms.interfaces.dto.reviewOrder;
|
||||
|
||||
import com.mhd.common.core.web.domain.BaseVOEntity;
|
||||
import com.mhd.wms.domain.reviewOrder.repository.po.ReviewMaterialDetailPO;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 复核单查询/入参 DTO(列表条件与主键)
|
||||
*/
|
||||
@@ -48,4 +51,10 @@ public class ReviewOrderDTO extends BaseVOEntity {
|
||||
|
||||
@ApiModelProperty("接收时间止 yyyy-MM-dd")
|
||||
private String receiveTimeEnd;
|
||||
|
||||
@ApiModelProperty("复核单ID集合")
|
||||
private List<Long> reviewOrderIds;
|
||||
|
||||
@ApiModelProperty("复核明细列表(用于批量复核/取消复核)")
|
||||
private List<ReviewMaterialDetailPO> details;
|
||||
}
|
||||
|
||||
+43
@@ -12,6 +12,9 @@ import io.swagger.annotations.ApiOperation;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.PathVariable;
|
||||
import org.springframework.web.bind.annotation.PostMapping;
|
||||
import org.springframework.web.bind.annotation.RequestBody;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
|
||||
@@ -40,6 +43,25 @@ public class ReviewOrderApi extends BaseController {
|
||||
return getDataTable(list);
|
||||
}
|
||||
|
||||
/**
|
||||
* 参考出库单详情接口命名:/getInfo/{id}
|
||||
*/
|
||||
@ApiOperation("获取复核单详情(按主键,含明细)")
|
||||
@GetMapping(value = "/getInfo/{reviewOrderId}")
|
||||
public AjaxResult getInfo(@PathVariable("reviewOrderId") Long reviewOrderId) {
|
||||
return AjaxResult.success(reviewOrderApplicationService.getDetailByReviewOrderId(reviewOrderId));
|
||||
}
|
||||
|
||||
/**
|
||||
* 参考出库单按单号查询:用请求参数而非 PathVariable
|
||||
*/
|
||||
@ApiOperation("根据复核单号获取复核单详情(含明细)")
|
||||
@GetMapping(value = "/getInfoReviewOrderNumber")
|
||||
public AjaxResult getInfoReviewOrderNumber(@RequestParam("reviewOrderNumber") String reviewOrderNumber) {
|
||||
return AjaxResult.success(reviewOrderApplicationService.getDetailByReviewOrderNumber(reviewOrderNumber));
|
||||
}
|
||||
|
||||
// 兼容旧接口(前端如仍在调用可继续使用)
|
||||
@ApiOperation("复核单详情(按主键,含明细)")
|
||||
@GetMapping("/detail/{reviewOrderId}")
|
||||
public AjaxResult detail(@PathVariable("reviewOrderId") Long reviewOrderId) {
|
||||
@@ -51,4 +73,25 @@ public class ReviewOrderApi extends BaseController {
|
||||
public AjaxResult detailByNumber(@PathVariable("reviewOrderNumber") String reviewOrderNumber) {
|
||||
return AjaxResult.success(reviewOrderApplicationService.getDetailByReviewOrderNumber(reviewOrderNumber));
|
||||
}
|
||||
|
||||
@ApiOperation("批量复核")
|
||||
@PostMapping("/batchCheck")
|
||||
public AjaxResult batchCheck(@RequestBody ReviewOrderDTO reviewOrderDTO) {
|
||||
ReviewOrderDO cmd = reviewOrderAssembler.toDO(reviewOrderDTO);
|
||||
return toAjax(reviewOrderApplicationService.batchCheck(cmd));
|
||||
}
|
||||
|
||||
@ApiOperation("批量取消复核")
|
||||
@PostMapping("/batchCancelCheck")
|
||||
public AjaxResult batchCancelCheck(@RequestBody ReviewOrderDTO reviewOrderDTO) {
|
||||
ReviewOrderDO cmd = reviewOrderAssembler.toDO(reviewOrderDTO);
|
||||
return toAjax(reviewOrderApplicationService.batchCancelCheck(cmd));
|
||||
}
|
||||
|
||||
@ApiOperation("复核确认")
|
||||
@PostMapping("/checkConfirm")
|
||||
public AjaxResult checkConfirm(@RequestBody ReviewOrderDTO reviewOrderDTO) {
|
||||
ReviewOrderDO cmd = reviewOrderAssembler.toDO(reviewOrderDTO);
|
||||
return toAjax(reviewOrderApplicationService.checkConfirm(cmd));
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user