Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java =================================================================== diff -u -r26240 -r26509 --- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java (.../TousseDefinitionAction.java) (revision 26240) +++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java (.../TousseDefinitionAction.java) (revision 26509) @@ -1963,11 +1963,16 @@ String goodType = StrutsParamUtils.getPraramValue("goodType", ""); Long goodId = StrutsParamUtils.getPraramLongValue("goodId", null); int bindCount = StrutsParamUtils.getPraramValue("bindCount", 0); - + int urgentAmount = StrutsParamUtils.getPraramValue("urgentAmount", 0); + String urgentLevel = StrutsParamUtils.getPraramValue("urgentLevel", ""); + int urgentLevelId = StrutsParamUtils.getPraramValue("urgentLevelId", 0); bindGoodVo.setGoodId(goodId); bindGoodVo.setGoodType(goodType); bindGoodVo.setGoodName(goodName); bindGoodVo.setBindCount(bindCount); + bindGoodVo.setUrgentAmount(urgentAmount); + bindGoodVo.setUrgentLevel(urgentLevel); + bindGoodVo.setUrgentLevelId(urgentLevelId); return bindGoodVo; } Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java =================================================================== diff -u -r26474 -r26509 --- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java (.../TousseDefinitionManagerImpl.java) (revision 26474) +++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java (.../TousseDefinitionManagerImpl.java) (revision 26509) @@ -3515,7 +3515,7 @@ if (count == null || count <= 0) { throw new ParameterException("请输入大于0的数量!"); } - + Integer urgentAmount = bindGoodVo.getUrgentAmount(); List goods = this.findAllBindingByCondition(bindGoodVo, type); if (CollectionUtils.isNotEmpty(goods)) { //迭代查找出来的list,并计算应该绑定的数量 @@ -3524,21 +3524,30 @@ continue; } Integer bindCount = 0; + Integer bindUrgengAmount = 0; + Map jsonObject = new HashMap(); if (GoodType.MAIN.equals(type)) { //除不尽向下取整 Double rate = Math.floor(count / good.getMainCount()); bindCount = rate.intValue() * good.getSecondaryCount(); + if(urgentAmount != null && urgentAmount > 0){ + Double rateOfUrgent = Math.floor(urgentAmount / good.getMainCount()); + bindUrgengAmount = rateOfUrgent.intValue() * good.getSecondaryCount(); + } } else if (GoodType.SECOND.equals(type)) { //除不尽向下取整 Double rate = Math.floor(count / good.getSecondaryCount()); bindCount = rate.intValue() * good.getMainCount(); + if(urgentAmount != null && urgentAmount > 0){ + Double rateOfUrgent = Math.floor(urgentAmount / good.getSecondaryCount()); + bindUrgengAmount = rateOfUrgent.intValue() * good.getMainCount(); + } } if (bindCount == 0) { continue; } - Map jsonObject = new HashMap(); Long id = GoodType.MAIN.equals(type) ? good.getSecondaryGoodId() : good.getMainGoodId(); if (StringTools.isBlank(good.getMainGoodType())) { throw new RuntimeException("数据异常!"); @@ -3555,6 +3564,14 @@ jsonObject = buildTousseDefinitionInfo(get(id)); } jsonObject.put("count", bindCount); + if(bindUrgengAmount == 0){ + jsonObject.put("urgentLevel", null); + jsonObject.put("urgentLevelId", null); + }else{ + jsonObject.put("urgentLevel", bindGoodVo.getUrgentLevel()); + jsonObject.put("urgentLevelId", bindGoodVo.getUrgentLevelId()); + } + jsonObject.put("urgentAmount", bindUrgengAmount); jsonArray.add(jsonObject); } } Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/goodsBindingConfig/vo/BindGoodVo.java =================================================================== diff -u -r22359 -r26509 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/goodsBindingConfig/vo/BindGoodVo.java (.../BindGoodVo.java) (revision 22359) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/goodsBindingConfig/vo/BindGoodVo.java (.../BindGoodVo.java) (revision 26509) @@ -27,7 +27,19 @@ * 绑定物品的类型 */ private String goodType; - + /** + * 加急数量 + */ + private Integer urgentAmount; + /** + * 加急等级 + */ + private String urgentLevel; + /** + * 加急id + */ + private Integer urgentLevelId; + public String getGoodName() { return goodName; } @@ -59,7 +71,32 @@ public void setGoodType(String goodType) { this.goodType = goodType; } - /** + + public Integer getUrgentAmount() { + return urgentAmount; + } + + public void setUrgentAmount(Integer urgentAmount) { + this.urgentAmount = urgentAmount; + } + + public String getUrgentLevel() { + return urgentLevel; + } + + public void setUrgentLevel(String urgentLevel) { + this.urgentLevel = urgentLevel; + } + + public Integer getUrgentLevelId() { + return urgentLevelId; + } + + public void setUrgentLevelId(Integer urgentLevelId) { + this.urgentLevelId = urgentLevelId; + } + + /** * 是否消毒物品 */ public boolean goodsTypeDisinfect(){