Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManager.java =================================================================== diff -u -r20192 -r20386 --- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManager.java (.../TousseDefinitionManager.java) (revision 20192) +++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManager.java (.../TousseDefinitionManager.java) (revision 20386) @@ -154,11 +154,11 @@ /** * 搜索器械包（含消毒物品）和一次性物品，返回JSONObject对象. - * @param searchString 搜索的字符串 - * @param tousseType 搜索的物品类型 - * @param showReferencePrice 是否显示参考价格 - * @param showExternalCodeOfDisposableGoods 是否显示一次性物品的外部编码 - * @param deptCode 科室编码 + * @param searchString 搜索的字符串 + * @param tousseType 搜索的物品类型 + * @param showReferencePrice 是否显示参考价格 + * @param showExternalCodeOfDisposableGoods 是否显示一次性物品的外部编码 + * @param deptCode 处理科室的科室编码 * @return */ public Map searchComboGoods(String searchString, String tousseType,boolean showReferencePrice,boolean showExternalCodeOfDisposableGoods,String deptCode); Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js =================================================================== diff -u -r20377 -r20386 --- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js (.../goodsApplicationView.js) (revision 20377) +++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js (.../goodsApplicationView.js) (revision 20386) @@ -802,7 +802,7 @@ * @param minApplyAmount 最小申请数量（只用于一次性物品） * @param maxApplyAmount 最大申请数量（只用于一次性物品） * @param urgentAmount 加急数量 - * @param para 追加的参数，是一个对象，里面可以有多种属性,方便以后扩展用（目前只有{behavior:操作类型（添加或者提交交或者绑定物品）,transferScale:中包装单位装换单位系数,middlePackageUnit:申领单位（原来叫中包装单位）}） + * @param para 追加的参数，是一个对象，里面可以有多种属性,方便以后扩展用（目前只有{behavior:操作类型（添加或者提交或者绑定物品）,transferScale:中包装单位装换单位系数,middlePackageUnit:申领单位（原来叫中包装单位）}） */ function addItems(tousseDefinitionID,name,count,diposable,isApplyEntireTousse,price,externalCode, storageAmount,tousseType,materials,unit,packageSpec,minApplyAmount,maxApplyAmount,urgentAmount,para){ @@ -886,7 +886,7 @@ unit : isUndefinedOrNullOrEmpty(middlePackageUnit) ? unit :middlePackageUnit, minUnit : unit, transferScale : isUndefinedOrNullOrEmpty(transferScale) ? '':transferScale, - //原来最小单位的数量（应该是真正的申请数量） + //原来最小单位的申请数量 unitCount : isUndefinedOrNullOrEmpty(transferScale) ? '':count * transferScale, leaf : true, children : materials, @@ -1052,7 +1052,7 @@ if(!isValidDiposableAmount(minApplyAmount,count)){ showResult("该一次性物品最小申请数量为"+minApplyAmount+",所填数量必须是"+minApplyAmount+"的倍数。"); return false; - }else if(parseInt(checkCount,10) > storageAmount ){ + }else if(parseInt(checkCount,10) > storageAmount){ if(!allowApplyDisposableGoodsWhenUnderstock){ showResult("申请数量不能大于库存数量!"); return false; @@ -1286,7 +1286,7 @@ } /** - * 处理数量的事件 + * 校验一次性物品的申请数量（即：1、申请的数量不能大于库存（这个有配置项） 2、申请数量必须为最小申请数量的倍数 3、申请数量大于最大申请数量事需要提示）. * @param context */ function handleAmountEvent(context) { Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationForm.js =================================================================== diff -u -r20377 -r20386 --- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationForm.js (.../goodsApplicationForm.js) (revision 20377) +++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationForm.js (.../goodsApplicationForm.js) (revision 20386) @@ -663,6 +663,15 @@ showResult('数量不能大于之前申请的数量'); return; } + } else if (isDiposableGoods == '是') { + var bindGoodVo = { + goodName: record.get('name'), + bindCount: record.get('count'), + goodId: record.get('tousseDefinitionID'), + goodType: record.get('tousseType') + }; + var goodsBindHandler = new GoodsBindHandler(); + goodsBindHandler.handleBindGood(bindGoodVo); } record.set("totalPrice", isUndefinedOrNullOrEmpty(totalPrice) ? roundValue(context.value * record.get("price")):totalPrice); @@ -973,7 +982,7 @@ {xtype : 'hidden',name : 'isUpateStatus',id : 'isUpateStatus'}, {xtype : 'hidden',name : 'departCoding',itemId : 'departCoding',id : "departCoding2"}, //申请科室的科室编码 {xtype : 'hidden',name : 'settleAccountsDepartCoding',id : 'settleAccountsDepartCoding'}, - {xtype : 'hidden',name : 'handleDepartCoding',id : 'handleDepartCoding'}, + {xtype : 'hidden',name : 'handleDepartCoding',id : 'handleDepartCoding'}, //处理科室的科室编码 {xtype : 'hidden',name : 'isDiposableGoods',id : 'isDiposableGoods'}, {xtype : 'hidden',name : 'tousseType',id : 'tousseType'}, {xtype : 'hidden',name : 'isApplyEntireTousse',id : 'isApplyEntireTousse'}, Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java =================================================================== diff -u -r20192 -r20386 --- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java (.../TousseDefinitionAction.java) (revision 20192) +++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java (.../TousseDefinitionAction.java) (revision 20386) @@ -2465,10 +2465,11 @@ public void searchBindGood(){ try { + String handleDepartCoding = StrutsParamUtils.getPraramValue("handleDepartCoding", ""); String tousseType = StrutsParamUtils.getPraramValue("tousseType", ""); String findGood = StrutsParamUtils.getPraramValue("findGood", ""); List bindGoodVos = JSONUtil.fromJson(findGood, new TypeToken>(){}); - Map map = tousseDefinitionManager.searchComboGoods("", tousseType, true, false, null); + Map map = tousseDefinitionManager.searchComboGoods("", tousseType, true, false, handleDepartCoding); GoodBindHelper goodBindHelper = GoodBindHelper.getInstance(); List> reList = goodBindHelper.handleAddBindGood(bindGoodVos, map); PageUtil.outPutResult(null, reList); Index: ssts-web/src/main/webapp/disinfectsystem/goodsBindingConfig/goodsBindHandler.js =================================================================== diff -u -r20377 -r20386 --- ssts-web/src/main/webapp/disinfectsystem/goodsBindingConfig/goodsBindHandler.js (.../goodsBindHandler.js) (revision 20377) +++ ssts-web/src/main/webapp/disinfectsystem/goodsBindingConfig/goodsBindHandler.js (.../goodsBindHandler.js) (revision 20386) @@ -44,7 +44,8 @@ var me = this; me.bindGoodStore.load({ params: { - tousseType: "一次性物品", + handleDepartCoding: top.Ext4.getCmp("handleDepartCoding").getValue(), + tousseType: "一次性物品", findGood: JSON.stringify(data) }, callback: function (r, option, success) { @@ -120,17 +121,19 @@ /** * 处理需要捆绑的物品,先得到对应选择的物品的名字和数量,然后从后台查询出该物品的所有绑定物和对应的捆绑数量,然后添加到表格上 + * @param bindGoodVo */ -GoodsBindHandler.prototype.handleBindGood = function () { +GoodsBindHandler.prototype.handleBindGood = function (bindGoodVo) { var me = this; - var applicationCount = top.Ext4.getCmp('count1').getValue(); - var applicationName = top.Ext4.getCmp('package1').getValue(); - var bindGoodVo = { - goodName: applicationName, - bindCount: applicationCount, - goodId: curSelectedGoods.id, - goodType: curSelectedGoods.type + if (!bindGoodVo) { + bindGoodVo = { + goodName: top.Ext4.getCmp('package1').getValue(), + bindCount: top.Ext4.getCmp('count1').getValue(), + goodId: curSelectedGoods.id, + goodType: curSelectedGoods.type + }; } + Ext.Ajax.request({ url: WWWROOT + '/disinfectSystem/goodsBindingConfig/goodsBindingCtrl/handleBind.mhtml', params: bindGoodVo,