From cedce4883f0d204f5bf7bf87c0bf4858dabb0c23 Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期一, 13 五月 2024 13:01:22 +0800
Subject: [PATCH] 望美最新程序

---
 河北望美项目/MES_11/src/main/java/com/northglass/service/shelfmanager/ShelfManagerService.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git "a/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/src/main/java/com/northglass/service/shelfmanager/ShelfManagerService.java" "b/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/src/main/java/com/northglass/service/shelfmanager/ShelfManagerService.java"
index 7f88b30..347b5c6 100644
--- "a/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/src/main/java/com/northglass/service/shelfmanager/ShelfManagerService.java"
+++ "b/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/src/main/java/com/northglass/service/shelfmanager/ShelfManagerService.java"
@@ -591,7 +591,7 @@
 			
 			List<ShelfRack> ranks = shelfRackDao.findBystate();
 			for (ShelfRack rank : ranks) {
-				if (rank.getState().equals(RackState.IN_WORK) || rank.getState().equals(RackState.ON_WAITING)) {
+				if (rank.getRawPackage()!=null&&(rank.getState().equals(RackState.IN_WORK) || rank.getState().equals(RackState.ON_WAITING))) {
 						
 						html.append("<tr>");
 						html.append("<td><input type='checkbox' name='id' value="+rank.getId() +" /></td>");

--
Gitblit v1.8.0