Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/customIntoBasket.jsp
===================================================================
diff -u -r29573 -r33238
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/customIntoBasket.jsp	(.../customIntoBasket.jsp)	(revision 29573)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/customIntoBasket.jsp	(.../customIntoBasket.jsp)	(revision 33238)
@@ -42,7 +42,10 @@
  var param_data = '${param.data}';
  var param_tousseIntoBasketInfo = '${param.tousseIntoBasketInfo}';
  var param_recyclingApplicationId = '${param.recyclingApplicationId}';
- 
+ var recyclingStatus = decodeURIComponent('${param.RecyclingStatus}');
+ var appType = decodeURIComponent('${param.appType}');
+ var isRecycling = '${param.isRecycling}';
+ var sessionBasketSizeObj = JSON.parse(decodeURIComponent('${param.sessionBasketSizeObj}'));
  layer.config({
 		extend: 'myskin/style.css', //加载您的扩展样式
 	  	skin: 'layer-ext-myskin'
@@ -123,6 +126,16 @@
 html {
     height: 100% !important;
 }
+.basketSizeBox {
+    line-height: 38px;
+    height: 38px;
+    display: inline-flex;
+}
+.basketSize {
+    height: 35px;
+    width: 90px;
+    font-size: 20px;
+}
 </style>
 <dl id="idBox" class="lightbox" style="top:10%;left:5%;">
     <dt><b style="font-size:20px">提示信息</b> </dt>
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/customIntoBasket.js
===================================================================
diff -u -r32466 -r33238
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/customIntoBasket.js	(.../customIntoBasket.js)	(revision 32466)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/customIntoBasket.js	(.../customIntoBasket.js)	(revision 33238)
@@ -239,7 +239,6 @@
             	}else if(msg.basket != null){
             		var isBasketLoaded = false;
                     var currentNode;
-                     
                    	var basketItem = msg.basket;
                    	$("#basketsUl li").each(function(){
                    		 var hide = $(this).find('input');
@@ -250,6 +249,7 @@
 								return false;
                             }
                       });
+					  var basketSize = sessionBasketSizeObj[msg.basket.containerBarcode] || '';
                    	  $("#seleniumResult").val("1");
                       if(isBasketLoaded){
                            //将篮筐放置在最前面
@@ -268,7 +268,40 @@
                         	basketElement += '<a href="javascript:void(0);" class="btn-removeImplant" onclick="removeImplants(this,\''+basketItem.containerBarcode+'\',\''+basketItem.id+'\');">删除</a>';
                         	basketElement += '</i>';
                         	basketElement += '<span class="add" onclick="toggleItems(this);"></span>';
-                        	basketElement += '<div class="basketName status-empty-yellow"><div class="containImplant"></div><div>'+basketItem.containerName+imageButton+'</div></div>'
+                        	basketElement += '<div style="width:310px" class="basketName status-empty-yellow"><div class="containImplant"></div><div>'+basketItem.containerName+imageButton+'</div></div>';
+							if(sstsConfig.displayTheSizeAttributeOfTheForeignTousseWhenCustomIntoBasket){
+								if(isRecycling && (recyclingStatus == '待接收' || recyclingStatus == '部分接收') && appType == '外来器械包申请单'){
+									basketElement += '<span class="basketSizeBox"><label>大小：</label>';
+									basketElement += '<select class="basketSize">';
+									basketElement += '<option></option>';
+									if(basketSize == '大包'){
+										basketElement += '<option value="小包">小包</option>';
+										basketElement += '<option value="大包" selected>大包</option>';
+									}else if(basketSize == '小包'){
+										basketElement += '<option value="小包" selected>小包</option>';
+										basketElement += '<option value="大包">大包</option>';
+									}else {
+										basketElement += '<option value="小包">小包</option>';
+										basketElement += '<option value="大包">大包</option>';
+									}
+									basketElement += '</select></span>';
+								}else if(isRecycling == 'false' && appType == '外来器械包申请单'){
+									basketElement += '<span class="basketSizeBox"><label>大小：</label>';
+									basketElement += '<select class="basketSize">';
+									basketElement += '<option></option>';
+									if(basketSize == '大包'){
+										basketElement += '<option value="小包">小包</option>';
+										basketElement += '<option value="大包" selected>大包</option>';
+									}else if(basketSize == '小包'){
+										basketElement += '<option value="小包" selected>小包</option>';
+										basketElement += '<option value="大包">大包</option>';
+									}else {
+										basketElement += '<option value="小包">小包</option>';
+										basketElement += '<option value="大包">大包</option>';
+									}
+									basketElement += '</select></span>';
+								}
+							}
                         	basketElement += '<font class="totalAmount"><font class="totalnum">0</font></font>';
                         	basketElement += '<dl class="sed clearfix"></dl>';
                         	basketElement += '</li>';
@@ -893,12 +926,14 @@
 function doSaveAction(){
    if(submitCheck()){
 	   var array = new Array();
+	   var basketSizeArray = [];
 	   $("#basketsUl").children().each(function(){
 	        var id = null;
 	        var basketBarcode = null;
 	        var containerName = null;
 	        var washClassifyType = null;
 	        var sequence = null;
+			var basketSize = $(this).find('.basketSizeBox').find('.basketSize').val();
 			var classifiedItemsInfo = {};
 			var sumCount = 0;
 			var currentCount = 0;
@@ -925,6 +960,12 @@
 	           				 var obj = {};
 		                     obj.basketBarcode = basketBarcode;
 		                     obj.containerName = containerName;
+							 if(basketSize !== undefined){
+								if(basketSize == '' && basketSizeArray.indexOf(containerName) == -1){
+									basketSizeArray.push(containerName)
+								}
+								obj.basketSize = basketSize;
+							 }
 							 obj.sequence = sequence;
 							 obj.washClassifyType = washClassifyType;
 							 obj.basketId = id;
@@ -973,8 +1014,18 @@
 	            }
 	        });
 		});
-	   window.opener.customIntoBasketFun(array);
-	   window.close();
+		if(basketSizeArray.length > 0){
+			var basketSizeString = '以下篮筐的大小未选择，不能保存：';
+			if(basketSizeArray.length > 5){
+				basketSizeString += basketSizeArray.slice(0,5).join(',') + '.....';
+			}else {
+				basketSizeString += basketSizeArray.join(',')
+			}
+			alertDiv(basketSizeString);
+			return
+		}
+	   	window.opener.customIntoBasketFun(array);
+	   	window.close();
 	}
 }
 
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp
===================================================================
diff -u -r32149 -r33238
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp	(.../recycleForTouchScreen.jsp)	(revision 32149)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp	(.../recycleForTouchScreen.jsp)	(revision 33238)
@@ -133,6 +133,17 @@
     text-align: center;
     line-height: 30px;
 }
