Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/dwr/table/InvoicePlanTableManager.java =================================================================== diff -u -r12331 -r19097 --- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/dwr/table/InvoicePlanTableManager.java (.../InvoicePlanTableManager.java) (revision 12331) +++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/dwr/table/InvoicePlanTableManager.java (.../InvoicePlanTableManager.java) (revision 19097) @@ -112,7 +112,7 @@ "foreignProxyItems", "recyclingRecord" }); config.setJsonPropertyFilter(propertyFilter); json = JSONObject.fromObject( - invoicePlanManager.getInvoicePlanById(id), config) + invoicePlanManager.get(id), config) .toString(); } catch (Exception e) { e.printStackTrace(); Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java =================================================================== diff -u -r19096 -r19097 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java (.../RecyclingApplicationAction.java) (revision 19096) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java (.../RecyclingApplicationAction.java) (revision 19097) @@ -1658,7 +1658,7 @@ public void loadTousseItems(){ String invoicePlanId = StrutsParamUtils.getPraramValue("invoicePlanId", null); - InvoicePlan invoicePlan = invoicePlanManager.getInvoicePlanById(invoicePlanId); + InvoicePlan invoicePlan = invoicePlanManager.get(invoicePlanId); HttpServletResponse response = StrutsParamUtils.getResponse(); response.setCharacterEncoding("UTF-8"); JSONObject result = new JSONObject(); Index: ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java =================================================================== diff -u -r19069 -r19097 --- ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java (.../ServiceManagerImpl.java) (revision 19069) +++ ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java (.../ServiceManagerImpl.java) (revision 19097) @@ -624,7 +624,7 @@ JSONArray array = params.optJSONArray("tousseItems"); if(array != null){ String invoiceplanId = params.optString("app_id"); - InvoicePlan plan = invoicePlanManager.getInvoicePlanById(invoiceplanId); + InvoicePlan plan = invoicePlanManager.get(invoiceplanId); for (int i = 0; i < array.size(); i++) { JSONObject obj = array.getJSONObject(i); String id = obj.optString("id"); @@ -723,7 +723,7 @@ if(params != null){ String id = params.optString("id"); if(StringUtils.isNotBlank(id)){ - InvoicePlan p = invoicePlanManager.getInvoicePlanById(id); + InvoicePlan p = invoicePlanManager.get(id); if(p != null){ for (TousseItem item : p.getApplicationItems()) { String tousseType = item.getTousseType(); @@ -1118,7 +1118,7 @@ .getWaitDeliverGoods(invoicePlanId, params.optString("applyDate",""), params.optString("tousseType","")); if(goods.size() == 0){ - InvoicePlan invoiceplan = invoicePlanManager.getInvoicePlanById("" + invoicePlanId); + InvoicePlan invoiceplan = invoicePlanManager.get(invoicePlanId); return JSONUtil.buildErrorMsgJsonResult("该单状态"+invoiceplan.getDeliverStatus()+"，无待发货物品"); } // 去除消毒物品显示名称前用中文括号包围的科室名称 Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java =================================================================== diff -u -r19096 -r19097 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java (.../InvoicePlanManagerImpl.java) (revision 19096) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java (.../InvoicePlanManagerImpl.java) (revision 19097) @@ -197,14 +197,6 @@ } @Override - public InvoicePlan getInvoicePlanById(String id) { - if(StringUtils.isNotBlank(id)){ - return (InvoicePlan) objectDao.getByProperty( - InvoicePlan.class.getSimpleName(), "id", Long.valueOf(id)); - } - return null; - } - @Override public InvoicePlan getInvoicePlanBySerialNumber(String serialNumber){ if(StringUtils.isNotBlank(serialNumber)){ return (InvoicePlan) objectDao.getByProperty( @@ -491,7 +483,7 @@ List itemVOs = new ArrayList(); if (StringUtils.isBlank(id)) return itemVOs; - InvoicePlan re = getInvoicePlanById(id); + InvoicePlan re = get(id); if (re != null) { getApplicationItemVOListByInvoicePlan(re, itemVOs); } @@ -1202,8 +1194,7 @@ List splitTousselist = tousseInstanceManager .getToussInstanceByForeignTousseApplicationID(foreignAppId); if (splitTousselist != null) { - InvoicePlan foreignTousseApp = getInvoicePlanById("" - + foreignAppId); + InvoicePlan foreignTousseApp = get(foreignAppId); // 全部发货 boolean allSendOut = true; for (TousseInstance tousseInstance : splitTousselist) { Index: ssts-web/src/test/java/test/forgon/disinfectsystem/packing/InvoicePlanManagerTests.java =================================================================== diff -u -r17149 -r19097 --- ssts-web/src/test/java/test/forgon/disinfectsystem/packing/InvoicePlanManagerTests.java (.../InvoicePlanManagerTests.java) (revision 17149) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/packing/InvoicePlanManagerTests.java (.../InvoicePlanManagerTests.java) (revision 19097) @@ -1,20 +1,23 @@ package test.forgon.disinfectsystem.packing; -import static org.testng.Assert.*; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertFalse; +import static org.testng.Assert.assertNotNull; +import static org.testng.Assert.assertTrue; import java.util.ArrayList; import java.util.Date; import java.util.List; +import net.sf.json.JSONObject; + import org.springframework.beans.factory.annotation.Autowired; import org.testng.annotations.Test; -import net.sf.json.JSONObject; import test.forgon.constant.Constants; import test.forgon.disinfectsystem.AbstractCSSDTest; import com.forgon.disinfectsystem.basedatamanager.container.service.ContainerManager; import com.forgon.disinfectsystem.basedatamanager.goodsstock.service.GoodsStockManager; -import com.forgon.disinfectsystem.basedatamanager.toussedefinition.service.TousseInstanceUtils; import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseDefinition; import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseInstance; import com.forgon.disinfectsystem.entity.basedatamanager.warehouse.WareHouse; @@ -87,7 +90,7 @@ objectDao.saveOrUpdate(tousseItem); objectDao.saveOrUpdate(invoicePlan); - InvoicePlan dbip = invoicePlanManager.getInvoicePlanById(invoicePlan.getId() + ""); + InvoicePlan dbip = invoicePlanManager.get(invoicePlan.getId()); assertNotNull(dbip); assertNotNull(dbip.getApplicationItems()); assertTrue(dbip.getApplicationItems().size() > 0); Index: ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/ChangeBasketForRecyclingTests.java =================================================================== diff -u -r18645 -r19097 --- ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/ChangeBasketForRecyclingTests.java (.../ChangeBasketForRecyclingTests.java) (revision 18645) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/ChangeBasketForRecyclingTests.java (.../ChangeBasketForRecyclingTests.java) (revision 19097) @@ -84,7 +84,7 @@ InvoicePlan invoicePlan = record.getRecyclingApplication(); assertNotNull(invoicePlan); - InvoicePlan plan = invoicePlanManager.getInvoicePlanById("" + invoicePlan.getId()); + InvoicePlan plan = invoicePlanManager.get(invoicePlan.getId()); List items = plan.getApplicationItems(); assertNotNull(items); @@ -127,7 +127,7 @@ objectDao.clearCache(); - InvoicePlan plan2 = invoicePlanManager.getInvoicePlanById("" + invoicePlan.getId()); + InvoicePlan plan2 = invoicePlanManager.get(invoicePlan.getId()); List items2 = plan2.getApplicationItems(); assertNotNull(items2); @@ -190,7 +190,7 @@ InvoicePlan invoicePlan = record.getRecyclingApplication(); assertNotNull(invoicePlan); - InvoicePlan plan = invoicePlanManager.getInvoicePlanById("" + invoicePlan.getId()); + InvoicePlan plan = invoicePlanManager.get(invoicePlan.getId()); List items = plan.getApplicationItems(); assertNotNull(items); @@ -252,7 +252,7 @@ objectDao.clearCache(); - InvoicePlan plan2 = invoicePlanManager.getInvoicePlanById("" + invoicePlan.getId()); + InvoicePlan plan2 = invoicePlanManager.get(invoicePlan.getId()); List items2 = plan2.getApplicationItems(); assertNotNull(items2); Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManager.java =================================================================== diff -u -r19096 -r19097 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManager.java (.../InvoicePlanManager.java) (revision 19096) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManager.java (.../InvoicePlanManager.java) (revision 19097) @@ -26,8 +26,6 @@ * @date 2012-04-25 发货计划单接口 */ public interface InvoicePlanManager extends BasePoManager { - - public InvoicePlan getInvoicePlanById(String id); public InvoicePlan getInvoicePlanBySerialNumber(String serialNumber); @Override Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java =================================================================== diff -u -r19034 -r19097 --- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java (.../RecyclingRecordAction.java) (revision 19034) +++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java (.../RecyclingRecordAction.java) (revision 19097) @@ -511,7 +511,7 @@ JSONObject params = JSONObject.fromObject(paramsStr); String app_id = params.optString("app_id"); InvoicePlan applicaiton = invoicePlanManager - .getInvoicePlanById(app_id); + .get(app_id); if (applicaiton != null) { RecyclingRecord recyclingRecord = applicaiton .getRecyclingRecord(objectDao); @@ -598,7 +598,7 @@ InvoicePlan application = recyclingRecord.getRecyclingApplication(); if (application == null) { String app_id = request.getParameter("recyclingApplicationId"); - application = invoicePlanManager.getInvoicePlanById(app_id); + application = invoicePlanManager.get(app_id); recyclingRecord.setRecyclingApplication(application); } String recyclingUserDefault = StrutsParamUtils.getPraramValue("recyclingUserDefault", ""); Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/InvoicePlanAction.java =================================================================== diff -u -r18500 -r19097 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/InvoicePlanAction.java (.../InvoicePlanAction.java) (revision 18500) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/InvoicePlanAction.java (.../InvoicePlanAction.java) (revision 19097) @@ -510,7 +510,7 @@ public void iniInfo() { String id = StrutsParamUtils.getPraramValue("recyclingAppId", ""); if (StringUtils.isNotBlank(id) && DatabaseUtil.isPoIdValid(id)) { - invoicePlan = invoicePlanManager.getInvoicePlanById(id); + invoicePlan = invoicePlanManager.get(id); } invoice = new Invoice(); }