From fcaabc888ab6a173a410b9d8a319dc732c43a5fe Mon Sep 17 00:00:00 2001 From: anthonywj Date: Sun, 9 Jul 2023 09:17:40 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=95=E6=8D=AE=E5=90=8C=E6=AD=A5=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/controller/sync/SpsSyncDownloadController.java | 4 ++-- .../api/service/inout/impl/IoOrderServiceImpl.java | 10 ++++++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/sync/SpsSyncDownloadController.java b/src/main/java/com/glxp/api/controller/sync/SpsSyncDownloadController.java index e0d6ffca..898c5880 100644 --- a/src/main/java/com/glxp/api/controller/sync/SpsSyncDownloadController.java +++ b/src/main/java/com/glxp/api/controller/sync/SpsSyncDownloadController.java @@ -751,8 +751,8 @@ public class SpsSyncDownloadController { } } else { // 更新业务详情 - if (orderEntity.getCheckStatus() != null) - orderService.update(orderEntity); +// if (orderEntity.getCheckStatus() != null) +// orderService.update(orderEntity); //更新业务详情 if (CollUtil.isNotEmpty(syncDataResponse.getOrderDetailBizEntities())) { List orderDetailBizEntities = syncDataResponse.getOrderDetailBizEntities(); diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java index 9a7e0b32..b4bd9bf4 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java @@ -585,8 +585,14 @@ public class IoOrderServiceImpl implements IoOrderService { IoOrderResponse response = new IoOrderResponse(); BeanUtil.copyProperties(orderEntity, response); if (orderEntity.getStatus().equals(ConstantStatus.ORDER_STATUS_AUDITED) && checkBusTypeSupplementOrder(orderEntity) - && StrUtil.isEmpty(orderEntity.getSupplementNo())) { - response.setEnableSupplementOrder(true); + && StrUtil.isEmpty(orderEntity.getSupplementNo()) + ) { + if (orderEntity.getFromType() == ConstantStatus.FROM_UDISP) { + if (orderEntity.getOutChangeEnable()) { + response.setEnableSupplementOrder(true); + } + } else + response.setEnableSupplementOrder(true); } result.add(response); } catch (Exception e) {