复核详情修改,复核确认,批量复核、取消BUG修改
This commit is contained in:
@@ -2,6 +2,7 @@ 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 com.fasterxml.jackson.annotation.JsonAlias;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
@@ -46,15 +47,22 @@ public class ReviewOrderDTO extends BaseVOEntity {
|
||||
@ApiModelProperty("创建时间止 yyyy-MM-dd")
|
||||
private String createTimeEnd;
|
||||
|
||||
@ApiModelProperty("接收时间起 yyyy-MM-dd")
|
||||
@ApiModelProperty("下发确认时间起 yyyy-MM-dd(PDA 点击确定/接收的时间)")
|
||||
private String receiveTimeStart;
|
||||
|
||||
@ApiModelProperty("接收时间止 yyyy-MM-dd")
|
||||
@ApiModelProperty("下发确认时间止 yyyy-MM-dd(PDA 点击确定/接收的时间)")
|
||||
private String receiveTimeEnd;
|
||||
|
||||
@ApiModelProperty("复核单ID集合")
|
||||
private List<Long> reviewOrderIds;
|
||||
|
||||
@ApiModelProperty("复核作业人用户ID(复核下发可选,未传则默认当前登录人)")
|
||||
private Long checkOperatorsBy;
|
||||
|
||||
@ApiModelProperty("复核作业人姓名")
|
||||
private String checkOperatorsName;
|
||||
|
||||
@ApiModelProperty("复核明细列表(用于批量复核/取消复核)")
|
||||
@JsonAlias({"materialDetailList"})
|
||||
private List<ReviewMaterialDetailPO> details;
|
||||
}
|
||||
|
||||
+12
@@ -1,5 +1,6 @@
|
||||
package com.mhd.wms.interfaces.facadeApi.reviewOrder;
|
||||
|
||||
import cn.hutool.json.JSONUtil;
|
||||
import com.mhd.common.core.web.controller.BaseController;
|
||||
import com.mhd.common.core.web.domain.AjaxResult;
|
||||
import com.mhd.common.core.web.page.TableDataInfo;
|
||||
@@ -9,6 +10,7 @@ import com.mhd.wms.domain.reviewOrder.repository.todo.ReviewOrderDO;
|
||||
import com.mhd.wms.interfaces.assember.reviewOrder.ReviewOrderAssembler;
|
||||
import com.mhd.wms.interfaces.dto.reviewOrder.ReviewOrderDTO;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.PathVariable;
|
||||
@@ -24,6 +26,7 @@ import java.util.List;
|
||||
/**
|
||||
* PC 复核单接口:列表、详情(头+明细)
|
||||
*/
|
||||
@Slf4j
|
||||
@RestController
|
||||
@RequestMapping("/reviewOrderApi")
|
||||
public class ReviewOrderApi extends BaseController {
|
||||
@@ -55,6 +58,15 @@ public class ReviewOrderApi extends BaseController {
|
||||
return AjaxResult.success(reviewOrderApplicationService.getDetailByReviewOrderNumber(reviewOrderNumber));
|
||||
}
|
||||
|
||||
@ApiOperation("复核下发")
|
||||
@PostMapping("/checkTaskDistribution")
|
||||
public AjaxResult checkTaskDistribution(@RequestBody ReviewOrderDTO reviewOrderDTO) {
|
||||
log.debug("复核单复核下发入参 checkOperatorsBy={}, checkOperatorsName={}, reviewOrderIds={}",
|
||||
reviewOrderDTO.getCheckOperatorsBy(), reviewOrderDTO.getCheckOperatorsName(), reviewOrderDTO.getReviewOrderIds());
|
||||
ReviewOrderDO reviewOrderDO = JSONUtil.toBean(JSONUtil.toJsonStr(reviewOrderDTO), ReviewOrderDO.class);
|
||||
return AjaxResult.success(reviewOrderApplicationService.checkTaskDistribution(reviewOrderDO));
|
||||
}
|
||||
|
||||
@ApiOperation("批量复核")
|
||||
@PostMapping("/batchCheck")
|
||||
public AjaxResult batchCheck(@RequestBody ReviewOrderDTO reviewOrderDTO) {
|
||||
|
||||
Reference in New Issue
Block a user