Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/returngoodsrecord/ReturnGoodsRecord.java =================================================================== diff -u -r12891 -r12915 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/returngoodsrecord/ReturnGoodsRecord.java (.../ReturnGoodsRecord.java) (revision 12891) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/returngoodsrecord/ReturnGoodsRecord.java (.../ReturnGoodsRecord.java) (revision 12915) @@ -53,6 +53,9 @@ private String type;//器械包或一次性物品 + + private String handleDepartCode;//退回科室编码（一二级供应室编码） + /** * 仓库ID */ @@ -260,5 +263,13 @@ public void setSrcWarehouseName(String srcWarehouseName) { this.srcWarehouseName = srcWarehouseName; } - + + public String getHandleDepartCode() { + return handleDepartCode; + } + + public void setHandleDepartCode(String handleDepartCode) { + this.handleDepartCode = handleDepartCode; + } + } Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/recyclingerror/RecyclingError.java =================================================================== diff -u -r12331 -r12915 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/recyclingerror/RecyclingError.java (.../RecyclingError.java) (revision 12331) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/recyclingerror/RecyclingError.java (.../RecyclingError.java) (revision 12915) @@ -55,9 +55,11 @@ private Double materialCost;// 材料的成本价 - private String depart; // 丢失材料的回收科室 + private String depart; // 丢失材料的科室 private String departCode; + + private String handleDepartCode;//处理科室（一级供应室或二级供应室） private Date missTime; @@ -218,4 +220,13 @@ } return false; } + + public String getHandleDepartCode() { + return handleDepartCode; + } + + public void setHandleDepartCode(String handleDepartCode) { + this.handleDepartCode = handleDepartCode; + } + } Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java =================================================================== diff -u -r12897 -r12915 --- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java (.../RecyclingRecordManagerImpl.java) (revision 12897) +++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java (.../RecyclingRecordManagerImpl.java) (revision 12915) @@ -407,6 +407,7 @@ error.setAmount(amount); error.setType(RecyclingError.TYPE_RECYCLINGRECORD); error.setMaterialName(values[2]); + error.setHandleDepartCode(recyclingRecord.getOrgUnitCoding()); String realName = values[2]; String specification = null; int index = values[2].indexOf("["); Index: ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/action/ReturnGoodsRecordAction.java =================================================================== diff -u -r12861 -r12915 --- ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/action/ReturnGoodsRecordAction.java (.../ReturnGoodsRecordAction.java) (revision 12861) +++ ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/action/ReturnGoodsRecordAction.java (.../ReturnGoodsRecordAction.java) (revision 12915) @@ -25,6 +25,7 @@ import org.apache.struts2.convention.annotation.ParentPackage; import com.forgon.component.grid.GridManager; +import com.forgon.directory.acegi.tools.AcegiHelper; import com.forgon.disinfectsystem.basedatamanager.supplyroomconfig.service.SupplyRoomConfigManager; import com.forgon.disinfectsystem.diposablegoods.service.DiposableGoodBatchStockManager; import com.forgon.disinfectsystem.diposablegoods.service.DiposableGoodsManager; @@ -137,7 +138,8 @@ if (returnTime == null) returnTime = new Date(); returnGoodsRecord.setReturnTime(returnTime); - + String handleDepartCode = AcegiHelper.getLoginUser().getOrgUnitCodingFromSupplyRoomConfig(); + returnGoodsRecord.setHandleDepartCode(handleDepartCode); returnGoodsRecord.setType("一次性物品"); List returnGoodsItems = new ArrayList(); @@ -567,6 +569,7 @@ returnTime = new Date(); returnGoodsRecord.setReturnTime(returnTime); returnGoodsRecord.setType("器械包"); + returnGoodsRecord.setHandleDepartCode(AcegiHelper.getLoginUser().getOrgUnitCodingFromSupplyRoomConfig()); List newReturnTousseItems = new ArrayList(); returnGoodsRecord.setReturnGoodsItems(newReturnTousseItems); Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java =================================================================== diff -u -r12876 -r12915 --- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java (.../RecyclingRecordAction.java) (revision 12876) +++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java (.../RecyclingRecordAction.java) (revision 12915) @@ -1139,7 +1139,7 @@ String[] ids = StringTools.split(idArray, ","); where1 = SqlBuilder.build_IN_Statement(fieldName, SqlBuilder.IN, ids); String sql = "select " + fieldName + ",tousseName,amount,tousseType from tousseItem "; - sql += " where " + where1 + "order by id"; + sql += " where " + where1 + " and (diposable is null or diposable = '否') order by id"; ResultSet rs = objectDao.executeSql(sql); try{ MultiValueMap mvm = new MultiValueMap(); Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java =================================================================== diff -u -r12911 -r12915 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 12911) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 12915) @@ -3629,6 +3629,7 @@ @Override public List getMonthReportData(String startDate,String endDate,String department){ + String handleDeptCode = AcegiHelper.getLoginUser().getOrgUnitCodingFromSupplyRoomConfig(); List list = new ArrayList(); String invoiceWheresql = "" ; startDate += " 00:00:00"; @@ -3647,7 +3648,7 @@ String invoicePriceSql = "select p.settleAccountsDepartCoding as coding,min(i.settleAccountsDepart) " + "as depart,sum(ii.settlementPrice) as price,ii.diposable from Invoice i," + "invoiceplan p,InvoiceItem ii where i.invoiceplan_id = p.id and i.id = " - + "ii.invoice_id and p.type != '二级供应室申请单' and (i.status ='收货签收' or " + + "ii.invoice_id and i.orgUnitCoding = '"+handleDeptCode+"' and (i.status ='收货签收' or " + "i.status = '已发货') " + invoiceWheresql + " group by p.settleAccountsDepartCoding,ii.diposable"; ResultSet rs = objectDao.executeSql(invoicePriceSql); try { @@ -3672,7 +3673,7 @@ String invoiceAmountSql = "select p.settleAccountsDepartCoding as coding,i.settleAccountsDepart " + "as depart,i.tousseAmount,i.diposableGoodsAmount from Invoice i,invoiceplan p " - + "where i.invoiceplan_id = p.id and p.type != '二级供应室申请单' " + + "where i.invoiceplan_id = p.id and i.orgUnitCoding = '"+handleDeptCode+"' " + "and (i.status ='收货签收' or i.status = '已发货') " + invoiceWheresql; ResultSet rs2 = objectDao.executeSql(invoiceAmountSql); @@ -3697,7 +3698,7 @@ String recyclingErrorSql = "select r.departCode,r.depart,r.materialName,sum(r.materialCost*r.amount),sum(r.amount) " + " from RecyclingError r where r.packingTask_ID is null and r.errorType = '缺失' " - + " and r.missTime " + betweenSql; + + " and r.handleDepartCode = '"+handleDeptCode+"' and r.missTime " + betweenSql; if(StringUtils.isNotBlank(department)){ recyclingErrorSql += " and r.depart = '"+department+"' "; @@ -3725,7 +3726,7 @@ String damageSql = "select r.departCoding,r.depart,i.materialName,sum(i.materialCost*i.additionalAmount),sum(i.additionalAmount) " + " from RecyclingDamageRecord r,RecyclingDamageItem i where r.id = i.RecyclingDamageRecord_ID " - + " and r.status != '未补充' and i.additionalTime is not null and i.additionalTime " + + " and r.additionalDeptCode = '"+handleDeptCode+"' and r.status != '未补充' and i.additionalTime is not null and i.additionalTime " + betweenSql; if(StringUtils.isNotBlank(department)){ @@ -3754,7 +3755,7 @@ String receiveSql = "select i.type,(i.amount*i.price),i.amount,r.departcoding " + "from ReceiveRecord r,ReceiveRecordItem i where r.id = i.receiverecord_id " - + "and r.time " + betweenSql; + + "and r.departCoding = '"+handleDeptCode+"' and r.time " + betweenSql; SupplyRoomConfig config = supplyRoomConfigManager.getFirstSupplyRoomConfig(); ResultSet rs4 = objectDao.executeSql(receiveSql); @@ -3780,7 +3781,7 @@ String returnSql = "select r.type,(-i.settlementPrice),-i.amount,r.departcoding,r.depart " + "from ReturnGoodsRecord r,ReturnGoodsItem i where r.id = i.returnGoodsRecord_ID" - + " and r.returnTime " + betweenSql; + + " and r.handleDepartCode = '"+handleDeptCode+"' and r.returnTime " + betweenSql; if(StringUtils.isNotBlank(department)){ returnSql += " and r.depart = '" + department + "'"; }