Index: ssts-web/src/main/java/com/forgon/disinfectsystem/borrowrecord/service/BorrowRecordManagerImpl.java
===================================================================
diff -u -r17434 -r17439
--- ssts-web/src/main/java/com/forgon/disinfectsystem/borrowrecord/service/BorrowRecordManagerImpl.java	(.../BorrowRecordManagerImpl.java)	(revision 17434)
+++ ssts-web/src/main/java/com/forgon/disinfectsystem/borrowrecord/service/BorrowRecordManagerImpl.java	(.../BorrowRecordManagerImpl.java)	(revision 17439)
@@ -446,18 +446,19 @@
 	 * @param invoicePlan {@link InvoicePlan}
 	 */
 	private void checkStatus(InvoicePlan invoicePlan){
-		String status = null;
 		//如果发货状态是已发货或者已终止
-		if (InvoicePlan.DELIVERSTATUS_DELIVERED.equals(invoicePlan.getDeliverStatus()) || InvoicePlan.STATUS_END.equals(invoicePlan.getDeliverStatus())){
-			status = invoicePlan.getDeliverStatus();
+		String deliverStatus = invoicePlan.getDeliverStatus();
+		if (InvoicePlan.DELIVERSTATUS_AWAITDELIVER.equals(deliverStatus)){
+			throw new RuntimeException("该借物单还没发货,不能修改数量!");
 		}
+		if (InvoicePlan.DELIVERSTATUS_DELIVERED.equals(deliverStatus) || InvoicePlan.STATUS_END.equals(deliverStatus)){
+			throw new RuntimeException("该借物单状态是:[" + deliverStatus + "],不能修改申请数量!");
+		}
 		//如果归还状态是归还或者已终止
-		else if (InvoicePlan.RETURN_STATUS_RETURNED.equals(invoicePlan.getReturnStatus()) || InvoicePlan.STATUS_END.equals(invoicePlan.getReturnStatus())){
-			status = invoicePlan.getReturnStatus();
+		String returnStatus = invoicePlan.getReturnStatus();
+		if (InvoicePlan.RETURN_STATUS_RETURNED.equals(returnStatus) || InvoicePlan.STATUS_END.equals(returnStatus)){
+			throw new RuntimeException("该借物单状态是:[" + returnStatus + "],不能修改申请数量!");
 		}
-		if (status != null){
-			throw new RuntimeException("该借物单状态是:[" + status + "],不能修改申请数量!");
-		}
 	}
 
 
Index: ssts-web/src/main/java/com/forgon/disinfectsystem/borrowrecord/action/BorrowRecordAction.java
===================================================================
diff -u -r17434 -r17439
--- ssts-web/src/main/java/com/forgon/disinfectsystem/borrowrecord/action/BorrowRecordAction.java	(.../BorrowRecordAction.java)	(revision 17434)
+++ ssts-web/src/main/java/com/forgon/disinfectsystem/borrowrecord/action/BorrowRecordAction.java	(.../BorrowRecordAction.java)	(revision 17439)
@@ -18,7 +18,6 @@
 import net.sf.json.JsonConfig;
 import net.sf.json.util.CycleDetectionStrategy;
 
-import org.apache.commons.collections.map.HashedMap;
 import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
 import org.apache.struts2.convention.annotation.Action;
@@ -301,15 +300,15 @@
 			String tousseItems = StrutsParamUtils.getPraramValue("tousseItems", null);
 			List<TousseItem> list = JSONUtil.fromJson(tousseItems, new TypeToken<List<TousseItem>>(){});
 			Long id = StrutsParamUtils.getPraramLongValue("id", null);
-			Map<String, Object> map = new HashedMap();
+			Map<String, Object> map = new HashMap<>();
 			map.put("id", id);
 			map.put("tousseItems", list);
 			borrowRecordManager.modifyBorrowRecord(map);
 			StrutsResponseUtils.output(true);
 		}
 		catch (Exception e) {
 			logger.error(e, e);
-			StrutsResponseUtils.output(false,e.getMessage());
+			StrutsResponseUtils.output(false, e.getCause().getMessage());
 			throw new RuntimeException(e);
 		}
 	}
Index: ssts-web/src/main/webapp/disinfectsystem/borrow/borrowingTousseView.js
===================================================================
diff -u -r16995 -r17439
--- ssts-web/src/main/webapp/disinfectsystem/borrow/borrowingTousseView.js	(.../borrowingTousseView.js)	(revision 16995)
+++ ssts-web/src/main/webapp/disinfectsystem/borrow/borrowingTousseView.js	(.../borrowingTousseView.js)	(revision 17439)
@@ -379,20 +379,11 @@
                 hidden : !validateIsSupplyRoomUser(),
                 handler : function() {
                     var selections = grid.getSelections();
-                    if (selections.length > 1){
-                    	top.Ext.Msg.alert("警告!", '只能选择一条记录!');
-                    	return false;
+	                var msg = beforeModifyAppCountCheck(selections);
+					if (msg != null){
+						top.Ext.Msg.alert("警告!", msg);
+						return false;
 					}
-                    var deliverStatus = selections[0].get('deliverStatus');
-                    var returnStatus = selections[0].get('returnStatus');
-                    if ('已发货' == deliverStatus || '已归还' == returnStatus) {
-                        top.Ext.Msg.alert("警告!", '该单状态为已发货或者已归还,不能修改数量!');
-                        return false;
-					}
-                    if ('已终止' == deliverStatus || '已终止' == returnStatus) {
-                        top.Ext.Msg.alert("警告!", '该单状态为已终止,不能修改数量!');
-                        return false;
-					}
                     modifyAppCount(selections[0].get('id'));
                 }
 			}];
Index: ssts-web/src/main/webapp/disinfectsystem/borrow/borrowingTousseForm.js
===================================================================
diff -u -r17081 -r17439
--- ssts-web/src/main/webapp/disinfectsystem/borrow/borrowingTousseForm.js	(.../borrowingTousseForm.js)	(revision 17081)
+++ ssts-web/src/main/webapp/disinfectsystem/borrow/borrowingTousseForm.js	(.../borrowingTousseForm.js)	(revision 17439)
@@ -890,6 +890,29 @@
 }
 
 /**
+ * 修改数量前的校验
+ * @param selections 选中的记录
+ * @returns {*}
+ */
+function beforeModifyAppCountCheck(selections) {
+	if (selections.length > 1){
+		return '只能选择一条记录!';
+	}
+	var deliverStatus = selections[0].get('deliverStatus');
+	var returnStatus = selections[0].get('returnStatus');
+	if ('待发货' == deliverStatus){
+		return '该借物单还没发货,不能修改数量!';
+	}
+	if ('已发货' == deliverStatus || '已归还' == returnStatus) {
+		return '该单状态为已发货或者已归还,不能修改数量!';
+	}
+	if ('已终止' == deliverStatus || '已终止' == returnStatus) {
+		return '该单状态为已终止,不能修改数量!';
+	}
+	return null;
+}
+
+/**
  * 修改借物单弹窗
  * @param id 借物单的id
  */