Index: ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/dwr/table/GodownEntryTableManager.java =================================================================== diff -u -r13710 -r14133 --- ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/dwr/table/GodownEntryTableManager.java (.../GodownEntryTableManager.java) (revision 13710) +++ ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/dwr/table/GodownEntryTableManager.java (.../GodownEntryTableManager.java) (revision 14133) @@ -372,7 +372,7 @@ /** * 根据一次性物品id查找最近一张该一次性物品入库单信息 - * 用于添加一次性物品入库单页面选择物品时,根据查询到的信息给页面的产地、供应商、生产厂家、灭菌批号、注册证号等进行自动赋值 + * 用于添加一次性物品入库单页面选择物品时,根据查询到的信息给页面的产地、供应商、生产厂家、灭菌批号、注册证号、类别等进行自动赋值 * @param diposableGoodsId * @return */ @@ -394,6 +394,7 @@ jsonObject.put("manufacturer", ""); jsonObject.put("sterileBatchNumber", ""); jsonObject.put("grade", ""); + jsonObject.put("cost", ""); if (godownEntryItem != null) { //注册证号 if(StringUtils.isNotBlank(godownEntryItem.getCertification())){ @@ -419,6 +420,10 @@ if(StringUtils.isBlank(jsonObject.optString("grade")) && StringUtils.isNotBlank(godownEntryItem.getGrade())){ jsonObject.put("grade", godownEntryItem.getGrade()); } + //单价 + if(StringUtils.isBlank(jsonObject.optString("cost")) && godownEntryItem.getCost() != null){ + jsonObject.put("cost", godownEntryItem.getCost()); + } } return jsonObject.toString(); } Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownEntryView.js =================================================================== diff -u -r13509 -r14133 --- ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownEntryView.js (.../godownEntryView.js) (revision 13509) +++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownEntryView.js (.../godownEntryView.js) (revision 14133) @@ -732,7 +732,7 @@ top.Ext.getCmp('name1').selectText(); top.Ext.getCmp('disposableGoodsID').setValue(record.data.id); top.Ext.getCmp('cost1').setValue(record.data.referencePrice); - //根据一次性物品id加载最近一次入库的一次性物品的供应商、注册证号、生产厂家、灭菌批次、产地等 + //根据一次性物品id加载最近一次入库的一次性物品的供应商、注册证号、生产厂家、灭菌批次、产地、类别、单价等 GodownEntryTableManager.getLastDiposableGoodsFromGodownEntry(record.data.id,function(result){ if(result && result != ""){ var lastGodownEntryItem = Ext.decode(result); @@ -742,6 +742,7 @@ top.Ext.getCmp('sterileBatchNumber').setValue(lastGodownEntryItem.sterileBatchNumber); top.Ext.getCmp('producingArea').setValue(lastGodownEntryItem.producingArea); top.Ext.getCmp('grade').setValue(lastGodownEntryItem.grade); + top.Ext.getCmp('cost1').setValue(lastGodownEntryItem.cost); } }); batchNumStore.baseParams.disposableGoodsID = record.data.id;