|
|
|
@ -443,6 +443,7 @@ public class StockOrderController {
|
|
|
|
|
supplementCode.setMainAction(originOrder.getMainAction());
|
|
|
|
|
supplementCode.setId(null);
|
|
|
|
|
supplementCodes.add(supplementCode);
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
@ -624,7 +625,7 @@ public class StockOrderController {
|
|
|
|
|
*/
|
|
|
|
|
@AuthRuleAnnotation("")
|
|
|
|
|
@GetMapping("/udiwms/stock/order/received/rollback")
|
|
|
|
|
public BaseResponse rollbackOrder(String billNo,Integer contrastStatus) {
|
|
|
|
|
public BaseResponse rollbackOrder(String billNo, Integer contrastStatus) {
|
|
|
|
|
if (StrUtil.isBlank(billNo)) {
|
|
|
|
|
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
|
|
|
|
|
}
|
|
|
|
@ -636,7 +637,7 @@ public class StockOrderController {
|
|
|
|
|
if (orderEntity.getExportStatus() == ConstantStatus.ORDER_EXPORT_ED) {
|
|
|
|
|
return ResultVOUtils.error(500, "单据已同步到内网UDI管理系统,无法撤回!");
|
|
|
|
|
}
|
|
|
|
|
boolean result = stockOrderService.rollbackOrder(billNo,contrastStatus);
|
|
|
|
|
boolean result = stockOrderService.rollbackOrder(billNo, contrastStatus);
|
|
|
|
|
if (result) {
|
|
|
|
|
return ResultVOUtils.success();
|
|
|
|
|
}
|
|
|
|
@ -646,11 +647,11 @@ public class StockOrderController {
|
|
|
|
|
//未验收单据撤回到等待校验
|
|
|
|
|
@AuthRuleAnnotation("")
|
|
|
|
|
@GetMapping("/udiwms/stock/order/unReceive/rollback")
|
|
|
|
|
public BaseResponse rollUnReceivebackOrder(String billNo,Integer contrastStatus) {
|
|
|
|
|
public BaseResponse rollUnReceivebackOrder(String billNo, Integer contrastStatus) {
|
|
|
|
|
if (StrUtil.isBlank(billNo)) {
|
|
|
|
|
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
|
|
|
|
|
}
|
|
|
|
|
boolean result = stockOrderService.rollbackOrder(billNo,contrastStatus);
|
|
|
|
|
boolean result = stockOrderService.rollbackOrder(billNo, contrastStatus);
|
|
|
|
|
if (result) {
|
|
|
|
|
return ResultVOUtils.success("撤回成功!");
|
|
|
|
|
}
|
|
|
|
|