Index: ssts-web/src/main/webapp/disinfectsystem/config/zjyy/config.js
===================================================================
diff -u -r33655 -r33792
--- ssts-web/src/main/webapp/disinfectsystem/config/zjyy/config.js	(.../config.js)	(revision 33655)
+++ ssts-web/src/main/webapp/disinfectsystem/config/zjyy/config.js	(.../config.js)	(revision 33792)
@@ -226,6 +226,8 @@
   enableForeignTousseSupplierStatisticsReport:true,
   //在PDA预回收界面显示手术间和病人信息
   displayOfOperatingRoomAndPatientInformationOnThePrepareRecycleScreenInPDA:true,
+  //外来器械包普通入筐时显示大小属性
+  displayTheSizeAttributeOfTheForeignTousseWhenNormalInfoBasket:true,
   //启用待回收列表的表格列自定义
   enableTableColumnCustomizationForTheWaitRecycleList :["科室","手术间","患者","住院号","物品清单","包数","申请人","最后修改时间"],
   //启用历史回收记录列表的表格列自定义
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
===================================================================
diff -u -r33238 -r33792
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 33238)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 33792)
@@ -1581,19 +1581,37 @@
 		imageButton = '<img src="/images/btn_query.png" onclick = "basketLoadGoods(\'' + basketName + '\',\'' + basketBarcode + '\',\'' + classifyBasketId + '\');" >';
 	}
 	basketElement += '<font onclick="topScannedBasket(event,this);">' + (sequence && sequence > 0 ? (sequence + '.' + basketName) : basketName) + '</font>' + '<font>' + imageButton + '</font>';
