单据审核相关修改

test
anthonywj 1 year ago
parent ea411c4102
commit 7a1f295fa7

@ -1,6 +1,7 @@
package com.glxp.api.controller.inout;
import com.glxp.api.service.inout.impl.IoCodeService;
import org.apache.regexp.RE;
import org.eclipse.jdt.internal.compiler.apt.dispatch.HookedJavaFileObject;
import org.springframework.beans.BeanUtils;
import cn.hutool.core.collection.CollUtil;
@ -541,6 +542,9 @@ public class IoOrderReviewController extends BaseController {
orderResponse = orderService.findGroupBillNo(billNo);
acceptOrderEntity.setOrderEntity(orderResponse);
acceptOrderEntity.setExitAccept(false);
if (orderResponse.getStatus() != ConstantStatus.ORDER_STATUS_CHECK_REW) {
return ResultVOUtils.error(500, "非待审核单据!");
}
} else {
//获取自助平台待审核单据,并插入到数据库
BaseResponse<SpsSyncOrderResponse> baseResponse = spGetHttp.getReviewOrder(reviewSpmsRequest, userId + "");
@ -566,6 +570,9 @@ public class IoOrderReviewController extends BaseController {
ioCheckInoutService.check(orderEntity.getBillNo());
}
}
if (orderEntity.getStatus() != ConstantStatus.ORDER_STATUS_CHECK_REW) {
return ResultVOUtils.error(500, "非待审核单据!");
}
FilterOrderDetailResultRequest tempRequest = new FilterOrderDetailResultRequest();
tempRequest.setOrderIdFk(billNo);
List<IoOrderDetailResultResponse> detailResultResponses = orderDetailResultService.filterList(tempRequest);
@ -637,10 +644,14 @@ public class IoOrderReviewController extends BaseController {
@GetMapping("/udiwms/pda/order/check/getOrder")
public BaseResponse getPdaCheckOrder(PdaCheckRequest pdaCheckRequest) {
IoOrderResponse orderEntity = orderService.findGroupBillNo(pdaCheckRequest.getBillNo());
if (orderEntity == null) {
return ResultVOUtils.error(500, "单据不存在!");
}
boolean isExit = invBusUserService.exitBus(getUserId() + "", pdaCheckRequest.getAction());
if (orderEntity.getStatus() != ConstantStatus.ORDER_STATUS_CHECK_SUCCESS) {
return ResultVOUtils.error(500, "非待核对单据!");
}
boolean isExit = invBusUserService.exitBus(getUserId() + "", orderEntity.getAction());
if (!isExit) {
return ResultVOUtils.error(500, "无验收权限!");
}

Loading…
Cancel
Save