Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
===================================================================
diff -u -r37685 -r37693
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 37685)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 37693)
@@ -5145,7 +5145,7 @@
  */
 //是否进行清点确认 false 为保存，true 为清点确认
 var IntheBoxState = false;
-function submitFormFunction(confirmation, saveAndNew, autoReturnTheBorrowingTousse, print, recyclingAmountConfirm, isConfirm) {
+function submitFormFunction(confirmation, saveAndNew, autoReturnTheBorrowingTousse, print, recyclingAmountConfirm, isConfirm, continueRecycleItemsthatLessThanSendAmount) {
 	isConfirm = isConfirm || false;
 	var basketSize = getBasketSizeObject('array');
 	if (typeof basketSize == 'string') {
@@ -5162,6 +5162,7 @@
 	} else {
 		jSONe.tally = false;
 	}
+	
 	var id = document.getElementById('id').value;
 	var app_id = document.getElementById('recyclingApplicationId').value;
 	var departCode = document.getElementById('departCode').value;
@@ -5207,6 +5208,7 @@
 			remark: $('#remarkText').text(),
 			communicationUserName: $('#communicationUserName').val(),
 			communicationUserCode: $('#communicationUserCode').val(),
+			continueRecycleItemsthatLessThanSendAmount:continueRecycleItemsthatLessThanSendAmount || '否',
 			needPrint: print
 		},
 		success: function (result) {
@@ -5303,6 +5305,18 @@
 					}
 				}
 			} else {
+				//BJ309YY-21：回收数量允许设置为少于已发货数量
+				if(sstsConfig.enableSetRecycleAmountLessThanSendAmount && result.recyAmountNoMatchException){
+					closeDiv();
+					var msg = '';
+					if(result.message !== ''){
+						msg = result.message.split('，')[0] + '，' + result.message.split('，')[1] + '，' + '可能导致数据出现误差，是否继续操作？';
+					}
+					dialogConfirm(msg, function () {
+						submitFormFunction(confirmation, saveAndNew, autoReturnTheBorrowingTousse, print, recyclingAmountConfirm, isConfirm, '是')
+					});
+					return;
+				}
 				if (result.versionNotMatch) {
 					closeDiv();
 					layer.open({