Index: ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js =================================================================== diff -u -r27759 -r27862 --- ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js (.../qualitymonitoringInstanceForm.js) (revision 27759) +++ ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js (.../qualitymonitoringInstanceForm.js) (revision 27862) @@ -2960,20 +2960,21 @@ if((firstAddMaterial[v].id).indexOf("basketBarcodeC") == -1){//除了篮筐条码 if(firstAddMaterial[v].items == undefined){ firstAddMaterialArr.push(Ext.getCmp(firstAddMaterial[v].id).getValue()); + if(firstAddMaterialArr.length > 0){ + firstMaterialInfos.push({ + "material":firstAddMaterialArr[0], + "amount":firstAddMaterialArr[1], + "position":firstAddMaterialArr[2], + "order":firstAddMaterialArr[3] + }); + firstAddMaterialArr = []; + } }else{ firstAddMaterialArr.push(firstAddMaterial[v].items.items[0].el.dom.value); } } } - if(firstAddMaterialArr.length > 0){ - firstMaterialInfos.push({ - "material":firstAddMaterialArr[0], - "amount":firstAddMaterialArr[1], - "position":firstAddMaterialArr[2], - "order":firstAddMaterialArr[3] - }); - } } firstTousseBagsList.materialInfos = firstMaterialInfos; @@ -3002,7 +3003,7 @@ } //获取增加的块 - if(tousseAndMaterialWrapperCountNum > 0){//增加的块 这里的判断条件有问题 + if(tousseAndMaterialWrapperCountNum > 0){//增加的块 for(var k = 1;k <= tousseAndMaterialWrapperCountNum;k++){//先找到每一个块 var wrapper; var getTousseArgument;