-	if ((basketSize || '') !== '') {
+	if (sstsConfig.displayTheSizeAttributeOfTheForeignTousseWhenNormalInfoBasket && params_id == '') {
 		basketElement += '<span class="basketSizeBox" style="display: inline-flex;"><label>大小：</label>';
+		basketElement += '<select class="basketSize">';
+		if (basketSize == '小包') {
+			basketElement += '<option value=""></option>';
+			basketElement += '<option value="小包" selected>小包</option>';
+			basketElement += '<option value="大包">大包</option>';
+		} else if (basketSize == '大包') {
+			basketElement += '<option value=""></option>';
+			basketElement += '<option value="小包">小包</option>';
+			basketElement += '<option value="大包" selected>大包</option>';
+		} else {
+			basketElement += '<option value=""></option>';
+			basketElement += '<option value="小包">小包</option>';
+			basketElement += '<option value="大包">大包</option>';
+		}
 	} else {
-		basketElement += '<span class="basketSizeBox"><label>大小：</label>';
+		if ((basketSize || '') !== '') {
+			basketElement += '<span class="basketSizeBox" style="display: inline-flex;"><label>大小：</label>';
+		} else {
+			basketElement += '<span class="basketSizeBox"><label>大小：</label>';
+		}
+		basketElement += '<select class="basketSize">';
+		if (basketSize == '小包') {
+			basketElement += '<option value="小包" selected>小包</option>';
+			basketElement += '<option value="大包">大包</option>';
+		} else {
+			basketElement += '<option value="小包">小包</option>';
+			basketElement += '<option value="大包" selected>大包</option>';
+		}
 	}
-	basketElement += '<select class="basketSize">';
-	if (basketSize == '小包') {
-		basketElement += '<option value="小包" selected>小包</option>';
-		basketElement += '<option value="大包">大包</option>';
-	} else {
-		basketElement += '<option value="小包">小包</option>';
-		basketElement += '<option value="大包" selected>大包</option>';
-	}
 	basketElement += '</select></span>';
 	if (sumCount && sumCount > 0) {
 		basketElement += '<font class="totalAmount"><span class="totalnum">0</span>/<span class="sumCount">' + sumCount + '</span></font>';
@@ -2353,7 +2371,12 @@
 	var isIDCard = $('#isThereIdentificationCard' + row).val();
 	var isReturn = false;
 	if (isIDCard == '是') {
-		var jsonStr = getJsonParams(false, false);
+		var basketSize = getBasketSizeObject('array');
+		if (typeof basketSize == 'string') {
+			showResult(basketSize);
+			return;
+		}
+		var jsonStr = getJsonParams(false, false, basketSize);
 		if (jsonStr == '') { return; }
 		var jSONe = JSON.parse(jsonStr);
 		var sumAmount = 0;
@@ -4583,7 +4606,7 @@
  * @param confirmation
  * @returns
  */
-function getJsonParams(confirmation, isConfirm) {
+function getJsonParams(confirmation, isConfirm, basketSizeArr) {
 	var newTousseArray = [];
 	var length = splitTousseArray2.length;
 	if (length > 0) {
@@ -4621,7 +4644,7 @@
 	paramJson.tally = false;
 	paramJson.recyclingItemArray = getRecyclingItemInfo();
 	paramJson.materialsJsonForSave = materialsMapForSave;
-	paramJson.basketSizeArr = getBasketSizeObject('array');
+	paramJson.basketSizeArr = basketSizeArr || getBasketSizeObject('array');
 	return JSON.stringify(paramJson);
 }
 
@@ -4888,7 +4911,12 @@
 var IntheBoxState = false;
 function submitFormFunction(confirmation, saveAndNew, autoReturnTheBorrowingTousse, print, recyclingAmountConfirm, isConfirm) {
 	isConfirm = isConfirm || false;
-	var jsonStr = getJsonParams(confirmation, isConfirm);
+	var basketSize = getBasketSizeObject('array');
+	if (typeof basketSize == 'string') {
+		showResult(basketSize);
+		return;
+	}
+	var jsonStr = getJsonParams(confirmation, isConfirm, basketSize);
 	if (jsonStr == '') { return; }
 	var jSONe = JSON.parse(jsonStr);
 	//console.log(jSONe); return
@@ -5129,7 +5157,12 @@
  */
 function submitFormFunctionForInventoryConfirm(confirmation, saveAndNew, autoReturnTheBorrowingTousse, print, recyclingAmountConfirm, isConfirm) {
 	isConfirm = isConfirm || false;
-	var jsonStr = getJsonParams(confirmation, isConfirm);
+	var basketSize = getBasketSizeObject('array');
+	if (typeof basketSize == 'string') {
+		showResult(basketSize);
+		return;
+	}
+	var jsonStr = getJsonParams(confirmation, isConfirm, basketSize);
 	if (jsonStr == '') { return; }
 	alertDiv("保存中,请稍候......", true);
 	var jSONe = JSON.parse(jsonStr)
@@ -5609,25 +5642,37 @@
 function getBasketSizeObject(objType) {
 	var basketSizeArr = [];
 	var basketSizeMap = {};
+	var msgArr = [];
 	$("#basketsUl li").each(function () {
 		var basketValue = $(this).find('input').eq(0).val();
 		if (basketValue) {
 			basketValue = JSON.parse(basketValue);
 			var barcode = basketValue.barcode;
+			var basketName = basketValue.basketName;
 			var basketSize = $(this).find('.basketSizeBox').find('.basketSize').val() || '';
 			var cssText = $(this).find('.basketSizeBox')[0].style.cssText || '';
 			if (cssText !== '') {
-				if (objType == 'array') {
-					basketSizeArr.push({
-						basketBarcode: barcode,
-						basketSize: basketSize
-					})
+				if (basketSize == '') {
+					msgArr.push(basketName);
 				} else {
-					basketSizeMap[barcode] = basketSize;
+					if (objType == 'array') {
+						basketSizeArr.push({
+							basketBarcode: barcode,
+							basketSize: basketSize
+						})
+					} else {
+						basketSizeMap[barcode] = basketSize;
+					}
 				}
 			}
 		}
 	});
+	if (msgArr.length > 5) {
+		var arr = msgArr.slice(0, 5);
+		return '以下篮筐的大小未选择，不能保存：' + arr.join(',') + '.....';
+	} else if (msgArr.length > 0 && msgArr.length <= 5) {
+		return '以下篮筐的大小未选择，不能保存：' + msgArr.join(',');
+	}
 	if (objType == 'array') {
 		return basketSizeArr;
 	} else {