From 4219b82dea0cda26ccfd9e62d66699622b2dd137 Mon Sep 17 00:00:00 2001
From: xs <xins@mesnac.com>
Date: Wed, 10 Sep 2025 15:39:47 +0800
Subject: [PATCH] =?UTF-8?q?4.2.6=20=E5=8E=9F=E6=9D=90=E6=96=99=E6=9D=A1?=
 =?UTF-8?q?=E7=A0=81=E9=87=87=E8=B4=AD=E6=96=B0=E5=A2=9E=E5=92=8C=E6=89=B9?=
 =?UTF-8?q?=E9=87=8F=E6=94=B6=E6=96=99=E6=96=B0=E5=A2=9E=E6=97=B6=E5=88=A4?=
 =?UTF-8?q?=E6=96=AD=E9=87=87=E8=B4=AD=E8=AE=A2=E5=8D=95=E6=98=AF=E5=90=A6?=
 =?UTF-8?q?=E4=B8=BA=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/hw/mes/service/impl/MesBaseBarcodeInfoServiceImpl.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesBaseBarcodeInfoServiceImpl.java b/hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesBaseBarcodeInfoServiceImpl.java
index 5af0f402..3880f300 100644
--- a/hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesBaseBarcodeInfoServiceImpl.java
+++ b/hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesBaseBarcodeInfoServiceImpl.java
@@ -192,6 +192,9 @@ public class MesBaseBarcodeInfoServiceImpl implements IMesBaseBarcodeInfoService
 
         //判断选择的采购订单信息，是否已经合并过
         MesSaleOrderRelate querySaleOrderRelate = new MesSaleOrderRelate();
+        if (purchaseOrderId == null) {
+            throw new ServiceException("采购订单不能为空");
+        }
         querySaleOrderRelate.setPurchaseOrderId(purchaseOrderId);
         List<MesSaleOrderRelate> saleOrderRelates = mesSaleOrderRelateMapper.selectMesSaleOrderRelateList(querySaleOrderRelate);
         if (saleOrderRelates != null && !saleOrderRelates.isEmpty()) {