+
+.basketSizeBox {
+    line-height: 38px;
+    height: 38px;
+    display: none;
+}
+.basketSize {
+    height: 35px;
+    width: 90px;
+    font-size: 20px;
+}
 </style>
 
 <!-- alertDIV -->
Index: ssts-web/src/main/webapp/disinfectsystem/config/zjyy/config.js
===================================================================
diff -u -r33087 -r33238
--- ssts-web/src/main/webapp/disinfectsystem/config/zjyy/config.js	(.../config.js)	(revision 33087)
+++ ssts-web/src/main/webapp/disinfectsystem/config/zjyy/config.js	(.../config.js)	(revision 33238)
@@ -192,5 +192,7 @@
   //急用物品报表
   enableUrgentNeedGoodsProcessingCycleReport:true,
   //开启外来器械包申请单统计报表材料显示
-  enableShowForeignTousseApplicationReportMaterials:true
+  enableShowForeignTousseApplicationReportMaterials:true,
+  //外来器械包自定义入筐时显示大小属性
+  displayTheSizeAttributeOfTheForeignTousseWhenCustomIntoBasket:true
   }
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
===================================================================
diff -u -r33217 -r33238
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 33217)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 33238)
@@ -1363,6 +1363,7 @@
 	var lastTousseInstanceId = basketItem.lastTousseInstanceId;
 	var tousseInstanceBarcode = basketItem.tousseInstanceBarcode;
 	var washClassifyType = basketItem.washClassifyType;
