From 072acffbfaa6d4a307a316b6466364703fdfcc23 Mon Sep 17 00:00:00 2001
From: mzr <mengzhaorui@qq.com>
Date: Sun, 5 Oct 2025 16:27:24 +0800
Subject: [PATCH] =?UTF-8?q?feat(material):=20=E5=A2=9E=E5=8A=A0=E5=AF=B9?=
 =?UTF-8?q?=E7=89=A9=E6=96=99=E6=89=B9=E6=94=B9=E4=BA=8B=E4=BB=B6=E7=9A=84?=
 =?UTF-8?q?=E5=A4=84=E7=90=86=E5=B9=B6=E4=BC=98=E5=8C=96=E5=9E=8B=E5=8F=B7?=
 =?UTF-8?q?=E8=A7=84=E6=A0=BC=E5=AD=97=E6=AE=B5-=20=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E5=AF=B9=E4=BA=8B=E4=BB=B6=E7=B1=BB=E5=9E=8B1061=EF=BC=88?=
 =?UTF-8?q?=E6=89=B9=E6=94=B9=E5=90=8E=EF=BC=89=E7=9A=84=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=20-=20=E4=BC=98=E5=8C=96=E7=89=A9=E6=96=99=E5=9E=8B=E5=8F=B7?=
 =?UTF-8?q?=E8=A7=84=E6=A0=BC=E5=AD=97=E6=AE=B5=E7=9A=84=E6=8B=BC=E6=8E=A5?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91=EF=BC=8C=E9=81=BF=E5=85=8D=E7=A9=BA=E6=8C=87?=
 =?UTF-8?q?=E9=92=88=E5=BC=82=E5=B8=B8=20-=20=E4=BD=BF=E7=94=A8MyHelper.sk?=
 =?UTF-8?q?ipNull=E6=96=B9=E6=B3=95=E7=A1=AE=E4=BF=9D=E7=89=A9=E6=96=99?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E5=92=8C=E8=A7=84=E6=A0=BC=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E5=AE=89=E5=85=A8=E6=8B=BC=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/uapbd/material/listener/MaterialToQmsListener.java | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/uapbd/src/private/nccloud/api/uapbd/material/listener/MaterialToQmsListener.java b/uapbd/src/private/nccloud/api/uapbd/material/listener/MaterialToQmsListener.java
index e2403d88..3009cfb0 100644
--- a/uapbd/src/private/nccloud/api/uapbd/material/listener/MaterialToQmsListener.java
+++ b/uapbd/src/private/nccloud/api/uapbd/material/listener/MaterialToQmsListener.java
@@ -42,8 +42,8 @@ public class MaterialToQmsListener implements IBusinessListener {
         String eventType = event.getEventType();
         Object[] objs = e.getObjs();
 
-        // EventType是事件编码 1002-新增后 1004-修改后 1071-状态由停用变为启用后 1069-状态由启用变为停用后
-        if ("1002".equals(eventType) || "1004".equals(eventType)
+        // EventType是事件编码 1002-新增后 1004-修改后 1071-状态由停用变为启用后 1069-状态由启用变为停用后 1061批改后
+        if ("1002".equals(eventType) || "1004".equals(eventType) || "1061".equals(eventType)
                 || "1071".equals(eventType) || "1069".equals(eventType)) {
             MaterialVO[] useVOs = ArrayClassConvertUtil.convert(objs, MaterialVO.class);
             configParams = MyHelper.getConfigParams("xb-config", null);
@@ -112,7 +112,8 @@ public class MaterialToQmsListener implements IBusinessListener {
             contentObj.put("meswlbh", vo.getCode()); // 启源物料编码
             contentObj.put("bipwlbh", vo.getCode()); // BIP物料编码
             contentObj.put("wlmc", vo.getName()); // 物料名称
-            contentObj.put("wlxhgg", vo.getMaterialtype() + vo.getMaterialspec()); // 物料型号规格
+            String wlxhgg = MyHelper.skipNull(vo.getMaterialtype()) + MyHelper.skipNull(vo.getMaterialspec());
+            contentObj.put("wlxhgg", wlxhgg); // 物料型号规格
             contentObj.put("wlfl", mrlTypeName); // 物料分类
             contentObj.put("wlbz", "产品"); // 物料标志
             contentObj.put("sjjldw", unitMap.get("unitname")); // 设计计量单位