From d2c8658d6c8d235ab9ef85f5e9e510107c0bccb0 Mon Sep 17 00:00:00 2001
From: zhoufeng <27208084@qq.com>
Date: Fri, 24 Sep 2021 17:04:55 +0800
Subject: [PATCH] 组盘失败提示信息改为显示物料名称

---
 src/main/java/com/huaheng/pc/shipment/shipmentContainerHeader/service/ShipmentContainerHeaderServiceImpl.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/huaheng/pc/shipment/shipmentContainerHeader/service/ShipmentContainerHeaderServiceImpl.java b/src/main/java/com/huaheng/pc/shipment/shipmentContainerHeader/service/ShipmentContainerHeaderServiceImpl.java
index 9bd031b..4d54865 100644
--- a/src/main/java/com/huaheng/pc/shipment/shipmentContainerHeader/service/ShipmentContainerHeaderServiceImpl.java
+++ b/src/main/java/com/huaheng/pc/shipment/shipmentContainerHeader/service/ShipmentContainerHeaderServiceImpl.java
@@ -562,7 +562,7 @@ public class ShipmentContainerHeaderServiceImpl extends ServiceImpl<ShipmentCont
             }
             inventoryList.removeAll(removeInventoryList);
             if (inventoryList.size()<1 && lock){
-                return AjaxResult.error("明细id为"+item.getId()+"的物料所在托盘全部处于锁定状态,请完成或取消任务后再进行组盘");
+                return AjaxResult.error("'"+item.getMaterialName()+"' 所在托盘全部处于锁定状态,请完成或取消任务后再进行组盘");
             }
 
             if(inventoryList.size() < 1 && item.getWaveId() != 0){
--
libgit2 0.22.2