Index: ssts-web/src/test/java/test/forgon/disinfectsystem/packing/service/PackingManagerTests.java =================================================================== diff -u -r12339 -r12340 --- ssts-web/src/test/java/test/forgon/disinfectsystem/packing/service/PackingManagerTests.java (.../PackingManagerTests.java) (revision 12339) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/packing/service/PackingManagerTests.java (.../PackingManagerTests.java) (revision 12340) @@ -147,9 +147,9 @@ tousseItemMap.put(tousseItem.getTousseName(), tousseItem); } - - ListtousseInstanceList = - objectDao.findByProperty("TousseInstance", "tousseName", "呼吸机_" + application.getId()); + String sql = String.format(" where po.tousseName='呼吸机' and po.invoicePlanID=%s", application.getId()); + List tousseInstanceList = + objectDao.findBySql("TousseInstance", sql); assertEquals(0, tousseInstanceList.size()); PackingTask packingTask = @@ -214,8 +214,9 @@ List tousseItems2 = application2.getApplicationItems(); assertEquals(1,tousseItems2.size()); + sql = String.format(" where po.tousseName='呼吸机' and po.invoicePlanID=%s", application2.getId()); tousseInstanceList = - objectDao.findByProperty("TousseInstance", "tousseName", "呼吸机_" + application2.getId()); + objectDao.findBySql("TousseInstance", sql); assertEquals(0, tousseInstanceList.size()); PackingTask packingTask2 = @@ -278,15 +279,16 @@ JSONObject json = JSONObject.fromObject(str); assertTrue(json.optBoolean("success")); + sql = String.format(" where po.tousseName='呼吸机' and po.invoicePlanID=%s", application.getId()); tousseInstanceList = - objectDao.findByProperty("TousseInstance", "tousseName", "呼吸机_" + application.getId()); + objectDao.findBySql("TousseInstance", sql); assertEquals(tousseInstanceList.size(), 5); for(TousseInstance tousseInstance : tousseInstanceList){ assertEquals(tousseInstance.getStatus(), TousseInstance.STATUS_PACKED); } - + sql = String.format(" where po.tousseName='呼吸机' and po.invoicePlanID=%s", application2.getId()); tousseInstanceList = - objectDao.findByProperty("TousseInstance", "tousseName", "呼吸机_" + application2.getId()); + objectDao.findBySql("TousseInstance", sql); assertEquals(tousseInstanceList.size(), 3); for(TousseInstance tousseInstance : tousseInstanceList){ assertEquals(tousseInstance.getStatus(), TousseInstance.STATUS_PACKED); Index: ssts-web/src/test/java/test/forgon/disinfectsystem/disinfectgoods/TestDisinfectGoodsSteriliManager.java =================================================================== diff -u -r12331 -r12340 --- ssts-web/src/test/java/test/forgon/disinfectsystem/disinfectgoods/TestDisinfectGoodsSteriliManager.java (.../TestDisinfectGoodsSteriliManager.java) (revision 12331) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/disinfectgoods/TestDisinfectGoodsSteriliManager.java (.../TestDisinfectGoodsSteriliManager.java) (revision 12340) @@ -16,12 +16,14 @@ import net.sf.json.JSONObject; import org.apache.commons.lang.StringUtils; +import org.hibernate.engine.transaction.jta.platform.internal.JOnASJtaPlatform; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.annotation.Rollback; import org.testng.annotations.Test; import test.forgon.disinfectsystem.AbstractCSSDTest; +import com.alibaba.fastjson.JSONArray; import com.forgon.disinfectsystem.basedatamanager.container.service.ReviewedBasketManager; import com.forgon.disinfectsystem.entity.basedatamanager.container.Container; import com.forgon.disinfectsystem.entity.basedatamanager.sterilizer.Sterilizer; @@ -177,12 +179,28 @@ initData(TousseDefinition.STR_NO,TousseDefinition.STR_NO, TousseDefinition.STR_NO,TousseDefinition.STR_NO,TousseDefinition.STR_NO); //String tousseInstanceInfos = "[{\"id\":0,\"tousseName\":\"test止血带\",\"amount\":10,\"price\":20,\"rowPrice\":20,\"diposable\":\"否\",\"tousseType\":\"消毒物品\",\"unit\":\" \",\"disinfectMaterilas\":[{\"name\":\"\\u6b62\\u8840\\u5e26\",\"count\":10,\"tousseType\":\"\\u5668\\u68b0\",\"groupNum\":\"\"}]}]"; - String tousseInstanceInfos = "[{\"id\":0,\"tousseName\":\"test止血带\",\"amount\":10,\"price\":20,\"rowPrice\":20,\"diposable\":\"否\",\"tousseType\":\"消毒物品\",\"unit\":\" \"}]"; + TousseDefinition td_test止血带 = tousseDefinitionManager.getTousseDefinitionByNameForDisplay("test止血带"); + JSONArray jarr = new JSONArray(); + JSONObject jobj = new JSONObject(); + jobj.put("id", 0); + jobj.put("tousseName", "test止血带"); + jobj.put("tousseDefinitionID", td_test止血带.getId()); + jobj.put("amount", 10); + jobj.put("price", 20); + jobj.put("rowPrice", 20); + jobj.put("diposable", "否"); + jobj.put("tousseType", "消毒物品"); + jobj.put("unit", ""); + jarr.add(jobj); +// String tousseInstanceInfos = "[{\"id\":0,\"tousseName\":\"test止血带\",\"amount\":10,\"price\":20,\"rowPrice\":20,\"diposable\":\"否\",\"tousseType\":\"消毒物品\",\"unit\":\" \"}]"; + String tousseInstanceInfos = jarr.toString(); List tousses = new Gson().fromJson(tousseInstanceInfos, new TypeToken>(){}.getType()); recyclingApplicationManager.saveApplication(application, tousses, true); + String sql = String.format(" where po.tousseName='test止血带' and po.invoicePlanID=%s", application.getId()); List tousseInstanceList = - objectDao.findByProperty("TousseInstance", "tousseName", "test止血带_" + application.getId()); +// objectDao.findByProperty("TousseInstance", "tousseName", "test止血带_" + application.getId()); + objectDao.findBySql("TousseInstance", sql); assertNotNull(tousseInstanceList); assertEquals(10, tousseInstanceList.size()); for(TousseInstance tousseInstance : tousseInstanceList){ @@ -200,12 +218,26 @@ public void test2(){ initData(TousseDefinition.STR_YES,TousseDefinition.STR_NO, TousseDefinition.STR_NO,TousseDefinition.STR_NO,TousseDefinition.STR_NO); - String tousseInstanceInfos = "[{\"id\":0,\"tousseName\":\"test止血带\",\"amount\":10,\"price\":20,\"rowPrice\":20,\"diposable\":\"否\",\"tousseType\":\"消毒物品\",\"unit\":\" \"}]"; + TousseDefinition td_test止血带 = tousseDefinitionManager.getTousseDefinitionByNameForDisplay("test止血带"); + JSONArray jarr = new JSONArray(); + JSONObject jobj = new JSONObject(); + jobj.put("id", 0); + jobj.put("tousseName", "test止血带"); + jobj.put("tousseDefinitionID", td_test止血带.getId()); + jobj.put("amount", 10); + jobj.put("price", 20); + jobj.put("rowPrice", 20); + jobj.put("diposable", "否"); + jobj.put("tousseType", "消毒物品"); + jobj.put("unit", ""); + jarr.add(jobj); + String tousseInstanceInfos = jarr.toString(); List tousses = new Gson().fromJson(tousseInstanceInfos, new TypeToken>(){}.getType()); recyclingApplicationManager.saveApplication(application, tousses, true); + String sql = String.format(" where po.tousseName='test止血带' and po.invoicePlanID=%s", application.getId()); List tousseInstanceList = - objectDao.findByProperty("TousseInstance", "tousseName", "test止血带_" + application.getId()); + objectDao.findBySql("TousseInstance", sql); assertNotNull(tousseInstanceList); assertEquals(10, tousseInstanceList.size()); for(TousseInstance tousseInstance : tousseInstanceList){ @@ -227,8 +259,27 @@ recyclingRecord.setRecyclingTime(new Date()); recyclingRecord.setRecyclingUser(application.getApplicant()); recyclingRecord.setStatus(RecyclingRecord.STATUS_SAVED); - String jsonParam = "{\"tousseJson\":[{\"basketBarcode\":\"019000001\",\"basketId\":0,\"tousseName\":\"test止血带_"+ - application.getId() +"\",\"amount\":10,\"itemType\":\"器械包\",\"tousseNameForMaterial\":\"\",\"idCardBarcode\":\"\",\"tousseAmountForMaterial\":1}],\"errors\":\"\",\"damages\":\"\",\"confirmation\":false}"; + + TousseDefinition td_test止血带2 = tousseDefinitionManager.getTousseDefinitionByNameTypeAndAPPID("test止血带", TousseDefinition.PACKAGE_TYPE_DISINFECTION, application.getId().toString()); + JSONArray jarr2 = new JSONArray(); + JSONObject jobj2 = new JSONObject(); + JSONObject jsonParam2 = new JSONObject(); + jobj2.put("basketBarcode", "019000001"); + jobj2.put("basketId", 0); + jobj2.put("tousseName", "test止血带"); + jobj2.put("tousseDefinitionID", td_test止血带2.getId()); + jobj2.put("amount", 10); + jobj2.put("itemType", "器械包"); + jobj2.put("tousseNameForMaterial", ""); + jobj2.put("idCardBarcode", ""); + jobj2.put("tousseAmountForMaterial", 1); + jarr2.add(jobj2); + jsonParam2.put("tousseJson", jarr2); + jsonParam2.put("errors", ""); + jsonParam2.put("damages", ""); + jsonParam2.put("confirmation", false); + String jsonParam = jsonParam2.toString(); + recyclingRecordManager.saveOrUpdate(recyclingRecord,JSONObject.fromObject(jsonParam)); //断言回收单状态 @@ -258,7 +309,20 @@ public void test3(){ initData(TousseDefinition.STR_YES,TousseDefinition.STR_YES, TousseDefinition.STR_NO,TousseDefinition.STR_NO,TousseDefinition.STR_NO); - String tousseInstanceInfos = "[{\"id\":0,\"tousseName\":\"test止血带\",\"amount\":10,\"price\":20,\"rowPrice\":20,\"diposable\":\"否\",\"tousseType\":\"消毒物品\",\"unit\":\" \"}]"; + TousseDefinition td_test止血带 = tousseDefinitionManager.getTousseDefinitionByNameForDisplay("test止血带"); + JSONArray jarr = new JSONArray(); + JSONObject jobj = new JSONObject(); + jobj.put("id", 0); + jobj.put("tousseName", "test止血带"); + jobj.put("tousseDefinitionID", td_test止血带.getId()); + jobj.put("amount", 10); + jobj.put("price", 20); + jobj.put("rowPrice", 20); + jobj.put("diposable", "否"); + jobj.put("tousseType", "消毒物品"); + jobj.put("unit", ""); + jarr.add(jobj); + String tousseInstanceInfos = jarr.toString(); List tousses = new Gson().fromJson(tousseInstanceInfos, new TypeToken>(){}.getType()); //调用创建申请单 recyclingApplicationManager.saveApplication(application, tousses, @@ -277,8 +341,25 @@ recyclingRecord.setRecyclingTime(new Date()); recyclingRecord.setRecyclingUser(application.getApplicant()); recyclingRecord.setStatus(RecyclingRecord.STATUS_SAVED); - String jsonParam = "{\"tousseJson\":[{\"basketBarcode\":\"019000001\",\"basketId\":0,\"tousseName\":\"test止血带_"+ - application.getId() +"\",\"amount\":10,\"itemType\":\"器械包\",\"tousseNameForMaterial\":\"\",\"idCardBarcode\":\"\",\"tousseAmountForMaterial\":1}],\"errors\":\"\",\"damages\":\"\",\"confirmation\":false}"; + TousseDefinition td_test止血带2 = tousseDefinitionManager.getTousseDefinitionByNameTypeAndAPPID("test止血带", TousseDefinition.PACKAGE_TYPE_DISINFECTION, application.getId().toString()); + JSONArray jarr2 = new JSONArray(); + JSONObject jobj2 = new JSONObject(); + JSONObject jsonParam2 = new JSONObject(); + jobj2.put("basketBarcode", "019000001"); + jobj2.put("basketId", 0); + jobj2.put("tousseName", "test止血带"); + jobj2.put("tousseDefinitionID", td_test止血带2.getId()); + jobj2.put("amount", 10); + jobj2.put("itemType", "器械包"); + jobj2.put("tousseNameForMaterial", ""); + jobj2.put("idCardBarcode", ""); + jobj2.put("tousseAmountForMaterial", 1); + jarr2.add(jobj2); + jsonParam2.put("tousseJson", jarr2); + jsonParam2.put("errors", ""); + jsonParam2.put("damages", ""); + jsonParam2.put("confirmation", false); + String jsonParam = jsonParam2.toString(); recyclingRecordManager.saveOrUpdate(recyclingRecord,JSONObject.fromObject(jsonParam)); //断言回收单状态 @@ -347,8 +428,9 @@ JSONObject json = JSONObject.fromObject(str); assertTrue(json.optBoolean("success")); + String sql = String.format(" where po.tousseName='test止血带' and po.invoicePlanID=%s", application.getId()); tousseInstanceList = - objectDao.findByProperty("TousseInstance", "tousseName", "test止血带_" + application.getId()); + objectDao.findBySql("TousseInstance", sql); assertEquals(tousseInstanceList.size(), 10); for(TousseInstance tousseInstance : tousseInstanceList){ assertEquals(tousseInstance.getStatus(), TousseInstance.STATUS_DISINFECTED); @@ -367,7 +449,20 @@ public void test4(){ initData(TousseDefinition.STR_YES,TousseDefinition.STR_YES, TousseDefinition.STR_YES,TousseDefinition.STR_NO,TousseDefinition.STR_NO); - String tousseInstanceInfos = "[{\"id\":0,\"tousseName\":\"test止血带\",\"amount\":10,\"price\":20,\"rowPrice\":20,\"diposable\":\"否\",\"tousseType\":\"消毒物品\",\"unit\":\" \"}]"; + TousseDefinition td_test止血带 = tousseDefinitionManager.getTousseDefinitionByNameForDisplay("test止血带"); + JSONArray jarr = new JSONArray(); + JSONObject jobj = new JSONObject(); + jobj.put("id", 0); + jobj.put("tousseName", "test止血带"); + jobj.put("tousseDefinitionID", td_test止血带.getId()); + jobj.put("amount", 10); + jobj.put("price", 20); + jobj.put("rowPrice", 20); + jobj.put("diposable", "否"); + jobj.put("tousseType", "消毒物品"); + jobj.put("unit", ""); + jarr.add(jobj); + String tousseInstanceInfos = jarr.toString(); List tousses = new Gson().fromJson(tousseInstanceInfos, new TypeToken>(){}.getType()); //调用创建申请单 recyclingApplicationManager.saveApplication(application, tousses, @@ -386,15 +481,33 @@ recyclingRecord.setRecyclingTime(new Date()); recyclingRecord.setRecyclingUser(application.getApplicant()); recyclingRecord.setStatus(RecyclingRecord.STATUS_SAVED); - String jsonParam = "{\"tousseJson\":[{\"basketBarcode\":\"019000001\",\"basketId\":0,\"tousseName\":\"test止血带_"+ - application.getId() +"\",\"amount\":10,\"itemType\":\"器械包\",\"tousseNameForMaterial\":\"\",\"idCardBarcode\":\"\",\"tousseAmountForMaterial\":1}],\"errors\":\"\",\"damages\":\"\",\"confirmation\":false}"; + TousseDefinition td_test止血带2 = tousseDefinitionManager.getTousseDefinitionByNameTypeAndAPPID("test止血带", TousseDefinition.PACKAGE_TYPE_DISINFECTION, application.getId().toString()); + JSONArray jarr2 = new JSONArray(); + JSONObject jobj2 = new JSONObject(); + JSONObject jsonParam2 = new JSONObject(); + jobj2.put("basketBarcode", "019000001"); + jobj2.put("basketId", 0); + jobj2.put("tousseName", "test止血带"); + jobj2.put("tousseDefinitionID", td_test止血带2.getId()); + jobj2.put("amount", 10); + jobj2.put("itemType", "器械包"); + jobj2.put("tousseNameForMaterial", ""); + jobj2.put("idCardBarcode", ""); + jobj2.put("tousseAmountForMaterial", 1); + jarr2.add(jobj2); + jsonParam2.put("tousseJson", jarr2); + jsonParam2.put("errors", ""); + jsonParam2.put("damages", ""); + jsonParam2.put("confirmation", false); + String jsonParam = jsonParam2.toString(); recyclingRecordManager.saveOrUpdate(recyclingRecord,JSONObject.fromObject(jsonParam)); //断言回收单状态 assertEquals(application.getRecyclingStatus() , InvoicePlan.RECYCLINGSTATUS_RECYCLED); + String sql = String.format(" where po.tousseName='test止血带' and po.invoicePlanID=%s", application.getId()); tousseInstanceList = - objectDao.findByProperty("TousseInstance", "tousseName", "test止血带_" + application.getId()); + objectDao.findBySql("TousseInstance", sql); assertEquals(0, tousseInstanceList.size()); PackingTask packingTask = @@ -456,8 +569,9 @@ JSONObject json = JSONObject.fromObject(str); assertTrue(json.optBoolean("success")); + sql = String.format(" where po.tousseName='test止血带' and po.invoicePlanID=%s", application.getId()); tousseInstanceList = - objectDao.findByProperty("TousseInstance", "tousseName", "test止血带_" + application.getId()); + objectDao.findBySql("TousseInstance", sql); assertEquals(tousseInstanceList.size(), 10); for(TousseInstance tousseInstance : tousseInstanceList){ assertEquals(tousseInstance.getStatus(), TousseInstance.STATUS_DISINFECTED); @@ -474,14 +588,27 @@ public void test5(){ initData(TousseDefinition.STR_YES,TousseDefinition.STR_YES, TousseDefinition.STR_YES,TousseDefinition.STR_YES,TousseDefinition.STR_NO); - - String tousseInstanceInfos = "[{\"id\":0,\"tousseName\":\"test止血带\",\"amount\":10,\"price\":20,\"rowPrice\":20,\"diposable\":\"否\",\"tousseType\":\"消毒物品\",\"unit\":\" \"}]"; + TousseDefinition td_test止血带 = tousseDefinitionManager.getTousseDefinitionByNameForDisplay("test止血带"); + JSONArray jarr = new JSONArray(); + JSONObject jobj = new JSONObject(); + jobj.put("id", 0); + jobj.put("tousseName", "test止血带"); + jobj.put("tousseDefinitionID", td_test止血带.getId()); + jobj.put("amount", 10); + jobj.put("price", 20); + jobj.put("rowPrice", 20); + jobj.put("diposable", "否"); + jobj.put("tousseType", "消毒物品"); + jobj.put("unit", ""); + jarr.add(jobj); + String tousseInstanceInfos = jarr.toString(); List tousses = new Gson().fromJson(tousseInstanceInfos, new TypeToken>(){}.getType()); //调用创建申请单 recyclingApplicationManager.saveApplication(application, tousses, true); + String sql = String.format(" where po.tousseName='test止血带' and po.invoicePlanID=%s", application.getId()); List tousseInstanceList = - objectDao.findByProperty("TousseInstance", "tousseName", "test止血带_" + application.getId()); + objectDao.findBySql("TousseInstance", sql); assertNotNull(tousseInstanceList); assertEquals(0, tousseInstanceList.size()); //调用回收 @@ -494,15 +621,33 @@ recyclingRecord.setRecyclingTime(new Date()); recyclingRecord.setRecyclingUser(application.getApplicant()); recyclingRecord.setStatus(RecyclingRecord.STATUS_SAVED); - String jsonParam = "{\"tousseJson\":[{\"basketBarcode\":\"019000001\",\"basketId\":0,\"tousseName\":\"test止血带_"+ - application.getId() +"\",\"amount\":10,\"itemType\":\"器械包\",\"tousseNameForMaterial\":\"\",\"idCardBarcode\":\"\",\"tousseAmountForMaterial\":1}],\"errors\":\"\",\"damages\":\"\",\"confirmation\":false}"; + TousseDefinition td_test止血带2 = tousseDefinitionManager.getTousseDefinitionByNameTypeAndAPPID("test止血带", TousseDefinition.PACKAGE_TYPE_DISINFECTION, application.getId().toString()); + JSONArray jarr2 = new JSONArray(); + JSONObject jobj2 = new JSONObject(); + JSONObject jsonParam2 = new JSONObject(); + jobj2.put("basketBarcode", "019000001"); + jobj2.put("basketId", 0); + jobj2.put("tousseName", "test止血带"); + jobj2.put("tousseDefinitionID", td_test止血带2.getId()); + jobj2.put("amount", 10); + jobj2.put("itemType", "器械包"); + jobj2.put("tousseNameForMaterial", ""); + jobj2.put("idCardBarcode", ""); + jobj2.put("tousseAmountForMaterial", 1); + jarr2.add(jobj2); + jsonParam2.put("tousseJson", jarr2); + jsonParam2.put("errors", ""); + jsonParam2.put("damages", ""); + jsonParam2.put("confirmation", false); + String jsonParam = jsonParam2.toString(); recyclingRecordManager.saveOrUpdate(recyclingRecord,JSONObject.fromObject(jsonParam)); //断言回收单状态 assertEquals(application.getRecyclingStatus() , InvoicePlan.RECYCLINGSTATUS_RECYCLED); + sql = String.format(" where po.tousseName='test止血带' and po.invoicePlanID=%s", application.getId()); tousseInstanceList = - objectDao.findByProperty("TousseInstance", "tousseName", "test止血带_" + application.getId()); + objectDao.findBySql("TousseInstance", sql); assertEquals(0, tousseInstanceList.size()); PackingTask packingTask = @@ -564,8 +709,9 @@ JSONObject json = JSONObject.fromObject(str); assertTrue(json.optBoolean("success")); + sql = String.format(" where po.tousseName='test止血带' and po.invoicePlanID=%s", application.getId()); tousseInstanceList = - objectDao.findByProperty("TousseInstance", "tousseName", "test止血带_" + application.getId()); + objectDao.findBySql("TousseInstance", sql); assertEquals(tousseInstanceList.size(), 10); for(TousseInstance tousseInstance : tousseInstanceList){ assertEquals(tousseInstance.getStatus(), TousseInstance.STATUS_PACKED); @@ -577,8 +723,9 @@ } //审核 packingManager.reviewTousseInstance(StringUtils.join(tousseInstanceIdList.toArray() , ";"), "018000001", taskGroup, "何永虹", "3021", new Date()); + sql = String.format(" where po.tousseName='test止血带' and po.invoicePlanID=%s", application.getId()); tousseInstanceList = - objectDao.findByProperty("TousseInstance", "tousseName", "test止血带_" + application.getId()); + objectDao.findBySql("TousseInstance", sql); assertEquals(tousseInstanceList.size(), 10); for(TousseInstance tousseInstance : tousseInstanceList){ assertEquals(tousseInstance.getStatus(), TousseInstance.STATUS_DISINFECTED); @@ -595,13 +742,27 @@ public void test6(){ initData(TousseDefinition.STR_YES,TousseDefinition.STR_YES, TousseDefinition.STR_YES,TousseDefinition.STR_YES,TousseDefinition.STR_YES); - String tousseInstanceInfos = "[{\"id\":0,\"tousseName\":\"test止血带\",\"amount\":10,\"price\":20,\"rowPrice\":20,\"diposable\":\"否\",\"tousseType\":\"消毒物品\",\"unit\":\" \"}]"; + TousseDefinition td_test止血带 = tousseDefinitionManager.getTousseDefinitionByNameForDisplay("test止血带"); + JSONArray jarr = new JSONArray(); + JSONObject jobj = new JSONObject(); + jobj.put("id", 0); + jobj.put("tousseName", "test止血带"); + jobj.put("tousseDefinitionID", td_test止血带.getId()); + jobj.put("amount", 10); + jobj.put("price", 20); + jobj.put("rowPrice", 20); + jobj.put("diposable", "否"); + jobj.put("tousseType", "消毒物品"); + jobj.put("unit", ""); + jarr.add(jobj); + String tousseInstanceInfos = jarr.toString(); List tousses = new Gson().fromJson(tousseInstanceInfos, new TypeToken>(){}.getType()); //调用创建申请单 recyclingApplicationManager.saveApplication(application, tousses, true); + String sql = String.format(" where po.tousseName='test止血带' and po.invoicePlanID=%s", application.getId()); List tousseInstanceList = - objectDao.findByProperty("TousseInstance", "tousseName", "test止血带_" + application.getId()); + objectDao.findBySql("TousseInstance", sql); assertNotNull(tousseInstanceList); assertEquals(0, tousseInstanceList.size()); //调用回收 @@ -614,13 +775,31 @@ recyclingRecord.setRecyclingTime(new Date()); recyclingRecord.setRecyclingUser(application.getApplicant()); recyclingRecord.setStatus(RecyclingRecord.STATUS_SAVED); - String jsonParam = "{\"tousseJson\":[{\"basketBarcode\":\"019000001\",\"basketId\":0,\"tousseName\":\"test止血带_"+ - application.getId() +"\",\"amount\":10,\"itemType\":\"器械包\",\"tousseNameForMaterial\":\"\",\"idCardBarcode\":\"\",\"tousseAmountForMaterial\":1}],\"errors\":\"\",\"damages\":\"\",\"confirmation\":false}"; + TousseDefinition td_test止血带2 = tousseDefinitionManager.getTousseDefinitionByNameTypeAndAPPID("test止血带", TousseDefinition.PACKAGE_TYPE_DISINFECTION, application.getId().toString()); + JSONArray jarr2 = new JSONArray(); + JSONObject jobj2 = new JSONObject(); + JSONObject jsonParam2 = new JSONObject(); + jobj2.put("basketBarcode", "019000001"); + jobj2.put("basketId", 0); + jobj2.put("tousseName", "test止血带"); + jobj2.put("tousseDefinitionID", td_test止血带2.getId()); + jobj2.put("amount", 10); + jobj2.put("itemType", "器械包"); + jobj2.put("tousseNameForMaterial", ""); + jobj2.put("idCardBarcode", ""); + jobj2.put("tousseAmountForMaterial", 1); + jarr2.add(jobj2); + jsonParam2.put("tousseJson", jarr2); + jsonParam2.put("errors", ""); + jsonParam2.put("damages", ""); + jsonParam2.put("confirmation", false); + String jsonParam = jsonParam2.toString(); recyclingRecordManager.saveOrUpdate(recyclingRecord,JSONObject.fromObject(jsonParam)); //断言回收单状态 assertEquals(application.getRecyclingStatus() , InvoicePlan.RECYCLINGSTATUS_RECYCLED); + sql = String.format(" where po.tousseName='test止血带' and po.invoicePlanID=%s", application.getId()); tousseInstanceList = - objectDao.findByProperty("TousseInstance", "tousseName", "test止血带_" + application.getId()); + objectDao.findBySql("TousseInstance", sql); assertEquals(0, tousseInstanceList.size()); PackingTask packingTask = @@ -682,8 +861,9 @@ JSONObject json = JSONObject.fromObject(str); assertTrue(json.optBoolean("success")); + sql = String.format(" where po.tousseName='test止血带' and po.invoicePlanID=%s", application.getId()); tousseInstanceList = - objectDao.findByProperty("TousseInstance", "tousseName", "test止血带_" + application.getId()); + objectDao.findBySql("TousseInstance", sql); assertEquals(tousseInstanceList.size(), 10); for(TousseInstance tousseInstance : tousseInstanceList){ assertEquals(tousseInstance.getStatus(), TousseInstance.STATUS_PACKED); @@ -695,8 +875,9 @@ } //审核 packingManager.reviewTousseInstance(StringUtils.join(tousseInstanceIdList.toArray() , ";"), "018000001", taskGroup, "何永虹", "3021", new Date()); + sql = String.format(" where po.tousseName='test止血带' and po.invoicePlanID=%s", application.getId()); tousseInstanceList = - objectDao.findByProperty("TousseInstance", "tousseName", "test止血带_" + application.getId()); + objectDao.findBySql("TousseInstance", sql); assertEquals(tousseInstanceList.size(), 10); for(TousseInstance tousseInstance : tousseInstanceList){ assertEquals(tousseInstance.getStatus(), TousseInstance.STATUS_REVIEWED); Index: ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/ComboRecyclingApplicationTests.java =================================================================== diff -u -r12339 -r12340 --- ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/ComboRecyclingApplicationTests.java (.../ComboRecyclingApplicationTests.java) (revision 12339) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/ComboRecyclingApplicationTests.java (.../ComboRecyclingApplicationTests.java) (revision 12340) @@ -75,8 +75,6 @@ JSONArray jsonArray = new JSONArray(); TousseDefinition td_Test开胸包 = tousseDefinitionManager.getTousseDefinitionByName("Test开胸包"); - TousseDefinition td_Test开颅包 = tousseDefinitionManager.getTousseDefinitionByName("Test开颅包"); - TousseDefinition td_Test开口包 = tousseDefinitionManager.getTousseDefinitionByName("Test开口包"); TousseDefinition td_止血带 = tousseDefinitionManager.getTousseDefinitionByNameForDisplay("止血带"); addRecyclingItem(jsonArray, "019000001", "0", "Test开胸包",td_Test开胸包.getId(), 5, "器械包", "", null);