Index: ssts-web/src/main/webapp/disinfectsystem/config/ggsrmyy/config.js =================================================================== diff -u -r27538 -r27660 --- ssts-web/src/main/webapp/disinfectsystem/config/ggsrmyy/config.js (.../config.js) (revision 27538) +++ ssts-web/src/main/webapp/disinfectsystem/config/ggsrmyy/config.js (.../config.js) (revision 27660) @@ -252,5 +252,7 @@ //未配置或值为1时,为悬浮提示,会自动消失(即为现有的提示方式);配置为2时,提示方式为弹框提示,需要手工确认 alertModeOfDiffSterileMethod:2, //禁用基数限制 - disableCardinalNumLimit:true + disableCardinalNumLimit:true, + //一次性物品入库时不修改一次性物品定义参考价 + doNotModifyTheReferencePriceOfDisposableDefinition:true } \ No newline at end of file Index: ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryManagerImpl.java =================================================================== diff -u -r26490 -r27660 --- ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryManagerImpl.java (.../GodownEntryManagerImpl.java) (revision 26490) +++ ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryManagerImpl.java (.../GodownEntryManagerImpl.java) (revision 27660) @@ -64,6 +64,7 @@ import com.forgon.tools.db.DatabaseUtil; import com.forgon.tools.hibernate.ObjectDao; import com.forgon.tools.json.JSONUtil; +import com.forgon.tools.util.ConfigUtils; import com.forgon.tools.util.ForgonDateUtils; import com.forgon.tools.util.SqlUtils; @@ -702,7 +703,12 @@ } } // 更新一次性物品定义 - disposableGoods.setReferencePrice(godownEntryItem.getCost()); + // 配置项为false或者未配置项时,一次性物品入库时修改一次性物品定义中的参考价; + // 配置项为true时,一次性物品入库时不要联动修改一次性物品定义的参考价(GGSRMYY-122) + Boolean doNotModifyReferencePriceOfDisposableDef = ConfigUtils.getSystemSetConfigByNameBool("doNotModifyTheReferencePriceOfDisposableDefinition", false); + if(!doNotModifyReferencePriceOfDisposableDef){ + disposableGoods.setReferencePrice(godownEntryItem.getCost()); + } // 更新批次定义 disposableGoodsBatch.setCost(godownEntryItem.getCost()); disposableGoodsBatch.setProduceDate(godownEntryItem.getProduceDate()); Index: ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java =================================================================== diff -u -r26859 -r27660 --- ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java (.../DiposableGoodsManagerImpl.java) (revision 26859) +++ ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java (.../DiposableGoodsManagerImpl.java) (revision 27660) @@ -1057,7 +1057,9 @@ temp.put("originalPrice", price); price = MathTools.mul(price, floatPercent).doubleValue(); temp.put("price", price); - displayName = getDisposableGoodsDisplayName(disposableGoods,temp,price); + // 科室申领页面中一次性物品的参考价取值:一次性物品定义中的参考价*一次性物品价格浮动系数(GGSRMYY-122) + Double referencePrice = MathTools.mul(disposableGoods.getReferencePrice(), floatPercent).doubleValue(); + displayName = getDisposableGoodsDisplayName(disposableGoods,temp,referencePrice); temp.put("displayName", displayName); }else{ displayName = getDisposableGoodsDisplayName(disposableGoods,temp);