From 85068215e54d22dcffadd4ded0abc8bfc2c58d38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Wed, 17 Jun 2026 16:02:59 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=96=E6=B6=88=E5=87=BA=E5=85=A5=E5=BA=93?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E4=B8=9A=E5=8A=A1=E6=B5=81=E7=A8=8B=E6=8E=A8?= =?UTF-8?q?=E9=80=81=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...rvationStockInOrderApplicationService.java | 32 ++++++------- .../StockInOrderApplicationService.java | 32 ++++++------- .../StockOutOrderApplicationService.java | 46 +++++++++---------- 3 files changed, 55 insertions(+), 55 deletions(-) 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 f2e904e3c..f1d4c2fa2 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 @@ -281,22 +281,22 @@ public class ReservationStockInOrderApplicationService { */ public Boolean auditState(ReservationStockInOrderDO stockInOrderDO){ Boolean b = stockInOrderDomainService.auditState(stockInOrderDO); - List inOrderIds = stockInOrderDO.getInOrderIds(); - if (inOrderIds != null && !inOrderIds.isEmpty()) { - ReservationStockInOrder stockInOrder = reservationStockInOrderMapper.selectById(inOrderIds.get(0)); - Integer needCustomsDeclaration = stockInOrder.getNeedCustomsDeclaration(); - Integer auditStatus = stockInOrder.getIssueStatus(); - try { - if (needCustomsDeclaration != null && needCustomsDeclaration == 1 && auditStatus != null && auditStatus == 2) { - Long inOrderId = stockInOrder.getInOrderId(); - List idList = new ArrayList<>(); - idList.add(inOrderId); - batchPush(idList); - } - } catch (Exception e) { - throw new ServiceException("推送关务系统失败!"); - } - } +// List inOrderIds = stockInOrderDO.getInOrderIds(); +// if (inOrderIds != null && !inOrderIds.isEmpty()) { +// ReservationStockInOrder stockInOrder = reservationStockInOrderMapper.selectById(inOrderIds.get(0)); +// Integer needCustomsDeclaration = stockInOrder.getNeedCustomsDeclaration(); +// Integer auditStatus = stockInOrder.getIssueStatus(); +// try { +// if (needCustomsDeclaration != null && needCustomsDeclaration == 1 && auditStatus != null && auditStatus == 2) { +// Long inOrderId = stockInOrder.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 0b169a190..066886cc0 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 @@ -495,22 +495,22 @@ public class StockInOrderApplicationService { */ public Boolean auditState(StockInOrderDO stockInOrderDO){ Boolean b = stockInOrderDomainService.auditState(stockInOrderDO); - List inOrderIds = stockInOrderDO.getInOrderIds(); - if (inOrderIds != null && !inOrderIds.isEmpty()) { - StockInOrder stockInOrder = stockInOrderService.getById(inOrderIds.get(0)); - Integer needCustomsDeclaration = stockInOrder.getNeedCustomsDeclaration(); - Integer auditStatus = stockInOrder.getAuditStatus(); - try { - if (needCustomsDeclaration != null && needCustomsDeclaration == 1 && auditStatus != null && auditStatus == 3) { - Long inOrderId = stockInOrder.getInOrderId(); - List idList = new ArrayList<>(); - idList.add(inOrderId); - batchPush(idList); - } - } catch (Exception e) { - throw new ServiceException("推送关务系统失败!"); - } - } +// List inOrderIds = stockInOrderDO.getInOrderIds(); +// if (inOrderIds != null && !inOrderIds.isEmpty()) { +// StockInOrder stockInOrder = stockInOrderService.getById(inOrderIds.get(0)); +// Integer needCustomsDeclaration = stockInOrder.getNeedCustomsDeclaration(); +// Integer auditStatus = stockInOrder.getAuditStatus(); +// try { +// if (needCustomsDeclaration != null && needCustomsDeclaration == 1 && auditStatus != null && auditStatus == 3) { +// Long inOrderId = stockInOrder.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 5d1f1cf0a..ede21b749 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 @@ -1001,29 +1001,29 @@ public class StockOutOrderApplicationService { */ public Boolean genPickingOrder(StockOutOrderDO stockOutOrderDO){ Boolean b = stockOutOrderDomainService.genPickingOrder(stockOutOrderDO); - List outOrderIds = stockOutOrderDO.getOutOrderIds(); - if (outOrderIds != null && !outOrderIds.isEmpty()) { - StockOutOrder order = stockOutOrderService.getById(outOrderIds.get(0)); - String needDeclareFlag = order.getNeedDeclareFlag(); - Long organizationId = order.getOrganizationId(); - try { - if (needDeclareFlag != null && "1".equals(needDeclareFlag) && organizationId != null) { - if (organizationId == 2830) { - Long outOrderId = order.getOutOrderId(); - List ids = new ArrayList<>(); - ids.add(outOrderId); - batchPush(ids); - } else { - String outOrderId = order.getOutOrderNumber(); - List ids = new ArrayList<>(); - ids.add(outOrderId); - omsServiceFeign.batchPushByNumber(ids); - } - } - } catch (Exception e) { - throw new ServiceException("生成报关单失败"); - } - } +// List outOrderIds = stockOutOrderDO.getOutOrderIds(); +// if (outOrderIds != null && !outOrderIds.isEmpty()) { +// StockOutOrder order = stockOutOrderService.getById(outOrderIds.get(0)); +// String needDeclareFlag = order.getNeedDeclareFlag(); +// Long organizationId = order.getOrganizationId(); +// try { +// if (needDeclareFlag != null && "1".equals(needDeclareFlag) && organizationId != null) { +// if (organizationId == 2830) { +// Long outOrderId = order.getOutOrderId(); +// List ids = new ArrayList<>(); +// ids.add(outOrderId); +// //batchPush(ids); +// } else { +// String outOrderId = order.getOutOrderNumber(); +// List ids = new ArrayList<>(); +// ids.add(outOrderId); +// //omsServiceFeign.batchPushByNumber(ids); +// } +// } +// } catch (Exception e) { +// throw new ServiceException("生成报关单失败"); +// } +// } return b; }