From 504402d54289363c945910d9e434c7637d9b7f38 Mon Sep 17 00:00:00 2001 From: yinq Date: Fri, 13 Mar 2026 15:59:55 +0800 Subject: [PATCH] =?UTF-8?q?1.0.84=20=E9=94=80=E5=94=AE=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E5=AE=A1=E6=89=B9=E5=AE=8C=E6=88=90=E8=A7=A6=E5=8F=91=E5=8F=91?= =?UTF-8?q?=E8=B4=A7=E4=BB=A3=E5=8A=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../oa/erp/service/impl/ErpProjectInfoServiceImpl.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) 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 736d1ae6..bc40031b 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 @@ -313,8 +313,11 @@ public class ErpProjectInfoServiceImpl implements IErpProjectInfoService { projectInfo.setProjectStatus(OAStatusEnum.APPROVING.getStatus()); } else if (Objects.equals(processEvent.getStatus(), BusinessStatusEnum.FINISH.getStatus())) { projectInfo.setProjectStatus(OAStatusEnum.COMPLETED.getStatus()); - // 项目一旦转“可用”就预生成发货草稿,用户后续只补业务细节,不需要再手工新建整单 - remoteWmsShippingBillService.createDraftByProject(buildShippingDraft(projectInfo)); + // 项目“可用”就预生成发货草稿,用户后续补充业务细节,不需要再手工新建整单 + 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());