Index: ssts-web/src/test/java/test/forgon/disinfectsystem/webservice/service/ServiceManagerTests.java =================================================================== diff -u -r26085 -r35695 --- ssts-web/src/test/java/test/forgon/disinfectsystem/webservice/service/ServiceManagerTests.java (.../ServiceManagerTests.java) (revision 26085) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/webservice/service/ServiceManagerTests.java (.../ServiceManagerTests.java) (revision 35695) @@ -3,15 +3,20 @@ import static org.testng.Assert.assertFalse; +import java.util.ArrayList; +import java.util.List; +import net.sf.json.JSONArray; import net.sf.json.JSONObject; - import org.springframework.beans.factory.annotation.Autowired; import org.junit.Test; import test.forgon.constant.Constants; import test.forgon.disinfectsystem.AbstractCSSDTest; import com.forgon.disinfectsystem.common.CSSDConstants; +import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseDefinition; +import com.forgon.disinfectsystem.entity.invoicemanager.InvoicePlan; +import com.forgon.disinfectsystem.entity.tousseitem.TousseItem; import com.forgon.disinfectsystem.webservice.service.ServiceManager; /*** @@ -166,5 +171,55 @@ assertEquals("灭菌筐01", json.getJSONObject("data") .getString("name")); } - + /** + * 保存预回收 + */ + @Test + public void savePrepareRecyleTousse(){ + prepareData(); + //创建申请单 + InvoicePlan ip = new InvoicePlan(); + objectDao.save(ip); + + TousseDefinition td1 = new TousseDefinition(); + td1.setName("测试包1"); + TousseDefinition td2 = new TousseDefinition(); + td2.setName("测试包2"); + objectDao.save(td1); + objectDao.save(td2); + + //申请单物品 + TousseItem ti1 = new TousseItem(); + ti1.setInvoicePlan(ip); + ti1.setTousseDefinitionId(td1.getId()); + TousseItem ti2 = new TousseItem(); + ti2.setInvoicePlan(ip); + ti2.setTousseDefinitionId(td2.getId()); + objectDao.save(ti1); + objectDao.save(ti2); + List applicationItems = new ArrayList(); + applicationItems.add(ti1); + applicationItems.add(ti2); + ip.setApplicationItems(applicationItems); + JSONArray tousseItems = new JSONArray(); + JSONObject tousseItemObj = new JSONObject(); + tousseItemObj.put("id", ti1.getId()); + tousseItemObj.put("td_id", td1.getId()); + tousseItems.add(tousseItemObj); + + JSONArray deletedTdIdList = new JSONArray(); + deletedTdIdList.add(td1.getId()); + // 灭菌篮筐 + jsonObj.put("action", "savePrepareRecyleTousse"); + jsonObj.put("deletedTdIdList", deletedTdIdList); + jsonObj.put("tousseItems", tousseItems); + jsonObj.put("app_id", ip.getId()); + String result = serviceManager.invoke("", jsonObj.toString()); + JSONObject json = JSONObject.fromObject(result); + ti1 = (TousseItem)objectDao.getById(TousseItem.class.getSimpleName(), ti1.getId()); + ti2 = (TousseItem)objectDao.getById(TousseItem.class.getSimpleName(), ti2.getId()); + assertEquals(null,ti1);//删除成功了 + assertNotEquals(null,ti2);//不会被删除 + assertEquals("保存成功",json.optString("msg")); + } }