Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationForm.js =================================================================== diff -u -r26670 -r26977 --- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationForm.js (.../goodsApplicationForm.js) (revision 26670) +++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationForm.js (.../goodsApplicationForm.js) (revision 26977) @@ -968,8 +968,10 @@ urgentLevelId:urgentLevelId }; - var goodsBindHandler = new GoodsBindHandler(); - goodsBindHandler.handleBindGood(params); + + //广东省人民医院GDSRMYY-511 物品绑定功能的问题 修改已有的数量,不做判断和限制,允许用户任意修改。 + //var goodsBindHandler = new GoodsBindHandler(); + //goodsBindHandler.handleBindGood(params); } } else if (depth == 1) { var params = { @@ -982,9 +984,11 @@ urgentAmount:record.get('urgentAmount'), urgentLevel:urgentLevel, urgentLevelId:urgentLevelId - }; - var goodsBindHandler = new GoodsBindHandler(); - goodsBindHandler.handleBindGood(params); + }; + + //广东省人民医院GDSRMYY-511 物品绑定功能的问题 修改已有的数量,不做判断和限制,允许用户任意修改。 + //var goodsBindHandler = new GoodsBindHandler(); + //goodsBindHandler.handleBindGood(params); } record.set("totalPrice", isUndefinedOrNullOrEmpty(totalPrice) ? roundValue(count * record.get("price")) : totalPrice); Index: ssts-web/src/main/webapp/disinfectsystem/goodsBindingConfig/goodsBindHandler.js =================================================================== diff -u -r26508 -r26977 --- ssts-web/src/main/webapp/disinfectsystem/goodsBindingConfig/goodsBindHandler.js (.../goodsBindHandler.js) (revision 26508) +++ ssts-web/src/main/webapp/disinfectsystem/goodsBindingConfig/goodsBindHandler.js (.../goodsBindHandler.js) (revision 26977) @@ -7,15 +7,25 @@ * @param records 需要添加的捆绑物的对象 * @returns {boolean} */ -GoodsBindHandler.prototype.addBindGood = function (records) { +GoodsBindHandler.prototype.addBindGood = function (records) { top.Ext4.each(records, function (record) { var id = record.id; var name = record.name; - var count = record.count; + var count = record.count; + + var leftTempData = getApplyGoods(leftTemplateStore); + var rightTempData = getApplyGoods(rightTemplateStore); + if (!isUndefinedOrNullOrEmpty(leftTempData)){ + count = calculateBindCount(name,count,leftTempData); + } + if (!isUndefinedOrNullOrEmpty(rightTempData)){ + count = calculateBindCount(name,count,rightTempData); + } var materials = record.materials; if (materials) { materials = JSON.stringify(materials); } + //var urgentAmount = 0; var urgentAmount = record.urgentAmount; if(urgentAmount == 0){ @@ -105,3 +115,14 @@ }); } } + +function calculateBindCount(name,count,templateStore){ + var countAll = count; + for(var i = 0;i < templateStore.length;i++){ + if(name == templateStore[i].name){ + countAll = add(countAll,templateStore[i].count); + break; + } + } + return countAll; +}