Index: ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/action/DiposableGoodsAction.java =================================================================== diff -u -r13519 -r13531 --- ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/action/DiposableGoodsAction.java (.../DiposableGoodsAction.java) (revision 13519) +++ ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/action/DiposableGoodsAction.java (.../DiposableGoodsAction.java) (revision 13531) @@ -268,12 +268,14 @@ if(disposableGoodsList != null){ for (DisposableGoods disposableGoods : disposableGoodsList) { if(disposableGoods.expensiveDiposablegoods()){// 高值耗材的打印 - List expensiveDisposablegoodsList = diposableGoodsManager.getExpensivediposablegoodsByDisposableGoodsId(disposableGoods.getId()); - if(expensiveDisposablegoodsList == null){ + continue; + }else{ + List disposableGoodsBatchStockList = diposableGoodBatchStockManager + .getDisposableGoodsBatchStockByDisposableGoodsId(disposableGoods.getId().toString(), false); + if (disposableGoodsBatchStockList == null) { continue; } - for (ExpensiveDisposablegoods expensiveDisposablegoods : expensiveDisposablegoodsList) { - DisposableGoodsBatchStock disposableGoodsBatchStock = expensiveDisposablegoods.getDisposableGoodsBatchStock(); + for (DisposableGoodsBatchStock disposableGoodsBatchStock : disposableGoodsBatchStockList) { if (sb.length() > 0) { sb.append(";"); } @@ -283,23 +285,50 @@ } String specification = ""; - if (disposableGoods.getSpecification() != null) { - specification = disposableGoods.getSpecification().trim(); + if (disposableGoodsBatchStock.getDiposableGoods().getSpecification() != null) { + specification = disposableGoodsBatchStock.getDiposableGoods() + .getSpecification().trim(); } - sb.append(disposableGoods.getName() - + "#&" + expensiveDisposablegoods.getBarcode() + "#&" + sb.append(disposableGoodsBatchStock.getDiposableGoods().getName() + + "#&" + disposableGoodsBatchStock.getBarcode() + "#&" + expDate + "#&" + disposableGoodsBatchStock.getSupplierName() + "#&" + disposableGoodsBatchStock.getBatchNumber() + "#&" + specification); } - }else{ - List disposableGoodsBatchStockList = diposableGoodBatchStockManager - .getDisposableGoodsBatchStockByDisposableGoodsId(disposableGoods.getId().toString(), false); - if (disposableGoodsBatchStockList == null) { + } + + } + } + } + + HttpServletResponse response = StrutsParamUtils.getResponse(); + response.setCharacterEncoding("UTF-8"); + + try { + PrintWriter out = response.getWriter(); + out.print("{success:true,value:'" + sb.toString() + "'}"); + } catch (IOException e) { + e.printStackTrace(); + } + } + + public void printExpensiveDisposableGoodsByIds() { + String idStr = StrutsParamUtils.getPraramValue("diposableIds", ""); + StringBuffer sb = new StringBuffer(); + if (StringUtils.isNotBlank(idStr)) { + String sql = String.format(" where po.id in(%s)", idStr); + List disposableGoodsList = diposableGoodsManager.getDisposableGoodsBySql(sql); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + if(disposableGoodsList != null){ + for (DisposableGoods disposableGoods : disposableGoodsList) { + if(disposableGoods.expensiveDiposablegoods()){// 高值耗材的打印 + List expensiveDisposablegoodsList = diposableGoodsManager.getExpensivediposablegoodsByDisposableGoodsId(disposableGoods.getId()); + if(expensiveDisposablegoodsList == null){ continue; } - for (DisposableGoodsBatchStock disposableGoodsBatchStock : disposableGoodsBatchStockList) { + for (ExpensiveDisposablegoods expensiveDisposablegoods : expensiveDisposablegoodsList) { + DisposableGoodsBatchStock disposableGoodsBatchStock = expensiveDisposablegoods.getDisposableGoodsBatchStock(); if (sb.length() > 0) { sb.append(";"); } @@ -309,19 +338,17 @@ } String specification = ""; - if (disposableGoodsBatchStock.getDiposableGoods().getSpecification() != null) { - specification = disposableGoodsBatchStock.getDiposableGoods() - .getSpecification().trim(); + if (disposableGoods.getSpecification() != null) { + specification = disposableGoods.getSpecification().trim(); } - sb.append(disposableGoodsBatchStock.getDiposableGoods().getName() - + "#&" + disposableGoodsBatchStock.getBarcode() + "#&" + sb.append(disposableGoods.getName() + + "#&" + expensiveDisposablegoods.getBarcode() + "#&" + expDate + "#&" + disposableGoodsBatchStock.getSupplierName() + "#&" + disposableGoodsBatchStock.getBatchNumber() + "#&" + specification); } } - } } } Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/diposableGoods/diposableGoodsView.js =================================================================== diff -u -r13519 -r13531 --- ssts-web/src/main/webapp/disinfectsystem/assestManagement/diposableGoods/diposableGoodsView.js (.../diposableGoodsView.js) (revision 13519) +++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/diposableGoods/diposableGoodsView.js (.../diposableGoodsView.js) (revision 13531) @@ -731,6 +731,35 @@ }); } } +function printExpensiveDisposableGoodsBarcode(grid){ + var records = grid.getSelectionModel().getSelections(); + if(records.length == 0){ + showResult("请选择要打印的物品"); + }else{ + var ids = ""; + for(var i = 0,len=records.length;i