From 36cd52a7012e81b9f6b45a01cd15712c965d0dfe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Fri, 12 Jun 2026 16:09:19 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E4=B8=AD=E6=8E=A8=E9=80=81?= =?UTF-8?q?=E5=85=B3=E5=8A=A1;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mhd/system/api/OmsServiceFeign.java | 5 +++++ ...rvationStockInOrderApplicationService.java | 21 ++++++++++++------- .../StockInOrderApplicationService.java | 15 ++++++++++++- .../StockOutOrderApplicationService.java | 20 +++++++++++++++++- 4 files changed, 52 insertions(+), 9 deletions(-) diff --git a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/OmsServiceFeign.java b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/OmsServiceFeign.java index edb0ab4fa..4396cc46e 100644 --- a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/OmsServiceFeign.java +++ b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/OmsServiceFeign.java @@ -13,6 +13,7 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; +import java.util.List; import java.util.concurrent.CompletableFuture; @FeignClient(contextId = "OmsService", value = ServiceNameConstants.OMS_SERVICE,url = "http://10.33.0.99:8017", fallbackFactory = RemoteOmsFeignFallbackFactory.class, configuration = FeignAutoConfiguration.class) @@ -57,4 +58,8 @@ public interface OmsServiceFeign { @ApiOperation("修改gwlog") @PostMapping("/gwLogApi/updateGwLog") AjaxResult updateGwLog(@RequestBody GwLogDTO gwLogDTO); + + @ApiOperation("批量推送") + @PostMapping("/reservationStockOutOrderApi/batchPush") + public AjaxResult batchPush(@RequestBody List idList); } \ No newline at end of file diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/service/ReservationStockInOrderApplicationService.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/service/ReservationStockInOrderApplicationService.java index e3816ce19..6118e40bb 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/service/ReservationStockInOrderApplicationService.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/service/ReservationStockInOrderApplicationService.java @@ -283,13 +283,20 @@ public class ReservationStockInOrderApplicationService { * @return Boolean */ public Boolean auditState(ReservationStockInOrderDO stockInOrderDO){ - Integer issueStatus = stockInOrderDO.getIssueStatus(); -// if (issueStatus == 2) { -// List idList = new ArrayList(); -// idList.add(stockInOrderDO.getInOrderId()); -// batchPush(idList); -// } - return stockInOrderDomainService.auditState(stockInOrderDO); + Boolean b = stockInOrderDomainService.auditState(stockInOrderDO); + Integer needCustomsDeclaration = stockInOrderDO.getNeedCustomsDeclaration(); + Integer auditStatus = stockInOrderDO.getAuditStatus(); + try { + if (needCustomsDeclaration != null && needCustomsDeclaration == 1 && auditStatus != null && auditStatus == 2) { + Long inOrderId = stockInOrderDO.getInOrderId(); + List idList = new ArrayList<>(); + idList.add(inOrderId); + batchPush(idList); + } + } catch (Exception e) { + throw new ServiceException("推送关务系统失败!"); + } + return b; } /** diff --git a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java index bab30180b..eee0422b5 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java @@ -494,7 +494,20 @@ public class StockInOrderApplicationService { * @return Boolean */ public Boolean auditState(StockInOrderDO stockInOrderDO){ - return stockInOrderDomainService.auditState(stockInOrderDO); + Boolean b = stockInOrderDomainService.auditState(stockInOrderDO); + Integer needCustomsDeclaration = stockInOrderDO.getNeedCustomsDeclaration(); + Integer auditStatus = stockInOrderDO.getAuditStatus(); + try { + if (needCustomsDeclaration != null && needCustomsDeclaration == 1 && auditStatus != null && auditStatus == 3) { + Long inOrderId = stockInOrderDO.getInOrderId(); + List idList = new ArrayList<>(); + idList.add(inOrderId); + batchPush(idList); + } + } catch (Exception e) { + throw new ServiceException("推送关务系统失败!"); + } + return b; } diff --git a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java index aff73dc09..fec3c8af3 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java @@ -1000,7 +1000,25 @@ public class StockOutOrderApplicationService { * @return Boolean */ public Boolean genPickingOrder(StockOutOrderDO stockOutOrderDO){ - return stockOutOrderDomainService.genPickingOrder(stockOutOrderDO); + Boolean b = stockOutOrderDomainService.genPickingOrder(stockOutOrderDO); + String needDeclareFlag = stockOutOrderDO.getNeedDeclareFlag(); + Long organizationId = stockOutOrderDO.getOrganizationId(); + try { + if (needDeclareFlag != null && "1".equals(needDeclareFlag) && organizationId != null && organizationId == 2830) { + Long outOrderId = stockOutOrderDO.getOutOrderId(); + List ids = new ArrayList<>(); + ids.add(outOrderId); + batchPush(ids); + } else { + Long outOrderId = stockOutOrderDO.getOutOrderId(); + List ids = new ArrayList<>(); + ids.add(outOrderId); + omsServiceFeign.batchPush(ids); + } + } catch (Exception e) { + throw new ServiceException("生成报关单失败"); + } + return b; } /**