diff --git a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java b/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java index 25346a78a..5ee72c29e 100644 --- a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java +++ b/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java @@ -65,7 +65,7 @@ public class IoCollectOrderController extends BaseController { public BaseResponse filterOrder(CollectOrderRequest collectOrderRequest) { List workPlaceCodes = null; - List sysWorkplaceDocumentResponses = null; + List sysWorkplaceDocumentResponses = null; List page; WorkBindBusTypeRequest workBindBusTypeRequest = new WorkBindBusTypeRequest(); if (collectOrderRequest.getWorkPlaceCode() == null) { @@ -83,13 +83,13 @@ public class IoCollectOrderController extends BaseController { //通过工位列表 获取出 业务列表 workBindBusTypeRequest.setWorkPlaceCodes(workPlaceCodes); sysWorkplaceDocumentResponses = sysWorkplaceDocumentService.filterListByWorkplace(workBindBusTypeRequest); - }else { + } else { workBindBusTypeRequest.setWorkplaceCode(collectOrderRequest.getWorkPlaceCode()); sysWorkplaceDocumentResponses = sysWorkplaceDocumentService.filterListByWorkplace(workBindBusTypeRequest); collectOrderRequest.setWorkPlaceCode(null); } - if (CollUtil.isNotEmpty(sysWorkplaceDocumentResponses)){ + if (CollUtil.isNotEmpty(sysWorkplaceDocumentResponses)) { Set uniqueDocumentTypeCodesLinkedHashSet = sysWorkplaceDocumentResponses.stream() .map(SysWorkplaceDocumentResponse::getDocumentTypeCode) .collect(Collectors.toCollection(LinkedHashSet::new)); @@ -295,6 +295,24 @@ public class IoCollectOrderController extends BaseController { return ResultVOUtils.success(); } + + /** + * 单据取消操作 + * + * @param collectOrderRequest + * @return + */ + @PostMapping("/udiwms/basic/collect/order/cancel") + public BaseResponse cancelOrder(@RequestBody CollectOrderRequest collectOrderRequest) { + IoCollectOrder collectOrder = new IoCollectOrder(); + BeanUtils.copyProperties(collectOrderRequest, collectOrder); + collectOrder.setTagStatus(1); + collectOrder.setUpdateTime(new Date()); + collectOrder.setUpdateUser(getUserId()); + collectOrderService.updateById(collectOrder); + return ResultVOUtils.success(); + } + @Resource SysWorkplaceDocumentService sysWorkplaceDocumentService; diff --git a/src/main/java/com/glxp/api/entity/collect/IoCollectOrderBizOrigin.java b/src/main/java/com/glxp/api/entity/collect/IoCollectOrderBizOrigin.java index af8afd1bd..168705139 100644 --- a/src/main/java/com/glxp/api/entity/collect/IoCollectOrderBizOrigin.java +++ b/src/main/java/com/glxp/api/entity/collect/IoCollectOrderBizOrigin.java @@ -152,7 +152,7 @@ public class IoCollectOrderBizOrigin implements Serializable { */ @TableField(value = "tagStatus") @ApiModelProperty(value="单据明细赋码状态 1:未赋码;2:部分赋码;3:已赋码") - private Byte tagStatus; + private Integer tagStatus; /** * 赋码错误信息