Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recyclingErrors.js
===================================================================
diff -u -r37368 -r38853
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recyclingErrors.js	(.../recyclingErrors.js)	(revision 37368)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recyclingErrors.js	(.../recyclingErrors.js)	(revision 38853)
@@ -267,7 +267,7 @@
 }
 
 //创建节点
-function buildTableTR(amontPerTousse, materialDefinitionId, materialName, totalCount, errorCount, tousseBarcode, unconfirmedAmount, detailId, status) {
+function buildTableTR(amontPerTousse, materialDefinitionId, materialName, totalCount, errorCount, tousseBarcode, unconfirmedAmount, detailId, status, errorType) {
     var i = $("#recyclingErrorTable tbody tr").length;
     var sourceMaterialName = materialName;
     if (tousseBarcode != "") {
@@ -289,12 +289,12 @@
         + '<td id="totalCount' + i + '" class="w2">' + totalCount + '</td>'
         + '<td class="w3">'
         + '<div class="selblog">';
-    if (param_errorType == '增加') {
+    if (param_errorType == '增加' || errorType == '增加') {
         html += '<select id="errorType' + i + '" name="errorType' + i + '">'
             + '<option value="缺失">缺失</option>'
             + '<option value="增加" selected>增加</option>'
             + '</select>';
-    } else if (param_errorType == '缺失') {
+    } else if (param_errorType == '缺失' || errorType == '缺失') {
         html += '<select id="errorType' + i + '" name="errorType' + i + '">'
             + '<option value="缺失" selected>缺失</option>'
             + '<option value="增加">增加</option>'
@@ -439,19 +439,21 @@
                 var unconfirmedAmount = 0;
                 //有丢失的器械包数量
                 var totalCount = msg[i].totalCount;
+                var errorType = msg[i].errorType;
                 for (var j = 0; j < json.length; j++) {
                     if (msg[i].materialDefinitionId == json[j].materialDefinitionId) {
                         if (json[j].tousseBarcode != "" || json[j].status == 0) {
-                            buildTableTR(msg[i].amontPerTousse, msg[i].materialDefinitionId, msg[i].name, totalCount, json[j].amount, json[j].tousseBarcode, json[j].unconfirmedAmount, json[j].id, json[j].status);
+                            buildTableTR(msg[i].amontPerTousse, msg[i].materialDefinitionId, msg[i].name, totalCount, json[j].amount, json[j].tousseBarcode, json[j].unconfirmedAmount, json[j].id, json[j].status, json[j].errorType);
                             totalCount = 0;
                         } else {
                             errorCount += json[j].amount;
                             unconfirmedAmount += json[j].unconfirmedAmount;
+                            errorType = json[j].errorType;
                         }
                     }
                 }
                 if (totalCount > 0) {
-                    buildTableTR(msg[i].amontPerTousse, msg[i].materialDefinitionId, msg[i].name, totalCount, errorCount, "", unconfirmedAmount, '', 2);
+                    buildTableTR(msg[i].amontPerTousse, msg[i].materialDefinitionId, msg[i].name, totalCount, errorCount, "", unconfirmedAmount, '', 2, errorType);
                 }
             }
             selects = document.getElementsByTagName('select');