Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/departRecycleForTouchScreen.js
===================================================================
diff -u -r41616 -r41624
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/departRecycleForTouchScreen.js	(.../departRecycleForTouchScreen.js)	(revision 41616)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/departRecycleForTouchScreen.js	(.../departRecycleForTouchScreen.js)	(revision 41624)
@@ -156,6 +156,13 @@
             return;
         }
     }
+    if (row.split('_').length == 3) {
+        var loadedAmount = parseInt($('#loadedAmount' + row).val(), 10);
+        if (parseInt(loadedAmount) > 0) {
+            alertDiv("已经放入篮筐，不能再修改！");
+            return;
+        }
+    }
     var recycleAmount = $('#recycleAmount' + row).val() == '' ? 0 : parseInt($('#recycleAmount' + row).val(), 10) + 1;
     if (recycleAmount <= 9999) {
         $('#recycleAmount' + row).val(recycleAmount);
@@ -182,6 +189,13 @@
             return;
         }
     }
+    if (row.split('_').length == 3) {
+        var loadedAmount = parseInt($('#loadedAmount' + row).val(), 10);
+        if (parseInt(loadedAmount) > 0) {
+            alertDiv("已经放入篮筐，不能再修改！");
+            return;
+        }
+    }
     var recycleAmount = $('#recycleAmount' + row).val() == '' ? 0 : parseInt($('#recycleAmount' + row).val(), 10) - 1;
     if (recycleAmount >= 0) {
         $('#recycleAmount' + row).val(recycleAmount);
@@ -928,6 +942,11 @@
             "是": function () {
                 $('#tousseItemsTr' + row).hide();
                 $('#deleted' + row).val(1);
+                var parentRow = row.split('_')[0] + '_' + row.split('_')[1];
+                $('#childCount' + parentRow).val(parseInt($('#childCount' + parentRow).val()) - 1);
+                if (parseInt($('#childCount' + parentRow).val()) == 0) {
+                    $('#tousseItemsTr' + parentRow).hide();
+                }
                 $(this).dialog("close");
                 var applicationId = $('#applicationId' + row).val();
                 $("#basketsUl li").each(function () {
@@ -1370,7 +1389,7 @@
     } else {
         arr.push(row);
     }
-    if(sstsConfig.enableUrgentFunction){
+    if (sstsConfig.enableUrgentFunction) {
         if (!isUndefinedOrNull(urgentAmount) && urgentAmount > 0) {
             var msg = urgentLevel;
             var fontSize = "16px";
@@ -1967,7 +1986,9 @@
         data = {
             jsonParam: "" + JSON.stringify(array[i]) + "",
             departCode: departCoding,
-            depart: currentOrgUnitName
+            depart: currentOrgUnitName,
+            operator: userName,
+            recyclingUser: userName
         }
     }
     $.ajax({