From 99844f5e0f61b26cf19342e2df5bbbc9693b2629 Mon Sep 17 00:00:00 2001 From: zhangzq Date: Tue, 9 Jun 2026 15:20:23 +0800 Subject: [PATCH] =?UTF-8?q?add:=E5=8D=95=E6=8D=AE=E4=BA=8B=E4=BB=B6?= =?UTF-8?q?=E7=9B=91=E5=90=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nl/wms/pm_manage/SourceBillTypeEnum.java | 14 +++++++++++++- .../DemandFormListenerHandler.java | 4 ++-- .../listenerHandler/DemandListenerParams.java | 18 ++++++++++++++++++ .../demand/listenerHandler/ListenerParams.java | 4 ---- .../wms/pm_manage/listener/PmManageEvent.java | 5 +++-- .../listener/core/SmartFormListener.java | 7 +++++-- 6 files changed, 41 insertions(+), 11 deletions(-) create mode 100644 nladmin-system/wms-server/src/main/java/org/nl/wms/pm_manage/demand/listenerHandler/DemandListenerParams.java delete mode 100644 nladmin-system/wms-server/src/main/java/org/nl/wms/pm_manage/demand/listenerHandler/ListenerParams.java diff --git a/nladmin-system/wms-server/src/main/java/org/nl/wms/pm_manage/SourceBillTypeEnum.java b/nladmin-system/wms-server/src/main/java/org/nl/wms/pm_manage/SourceBillTypeEnum.java index 95f0c26..81030ca 100644 --- a/nladmin-system/wms-server/src/main/java/org/nl/wms/pm_manage/SourceBillTypeEnum.java +++ b/nladmin-system/wms-server/src/main/java/org/nl/wms/pm_manage/SourceBillTypeEnum.java @@ -2,6 +2,8 @@ package org.nl.wms.pm_manage; import lombok.AllArgsConstructor; import lombok.Getter; +import org.apache.commons.lang3.StringUtils; +import org.nl.common.exception.BadRequestException; /** * 源单据枚举：关联st_ivt_iostorinvdtl表souce_bill_type字段 @@ -10,13 +12,23 @@ import lombok.Getter; @Getter public enum SourceBillTypeEnum { PM_DEMADN("pm_demand","出库需求单"), + UNDEFINE("","未定义"), ; /** * 单据类型：对于哪个主表 */ - private String code; + private String billType; /** * 单据描述 */ private String desc; + + public static SourceBillTypeEnum check(String souceBillType){ + for (SourceBillTypeEnum typeEnum : SourceBillTypeEnum.values()) { + if (typeEnum.getBillType().equals(souceBillType)){ + return typeEnum; + } + } + return UNDEFINE; + } } diff --git a/nladmin-system/wms-server/src/main/java/org/nl/wms/pm_manage/demand/listenerHandler/DemandFormListenerHandler.java b/nladmin-system/wms-server/src/main/java/org/nl/wms/pm_manage/demand/listenerHandler/DemandFormListenerHandler.java index 11f406f..59db4e4 100644 --- a/nladmin-system/wms-server/src/main/java/org/nl/wms/pm_manage/demand/listenerHandler/DemandFormListenerHandler.java +++ b/nladmin-system/wms-server/src/main/java/org/nl/wms/pm_manage/demand/listenerHandler/DemandFormListenerHandler.java @@ -4,9 +4,9 @@ import org.nl.wms.pm_manage.listener.core.BaseFormListenerHandler; import org.springframework.stereotype.Component; @Component("pm_demand") -public class DemandFormListenerHandler extends BaseFormListenerHandler { +public class DemandFormListenerHandler extends BaseFormListenerHandler { @Override - public void onApplicationEvent(ListenerParams params) { + public void onApplicationEvent(DemandListenerParams params) { } } diff --git a/nladmin-system/wms-server/src/main/java/org/nl/wms/pm_manage/demand/listenerHandler/DemandListenerParams.java b/nladmin-system/wms-server/src/main/java/org/nl/wms/pm_manage/demand/listenerHandler/DemandListenerParams.java new file mode 100644 index 0000000..c4b4f2e --- /dev/null +++ b/nladmin-system/wms-server/src/main/java/org/nl/wms/pm_manage/demand/listenerHandler/DemandListenerParams.java @@ -0,0 +1,18 @@ +package org.nl.wms.pm_manage.demand.listenerHandler; + +import lombok.Data; + +import java.math.BigDecimal; + +@Data +public class DemandListenerParams { + private String billCode; + private BigDecimal qty; + private String materialCode; + + public DemandListenerParams(String billCode, BigDecimal qty, String materialCode) { + this.billCode = billCode; + this.qty = qty; + this.materialCode = materialCode; + } +} diff --git a/nladmin-system/wms-server/src/main/java/org/nl/wms/pm_manage/demand/listenerHandler/ListenerParams.java b/nladmin-system/wms-server/src/main/java/org/nl/wms/pm_manage/demand/listenerHandler/ListenerParams.java deleted file mode 100644 index 971919a..0000000 --- a/nladmin-system/wms-server/src/main/java/org/nl/wms/pm_manage/demand/listenerHandler/ListenerParams.java +++ /dev/null @@ -1,4 +0,0 @@ -package org.nl.wms.pm_manage.demand.listenerHandler; - -public class ListenerParams { -} diff --git a/nladmin-system/wms-server/src/main/java/org/nl/wms/pm_manage/listener/PmManageEvent.java b/nladmin-system/wms-server/src/main/java/org/nl/wms/pm_manage/listener/PmManageEvent.java index 4e42227..fcf6537 100644 --- a/nladmin-system/wms-server/src/main/java/org/nl/wms/pm_manage/listener/PmManageEvent.java +++ b/nladmin-system/wms-server/src/main/java/org/nl/wms/pm_manage/listener/PmManageEvent.java @@ -8,8 +8,9 @@ import org.springframework.context.ApplicationEvent; @Getter public class PmManageEvent extends ApplicationEvent { SourceBillTypeEnum billTypeEnum; - public PmManageEvent(SourceBillTypeEnum billTypeEnum,Object params) { + public PmManageEvent(String sourceBillType,Object params) { + super(params); - this.billTypeEnum = billTypeEnum; + this.billTypeEnum = SourceBillTypeEnum.check(sourceBillType); } } diff --git a/nladmin-system/wms-server/src/main/java/org/nl/wms/pm_manage/listener/core/SmartFormListener.java b/nladmin-system/wms-server/src/main/java/org/nl/wms/pm_manage/listener/core/SmartFormListener.java index 608bc3f..c148234 100644 --- a/nladmin-system/wms-server/src/main/java/org/nl/wms/pm_manage/listener/core/SmartFormListener.java +++ b/nladmin-system/wms-server/src/main/java/org/nl/wms/pm_manage/listener/core/SmartFormListener.java @@ -16,9 +16,12 @@ public class SmartFormListener implements ApplicationListener { @Override public void onApplicationEvent(PmManageEvent event) { final SourceBillTypeEnum billTypeEnum = event.getBillTypeEnum(); - final BaseFormListenerHandler handler = formListenerHandlerMap.get(billTypeEnum.getCode()); + if (billTypeEnum.equals(SourceBillTypeEnum.UNDEFINE)){ + return; + } + final BaseFormListenerHandler handler = formListenerHandlerMap.get(billTypeEnum.getBillType()); if (handler == null){ - System.out.println("======="+billTypeEnum.getCode()+"单据类型没有定义监听处理机======="); + System.out.println("======="+billTypeEnum.getBillType()+"单据类型没有定义监听处理机======="); return; } handler.onApplicationEvent(event);