From 470743122ccb250622ecbd17c95f9a427f45aa4d Mon Sep 17 00:00:00 2001
From: zhangzq <zhangzhiqiang@yoycol.com>
Date: Sat, 7 Dec 2024 09:57:24 +0800
Subject: [PATCH] =?UTF-8?q?rev:=E6=9B=B4=E6=96=B0ERP=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org/nl/pda/st/set/rest/PdaBucketNotBagController.java    | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/set/rest/PdaBucketNotBagController.java b/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/set/rest/PdaBucketNotBagController.java
index f42628be..da8ad11b 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/set/rest/PdaBucketNotBagController.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/set/rest/PdaBucketNotBagController.java
@@ -54,7 +54,10 @@ public class PdaBucketNotBagController {
         String materialCode = whereJson.get("material_code");
         MaterialbaseDto materDto = materialbaseService.findByErpId(materialCode);
         if (materDto==null){
-            throw new BadRequestException(materialCode+"ERP_ID对应MES物料信息不存在");
+            materDto = materialbaseService.findByCode(materialCode);
+            if (materDto==null){
+                throw new BadRequestException(materialCode+"对应MES物料信息不存在");
+            }
         }
         JSONObject result = new JSONObject();
         result.put("code", "1");