Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java =================================================================== diff -u -r27414 -r27437 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java (.../RecyclingApplicationAction.java) (revision 27414) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java (.../RecyclingApplicationAction.java) (revision 27437) @@ -14,7 +14,6 @@ import java.util.List; import java.util.Map; import java.util.Set; -import java.util.Map.Entry; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -45,7 +44,6 @@ import com.forgon.directory.model.OrgUnit; import com.forgon.directory.service.OrgUnitManager; import com.forgon.disinfectsystem.basedatamanager.supplyroomconfig.service.SupplyRoomConfigManager; -import com.forgon.disinfectsystem.basedatamanager.warehouse.service.WareHouseManager; import com.forgon.disinfectsystem.common.Constants; import com.forgon.disinfectsystem.common.CssdUtils; import com.forgon.disinfectsystem.departmentapplicationtemplate.service.DepartmentAppTemplateManager; @@ -57,7 +55,6 @@ import com.forgon.disinfectsystem.entity.basedatamanager.supplyroomconfig.SupplyRoomConfig; import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseDefinition; import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseInstance; -import com.forgon.disinfectsystem.entity.departmentstock.DepartmentStock; import com.forgon.disinfectsystem.entity.invoicemanager.Invoice; import com.forgon.disinfectsystem.entity.invoicemanager.InvoiceItem; import com.forgon.disinfectsystem.entity.invoicemanager.InvoicePlan; @@ -75,9 +72,6 @@ import com.forgon.disinfectsystem.recyclingapplication.service.RecyclingApplicationUtils; import com.forgon.disinfectsystem.recyclingapplication.updateLog.ApplicationLogManager; import com.forgon.disinfectsystem.recyclingapplication.vo.ReturnGoodVo; -import com.forgon.disinfectsystem.stockmanage.departmentstock.service.DepartmentStockManager; -import com.forgon.disinfectsystem.tousse.imagefilemanager.service.ImageFileManager; -import com.forgon.disinfectsystem.tousse.materialdefinition.service.MaterialDefinitionManager; import com.forgon.disinfectsystem.tousse.toussedefinition.service.TousseDefinitionHelper; import com.forgon.disinfectsystem.tousse.toussedefinition.service.TousseDefinitionManager; import com.forgon.disinfectsystem.tousse.toussedefinition.service.TousseInstanceManager; @@ -134,10 +128,6 @@ private DepartmentAppTemplateManager departmentAppTemplateManager; - private MaterialDefinitionManager materialDefinitionManager; - - private ImageFileManager imageFileManager; - private RecyclingApplicationManager recyclingApplicationManager; private SupplyRoomConfigManager supplyRoomConfigManager; @@ -153,28 +143,15 @@ private ApplicationLogManager applicationLogManager; private OrgUnitManager orgUnitManager; - - private WareHouseManager wareHouseManager; private LogManager appLogManager; private TousseInstanceManager tousseInstanceManager; - private DepartmentStockManager departmentStockManager; - - public void setDepartmentStockManager( - DepartmentStockManager departmentStockManager) { - this.departmentStockManager = departmentStockManager; - } - public void setTousseInstanceManager( TousseInstanceManager tousseInstanceManager) { this.tousseInstanceManager = tousseInstanceManager; } - - public void setWareHouseManager(WareHouseManager wareHouseManager) { - this.wareHouseManager = wareHouseManager; - } public void setOrgUnitManager(OrgUnitManager orgUnitManager) { this.orgUnitManager = orgUnitManager; @@ -196,15 +173,6 @@ this.objectDao = objectDao; } - public void setImageFileManager(ImageFileManager imageFileManager) { - this.imageFileManager = imageFileManager; - } - - public void setMaterialDefinitionManager( - MaterialDefinitionManager materialDefinitionManager) { - this.materialDefinitionManager = materialDefinitionManager; - } - public void setDepartmentAppTemplateManager( DepartmentAppTemplateManager departmentAppTemplateManager) { this.departmentAppTemplateManager = departmentAppTemplateManager;