Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js =================================================================== diff -u -r28061 -r28072 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 28061) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 28072) @@ -3499,8 +3499,66 @@ area: ['600px', '400px'], btnAlign: 'c', btn2:function(){ - refresh(); - } + if(result.recyclingApplicationVo != null){ + $("#invoicePlanVersion").val(result.recyclingApplicationVo.version); + if(result.recyclingApplicationVo.applicationItems.length > 0 ){ + var addColumnArr = []; + var tousseItemsTable = $('#tousseItemTable').children().first().children(); + for(var m = 0; m < result.recyclingApplicationVo.applicationItems.length;m++){ + var item = result.recyclingApplicationVo.applicationItems[m]; + var isAdd = true; + for (var j = 0; j < tousseItemsTable.length; j++) { + if(item.tousseDefinitionId == $('#tousseDefinitionID' + j).val()){ + var applicationAmountVal = parseInt($('#applicationAmount'+j).val(), 10); + if(item.amount > applicationAmountVal){ + $('#applicationAmount'+j).val(item.amount); + $('#recycleAmount'+j).val(item.amount); + } + isAdd = false; + break; + } + } + + if (isAdd) { + var errorDamageQmKey = item.errorDamageQmKey; + if(isUndefinedOrNullOrEmpty(errorDamageQmKey)){ + var timeStr = new Date().getTime(); + errorDamageQmKey = item.tousseDefinitionId + "_" + timeStr; + } + var toussItem = { + tousseItemId: '', + tousseName: item.tousseName, + tousseDefinitionID: item.tousseDefinitionId, + applicationAmount: item.amount, + recycleAmount: item.amount, + loadedAmount: 0, + isCleanedEntirely: item.isCleanedEntirely, + tousseType: item.tousseType, + isThereIdentificationCard: item.isThereIdentificationCard, + isApplyEntireTousse: item.isApplyEntireTousse, + urgentAmount : item.urgentAmount, + errorRemark : item.errorRemark, + damageRemark : item.damageRemark, + urgentLevel : item.urgentLevel, + tousseRemark : '', + errorDamageQmKey : errorDamageQmKey, + spelling : item.spelling + }; + addColumnArr.push(toussItem); + } + } + var initColumnLength = tousseItemsTable.length; + for (var i = 0; i < addColumnArr.length; i++) { + var addColumnObj = addColumnArr[i]; + addColumnObj.row = i + initColumnLength; + //统一增加的原因,是防止下次去拿数据的时候,拿到刚增加进去的数据 + addToussItem(addColumnObj, false); + } + } + + + } + } }); }else{ alertDiv(result.message);