|
|
|
@ -290,25 +290,28 @@ public class IoOrderReviewController extends BaseController {
|
|
|
|
|
} else {
|
|
|
|
|
ReviewFinishRequest reviewFinishRequest = new ReviewFinishRequest();
|
|
|
|
|
BeanUtil.copyProperties(updateExportStatusRequest, reviewFinishRequest);
|
|
|
|
|
updateSpmsStauts(reviewFinishRequest);
|
|
|
|
|
log.error("更新外网验收状态");
|
|
|
|
|
updateSpmsStauts(reviewFinishRequest, authAdmin.getId() + "");
|
|
|
|
|
return updateReview(authAdmin, orderEntity);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
} else {
|
|
|
|
|
ReviewFinishRequest reviewFinishRequest = new ReviewFinishRequest();
|
|
|
|
|
BeanUtil.copyProperties(updateExportStatusRequest, reviewFinishRequest);
|
|
|
|
|
updateSpmsStauts(reviewFinishRequest);
|
|
|
|
|
log.error("更新外网验收状态");
|
|
|
|
|
updateSpmsStauts(reviewFinishRequest, authAdmin.getId() + "");
|
|
|
|
|
return updateReview(authAdmin, orderEntity);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
public void updateSpmsStauts(ReviewFinishRequest reviewFinishRequest) {
|
|
|
|
|
public void updateSpmsStauts(ReviewFinishRequest reviewFinishRequest, String userId) {
|
|
|
|
|
ThreadUtil.execAsync(() -> {
|
|
|
|
|
try {
|
|
|
|
|
spGetHttp.reviewOrder(reviewFinishRequest, getUserId() + "");
|
|
|
|
|
log.error("开始调用中继服务");
|
|
|
|
|
spGetHttp.reviewOrder(reviewFinishRequest, userId);
|
|
|
|
|
} catch (Exception e) {
|
|
|
|
|
log.error("下载异常", ExceptionUtils.getStackTrace(e));
|
|
|
|
|
log.error("更新验收状态异常", ExceptionUtils.getStackTrace(e));
|
|
|
|
|
e.printStackTrace();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
@ -577,7 +580,6 @@ public class IoOrderReviewController extends BaseController {
|
|
|
|
|
private String checkReviewAuth(String orderId, String userId, String action) {
|
|
|
|
|
IoOrderEntity orderEntity = orderService.findByBillNo(orderId);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (orderEntity == null) {
|
|
|
|
|
ReviewSpmsRequest reviewSpmsRequest = new ReviewSpmsRequest();
|
|
|
|
|
reviewSpmsRequest.setBillNo(orderId);
|
|
|
|
|