Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
===================================================================
diff -u -r14296 -r14348
--- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 14296)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 14348)
@@ -2219,8 +2219,12 @@
     			processAfterPacking(result, showName, packAmount);
     		}
     		else{
-    			// TODO: 需确认是否要判断物品是否为器械包
-    			Ext4.MessageBox.confirm("请确认", result.message,
+    			//如果返回失败的结果类型为stockNotEnough(即库存不足,则进行提示)
+    			if(result.type && result.type == 'stockNotEnough'){
+    				showResult(message);
+    			}else{
+	    			// TODO: 需确认是否要判断物品是否为器械包
+	    			Ext4.MessageBox.confirm("请确认", result.message,
             				function(btn) {
             					if (btn == 'yes') {
             						//输入一个true的参数
@@ -2238,6 +2242,7 @@
             					    });
             					}
                 		});
+    			}
 				
     		}
         }
Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
===================================================================
diff -u -r14341 -r14348
--- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java	(.../PackingManagerImpl.java)	(revision 14341)
+++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java	(.../PackingManagerImpl.java)	(revision 14348)
@@ -2443,6 +2443,7 @@
 		int sumAmount = objectDao.countBySql(sumAmountSql);
 		if(sumAmount < needOutAmount){
 			jsonObject.put("success", false);
+			jsonObject.put("type", "stockNotEnough");
 			jsonObject.put("message", disposableGoodsName + "库存不足,不能装配!");
 		}else{
 			//扣减库存,成功后加入到扣减明细集合中