Index: ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryManagerImpl.java =================================================================== diff -u -r20351 -r20356 --- ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryManagerImpl.java (.../GodownEntryManagerImpl.java) (revision 20351) +++ ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryManagerImpl.java (.../GodownEntryManagerImpl.java) (revision 20356) @@ -2720,7 +2720,7 @@ if(batchID == null){ throw new RuntimeException(String.format("batchId为空!", batchID)); } - DisposableGoodsBatch disposableGoodsBatch = (DisposableGoodsBatch)objectDao.getBySql(GodownEntryItem.class.getSimpleName(), " where id=" + batchID); + DisposableGoodsBatch disposableGoodsBatch = (DisposableGoodsBatch)objectDao.getBySql(DisposableGoodsBatch.class.getSimpleName(), " where id=" + batchID); if(disposableGoodsBatch == null){ throw new RuntimeException(String.format("batchId为%s的批次对象已不存在!", batchID)); } Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownEntryView.js =================================================================== diff -u -r20273 -r20356 --- ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownEntryView.js (.../godownEntryView.js) (revision 20273) +++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownEntryView.js (.../godownEntryView.js) (revision 20356) @@ -614,6 +614,7 @@ {name : 'disposableGoodsID'}, {name : 'name'}, {name : 'amount'}, + {name : 'disposableGoodsBatchID'}, {name : 'batchNumber'}, {name : 'cost'}, {name : 'expDate'}, @@ -1266,14 +1267,14 @@ handler : function() { var store = top.Ext.getCmp('godownEntryItemGrid').getStore(); var modifyRecords = store.getModifiedRecords(); - var len = modifyRecords.getCount(); + var len = modifyRecords.length; var items = []; for (var i = 0; i < len; i++) { var record = modifyRecords[i]; items.push({ id : record.data.id,//入库明细id disposableGoodsID : record.data.disposableGoodsID,//一次性物品定义id - batchID : record.data.batchID,//批次id + batchID : record.data.disposableGoodsBatchID,//批次id batchNumber : record.data.batchNumber,//批次号 expDate : record.data.expDate.format('Y-m-d'),//失效期 supplierName : record.data.supplierName,//供应商 @@ -1876,7 +1877,7 @@ commonEntry.setCurrentUserName(curUserName); var columns = [ {header : "单号",width : 200,dataIndex : 'serialNumber', renderer : function(v,p,record){ - if(record.get('dataStatus') == 0 && record.get('subType') == '同步入库'){ + if(record.get('dataStatus') === 0 && record.get('subType') == '同步入库'){ return modifyRecord(v,p,record) + "【有物品异常】"; } return modifyRecord(v,p,record);