From 7cf85053b134c2b1814966b8c88249304e152729 Mon Sep 17 00:00:00 2001
From: mzr <mengzhaorui@qq.com>
Date: Sat, 25 Oct 2025 20:54:07 +0800
Subject: [PATCH] =?UTF-8?q?fix(pmo):=E7=AE=B1=E5=8F=98=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=E7=94=9F=E4=BA=A7=E8=AE=A2=E5=8D=95=E6=8E=A8=E5=90=AF=E6=BA=90?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=89=B9=E6=AC=A1=E5=8F=B7=E5=88=A4=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nccloud/web/mmpac/pmo/action/PmoToQmsAction.java   |  3 +++
 .../modules/mmpac/config/authorize/mmpac_authorize.xml |  1 -
 .../modules/mmpac/pmo/config/action/action.xml         | 10 +++++-----
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/mmpac/src/client/nccloud/web/mmpac/pmo/action/PmoToQmsAction.java b/mmpac/src/client/nccloud/web/mmpac/pmo/action/PmoToQmsAction.java
index 35082f76..43a98771 100644
--- a/mmpac/src/client/nccloud/web/mmpac/pmo/action/PmoToQmsAction.java
+++ b/mmpac/src/client/nccloud/web/mmpac/pmo/action/PmoToQmsAction.java
@@ -93,6 +93,9 @@ public class PmoToQmsAction implements ICommonAction {
         }
         for (PMOItemVO itemVO : nowItemVOS) {
             String vbatchcode = itemVO.getVbatchcode();
+            if (null == vbatchcode) {
+                continue;
+            }
             vbatchcodeSet.add(vbatchcode);
         }
         // ÅжÏÊÇ·ñ´æÔÚÅú´ÎºÅ
diff --git a/mmpac/src/client/yyconfig/modules/mmpac/config/authorize/mmpac_authorize.xml b/mmpac/src/client/yyconfig/modules/mmpac/config/authorize/mmpac_authorize.xml
index 58ab6c00..567ca688 100644
--- a/mmpac/src/client/yyconfig/modules/mmpac/config/authorize/mmpac_authorize.xml
+++ b/mmpac/src/client/yyconfig/modules/mmpac/config/authorize/mmpac_authorize.xml
@@ -110,7 +110,6 @@
 			<action>mmpac.pmo.queryByCond</action>
 			<action>mmpac.pmo.createDCX55A3</action>
 			<action>mmpac.pmo.PmoToPlm</action>
-
 			<action>mmpac.pmo.PmoToQms</action>
 			<action>mmpac.pmo.PmoToMes</action>
 		</actions>
diff --git a/mmpac/src/client/yyconfig/modules/mmpac/pmo/config/action/action.xml b/mmpac/src/client/yyconfig/modules/mmpac/pmo/config/action/action.xml
index 5413d29b..12514504 100644
--- a/mmpac/src/client/yyconfig/modules/mmpac/pmo/config/action/action.xml
+++ b/mmpac/src/client/yyconfig/modules/mmpac/pmo/config/action/action.xml
@@ -441,9 +441,9 @@
 		</clazz>
 	</action>
 	<action>
-	<name>mmpac.pmo.PmoToMes</name>
-	<label>生产订�手动推MES</label>
-	<clazz>nccloud.web.mmpac.pmo.action.PmoToEpicMesAction
-	</clazz>
-</action>
+		<name>mmpac.pmo.PmoToMes</name>
+		<label>生产订�手动推MES</label>
+		<clazz>nccloud.web.mmpac.pmo.action.PmoToEpicMesAction
+		</clazz>
+	</action>
 </actions>