+	var basketSize = basketItem.basketSize || '';
 	var basketElement = $('dl[class="sed clearfix"]:eq(0)');
 	var basketHidenValue = $("#basketsUl li:first").find('input').val();
 	if (type == '材料') {
@@ -1372,7 +1373,10 @@
 			if (json.barcode == basketBarcode) {
 				basketElement = $(this).find("dl");
 				basketHidenValue = hideStr;
-
+				if (basketSize !== '') {
+					$(this).find('.basketSizeBox').css('display', 'inline-flex');
+					$(this).find('.basketSizeBox').find('.basketSize').val(basketSize);
+				}
 				$(this).find('dl').children().each(function () {
 					if ($(this).attr('type') == 'hidden') {
 						var hideStr = $(this).val();
@@ -1563,7 +1567,7 @@
 }
 
 // 创建篮筐
-function createBasketUiElement(basketBarcode, classifyBasketId, basketName, washClassifyType, sequence, isIdCard, sumCount) {
+function createBasketUiElement(basketBarcode, classifyBasketId, basketName, washClassifyType, sequence, isIdCard, sumCount, basketSize) {
 	var basketElement = '<li>';
 	basketElement += '<input type="hidden">';
 	basketElement += '<i>';
@@ -1577,6 +1581,20 @@
 		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 || '') !== '') {
+		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></span>';
 	if (sumCount && sumCount > 0) {
 		basketElement += '<font class="totalAmount"><span class="totalnum">0</span>/<span class="sumCount">' + sumCount + '</span></font>';
 		basketElement += '<span style="display:none" class="hiddenSumCountValue">' + sumCount + '</span>';
@@ -4603,6 +4621,7 @@
 	paramJson.tally = false;
 	paramJson.recyclingItemArray = getRecyclingItemInfo();
 	paramJson.materialsJsonForSave = materialsMapForSave;
+	paramJson.basketSizeArr = getBasketSizeObject('array');
 	return JSON.stringify(paramJson);
 }
 
@@ -5567,15 +5586,55 @@
 function openCustomIntoBasketPage() {
 	var data = getUnCleanedEntirelyTousseInfo();
 	var tousseIntoBasketInfo = JSON.stringify(getTousseIntoBasketInfo());
+	var RecyclingStatus = $('#recyclingStatus').val();
+	var appType = $('#appType').val();
+	var sessionBasketSizeObj = getBasketSizeObject('map');
+	var isRecycling = true;
+	if (!isUndefinedOrNullOrEmpty(params_id)) {
+		isRecycling = false;
+	}
 	if (data != "[]") {
 		var url = WWWROOT + '/disinfectsystem/touchScreen/recycle/customIntoBasket.jsp?data=' + data + '&resolution=1980'
 			+ '&tousseIntoBasketInfo=' + tousseIntoBasketInfo + '&recyclingApplicationId=' + $('#recyclingApplicationId').val()
+			+ '&isRecycling=' + isRecycling
+			+ '&RecyclingStatus=' + encodeURIComponent(RecyclingStatus) + '&appType=' + encodeURIComponent(appType)
+			+ '&sessionBasketSizeObj=' + encodeURIComponent(JSON.stringify(sessionBasketSizeObj))
 		openFullSizeWindowWithName(url, true, '自定义入框');
 	} else {
 		alertDiv("没有符合条件待装载的物品！");
 	}
 }
 
+//获取篮筐的大小属性
+function getBasketSizeObject(objType) {
+	var basketSizeArr = [];
+	var basketSizeMap = {};
+	$("#basketsUl li").each(function () {
+		var basketValue = $(this).find('input').eq(0).val();
+		if (basketValue) {
+			basketValue = JSON.parse(basketValue);
+			var barcode = basketValue.barcode;
+			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
+					})
+				} else {
+					basketSizeMap[barcode] = basketSize;
+				}
+			}
+		}
+	});
+	if (objType == 'array') {
+		return basketSizeArr;
+	} else {
+		return basketSizeMap;
+	}
+}
+
 // 打开添加器械包的窗口
 function openSelectTousse(tousseName) {
 	var tousseType = $('#appType').val();
@@ -5785,9 +5844,8 @@
 							return false;
 						}
 					});
-
 					if (!isBasketLoaded) {
-						createBasketUiElement(item.basketBarcode, item.basketId, item.containerName, item.washClassifyType, item.sequence, false, item.sumCount);
+						createBasketUiElement(item.basketBarcode, item.basketId, item.containerName, item.washClassifyType, item.sequence, false, item.sumCount, item.basketSize);
 						$("#scanContainerBarcodeTipUl").hide();
 					}
 				}
@@ -5799,6 +5857,7 @@
 				var basketItem = {
 					ci_id: "",
 					type: '材料',
+					basketSize: item.basketSize,
 					orgUnitName: orgUnitName,
 					tousseName: tousseName,
 					tousseDefinitionID: tousseDefinitionID,
@@ -6897,13 +6956,14 @@
 				for (var i = 0; i < record.classifyBaskets.length; i++) {
 					var basket = record.classifyBaskets[i];
 					var washClassifyType = basket.washClassifyType;
+					var basketSize = basket.basketSize;
 					var isIdCard = false;
 					if (basket.containerName.indexOf('(标识牌') == -1) {
 						isIdCard = false;
 					} else {
 						isIdCard = true;
 					}
-					createBasketUiElement(basket.containerBarcode, basket.id, basket.containerName, washClassifyType, basket.sequence, isIdCard)
+					createBasketUiElement(basket.containerBarcode, basket.id, basket.containerName, washClassifyType, basket.sequence, isIdCard, 0, basketSize)
 
 					for (var j = 0; j < basket.classfiedItems.length; j++) {
 						var ci = record.classifyBaskets[i].classfiedItems[j];