From f9d21f96c8890717f012365614131c0d8569cb98 Mon Sep 17 00:00:00 2001 From: yinq Date: Thu, 14 May 2026 18:00:25 +0800 Subject: [PATCH] =?UTF-8?q?1.1.37=20=E6=A0=B9=E6=8D=AE=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E5=BF=AB=E7=85=A7=E5=88=9B=E5=BB=BA=E5=8F=91=E8=B4=A7=E8=8D=89?= =?UTF-8?q?=E7=A8=BF=20=E5=8A=9F=E8=83=BD=E5=BC=83=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/dromara/wms/api/RemoteWmsShippingBillService.java | 2 +- .../oa/erp/service/impl/ErpProjectInfoServiceImpl.java | 5 ----- .../dromara/wms/dubbo/RemoteWmsShippingBillServiceImpl.java | 3 +++ .../dromara/wms/service/impl/WmsShippingBillServiceImpl.java | 2 +- 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/ruoyi-api/ruoyi-api-wms/src/main/java/org/dromara/wms/api/RemoteWmsShippingBillService.java b/ruoyi-api/ruoyi-api-wms/src/main/java/org/dromara/wms/api/RemoteWmsShippingBillService.java index 1c495e89..a80b6343 100644 --- a/ruoyi-api/ruoyi-api-wms/src/main/java/org/dromara/wms/api/RemoteWmsShippingBillService.java +++ b/ruoyi-api/ruoyi-api-wms/src/main/java/org/dromara/wms/api/RemoteWmsShippingBillService.java @@ -11,7 +11,7 @@ public interface RemoteWmsShippingBillService { /** * 根据项目快照创建发货草稿 - * + * 功能弃用 * @param draft 发货草稿快照 * @return 发货单ID */ diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpProjectInfoServiceImpl.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpProjectInfoServiceImpl.java index df8fb5dd..052b813a 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpProjectInfoServiceImpl.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpProjectInfoServiceImpl.java @@ -409,11 +409,6 @@ public class ErpProjectInfoServiceImpl implements IErpProjectInfoService { projectInfo.setProjectStatus(OAStatusEnum.APPROVING.getStatus()); } else if (Objects.equals(processEvent.getStatus(), BusinessStatusEnum.FINISH.getStatus())) { projectInfo.setProjectStatus(OAStatusEnum.COMPLETED.getStatus()); - // 项目“可用”就预生成发货草稿，用户后续补充业务细节，不需要再手工新建整单 - String projectCategory = projectInfo.getProjectCategory(); - if (projectCategory.equals("1") || projectCategory.equals("2")){ - remoteWmsShippingBillService.createDraftByProject(buildShippingDraft(projectInfo)); - } } else if (Objects.equals(processEvent.getStatus(), BusinessStatusEnum.INVALID.getStatus()) || Objects.equals(processEvent.getStatus(), BusinessStatusEnum.TERMINATION.getStatus())) { projectInfo.setProjectStatus(OAStatusEnum.INVALID.getStatus()); diff --git a/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/dubbo/RemoteWmsShippingBillServiceImpl.java b/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/dubbo/RemoteWmsShippingBillServiceImpl.java index 0696b6c1..2998cedd 100644 --- a/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/dubbo/RemoteWmsShippingBillServiceImpl.java +++ b/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/dubbo/RemoteWmsShippingBillServiceImpl.java @@ -19,6 +19,9 @@ public class RemoteWmsShippingBillServiceImpl implements RemoteWmsShippingBillSe private final IWmsShippingBillService wmsShippingBillService; + /* + 功能弃用 + */ @Override public Long createDraftByProject(RemoteWmsShippingDraft draft) { return wmsShippingBillService.createDraftByProject(draft); diff --git a/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/service/impl/WmsShippingBillServiceImpl.java b/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/service/impl/WmsShippingBillServiceImpl.java index 759cb580..f1a5805e 100644 --- a/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/service/impl/WmsShippingBillServiceImpl.java +++ b/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/service/impl/WmsShippingBillServiceImpl.java @@ -264,7 +264,7 @@ public class WmsShippingBillServiceImpl implements IWmsShippingBillService { /** * 根据项目快照创建发货草稿 - * + * 功能弃用 * @param draft 发货草稿快照 * @return 发货单ID */